diff --git a/aports/device/device-mozilla-flame/90-android-touch-dev.rules b/aports/device/device-t2m-flame/90-android-touch-dev.rules
similarity index 100%
rename from aports/device/device-mozilla-flame/90-android-touch-dev.rules
rename to aports/device/device-t2m-flame/90-android-touch-dev.rules
diff --git a/aports/device/device-mozilla-flame/APKBUILD b/aports/device/device-t2m-flame/APKBUILD
similarity index 78%
rename from aports/device/device-mozilla-flame/APKBUILD
rename to aports/device/device-t2m-flame/APKBUILD
index 7261de21..0c1bedb1 100644
--- a/aports/device/device-mozilla-flame/APKBUILD
+++ b/aports/device/device-t2m-flame/APKBUILD
@@ -1,11 +1,11 @@
-pkgname=device-mozilla-flame
+pkgname=device-t2m-flame
 pkgver=1
 pkgrel=2
 pkgdesc="Mozilla Flame"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="linux-mozilla-flame firmware-mozilla-flame mkbootimg"
+depends="linux-t2m-flame firmware-t2m-flame mkbootimg"
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
@@ -25,7 +25,7 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
-sha512sums="6fed912ef5850ba75e4b8f5e8dd36141965978faab011c1556a02c6e2ae42d02710b9a9f0e53f08e9c63d95eafce7c748c37928741157fa321d9f4c1ed6bac4a  deviceinfo
+sha512sums="55be27dc159d09931ad5fee519292db21df38180e557ad913339030be41423e107e2848e7374204b19872e1a160168690c1800047556ae1b0ca5a03c396aa318  deviceinfo
 29f7be2df62a48604cfbb48bc2192ac309b36b0bf0f02819fdbb240868ff382c0cf17baf1ad8c84361474a2218ec34bdb28ae3ccd940b2560d1b1e281449c48d  initfs-hook.sh
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-0a301a723f2a6ad8285fa8c016a73b0d05ae9811a8c96cd73f6db274e85676f7b3d427ede46484665fd613b67ef42330f0b69413328c04c3f489db86c5aa9038  device-mozilla-flame.post-install"
+0a301a723f2a6ad8285fa8c016a73b0d05ae9811a8c96cd73f6db274e85676f7b3d427ede46484665fd613b67ef42330f0b69413328c04c3f489db86c5aa9038  device-t2m-flame.post-install"
diff --git a/aports/device/device-mozilla-flame/device-mozilla-flame.post-install b/aports/device/device-t2m-flame/device-t2m-flame.post-install
similarity index 100%
rename from aports/device/device-mozilla-flame/device-mozilla-flame.post-install
rename to aports/device/device-t2m-flame/device-t2m-flame.post-install
diff --git a/aports/device/device-mozilla-flame/deviceinfo b/aports/device/device-t2m-flame/deviceinfo
similarity index 96%
rename from aports/device/device-mozilla-flame/deviceinfo
rename to aports/device/device-t2m-flame/deviceinfo
index 63b5b7ae..e42a0f11 100644
--- a/aports/device/device-mozilla-flame/deviceinfo
+++ b/aports/device/device-t2m-flame/deviceinfo
@@ -1,6 +1,6 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Flame"
-deviceinfo_manufacturer="Mozilla"
+deviceinfo_manufacturer="T2M"
 deviceinfo_date=""
 deviceinfo_keyboard="false"
 deviceinfo_nonfree="????"
diff --git a/aports/device/device-mozilla-flame/initfs-hook.sh b/aports/device/device-t2m-flame/initfs-hook.sh
similarity index 100%
rename from aports/device/device-mozilla-flame/initfs-hook.sh
rename to aports/device/device-t2m-flame/initfs-hook.sh
diff --git a/aports/device/linux-mozilla-flame/APKBUILD b/aports/device/linux-t2m-flame/APKBUILD
similarity index 93%
rename from aports/device/linux-mozilla-flame/APKBUILD
rename to aports/device/linux-t2m-flame/APKBUILD
index f411f2e3..3935604f 100644
--- a/aports/device/linux-mozilla-flame/APKBUILD
+++ b/aports/device/linux-t2m-flame/APKBUILD
@@ -9,8 +9,8 @@
 # Changes:
 # - enable devtmpfs (needed for udev -> touch support in weston)
 
-_vendor=mozilla
-_flavor=mozilla-flame
+_vendor=t2m
+_flavor=t2m-flame
 _hash="03396c93577aafae7ca3603de1c74eafd30e7d54"
 _config="config-${_flavor}.armhf"
 
@@ -22,7 +22,7 @@ case $pkgver in
 esac
 pkgrel=5
 arch="armhf"
-pkgdesc="Mozilla flame kernel"
+pkgdesc="T2M flame kernel"
 url="https://github.com/mozilla-b2g/codeaurora_kernel_msm"
 depends="postmarketos-mkinitfs"
 makedepends="dtbtool perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
@@ -103,10 +103,10 @@ package() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
 		INSTALL_MOD_PATH="${pkgdir}" firmware_install
 
-	mkdir -p "$pkgdir/usr/lib/linux-mozilla-flame"
+	mkdir -p "$pkgdir/usr/lib/linux-t2m-flame"
 	for dtb in $(find "$srcdir/build/arch/arm/boot" -name "*.dtb")
 	do
-		install -m644 $dtb "$pkgdir/usr/lib/linux-mozilla-flame/"
+		install -m644 $dtb "$pkgdir/usr/lib/linux-t2m-flame/"
 	done
 
 	install -Dm644 "$srcdir/build/arch/arm/boot/dt.img" \
@@ -119,8 +119,8 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
-sha512sums="03532b82159d31e406594203f318f78aace500f997325149d161e1691c93c3bc54e903602d54d52dc8fbfe370828da3442f06f4a78b84b8370fa0ef5d9a05bef  linux-mozilla-flame-03396c93577aafae7ca3603de1c74eafd30e7d54.zip
-28d4f4d0e1f0f55d06d05ad2a62560aa611f9611084b6653df9dd381323509c534227d1058acfad2c7bf014289b4f2a253ce47847c6fe5423688ec0998fb6056  config-mozilla-flame.armhf
+sha512sums="03532b82159d31e406594203f318f78aace500f997325149d161e1691c93c3bc54e903602d54d52dc8fbfe370828da3442f06f4a78b84b8370fa0ef5d9a05bef  linux-t2m-flame-03396c93577aafae7ca3603de1c74eafd30e7d54.zip
+28d4f4d0e1f0f55d06d05ad2a62560aa611f9611084b6653df9dd381323509c534227d1058acfad2c7bf014289b4f2a253ce47847c6fe5423688ec0998fb6056  config-t2m-flame.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  aeea3592a13bf12861943e44fc48f1f270941f8d.patch
diff --git a/aports/device/linux-mozilla-flame/add-missing-dtbs.patch b/aports/device/linux-t2m-flame/add-missing-dtbs.patch
similarity index 100%
rename from aports/device/linux-mozilla-flame/add-missing-dtbs.patch
rename to aports/device/linux-t2m-flame/add-missing-dtbs.patch
diff --git a/aports/device/linux-mozilla-flame/aeea3592a13bf12861943e44fc48f1f270941f8d.patch b/aports/device/linux-t2m-flame/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
similarity index 100%
rename from aports/device/linux-mozilla-flame/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
rename to aports/device/linux-t2m-flame/aeea3592a13bf12861943e44fc48f1f270941f8d.patch
diff --git a/aports/device/linux-mozilla-flame/compiler-gcc6.h b/aports/device/linux-t2m-flame/compiler-gcc6.h
similarity index 100%
rename from aports/device/linux-mozilla-flame/compiler-gcc6.h
rename to aports/device/linux-t2m-flame/compiler-gcc6.h
diff --git a/aports/device/linux-mozilla-flame/config-mozilla-flame.armhf b/aports/device/linux-t2m-flame/config-t2m-flame.armhf
similarity index 100%
rename from aports/device/linux-mozilla-flame/config-mozilla-flame.armhf
rename to aports/device/linux-t2m-flame/config-t2m-flame.armhf
diff --git a/aports/device/linux-mozilla-flame/gpu-msm-fix-gcc5-compile.patch b/aports/device/linux-t2m-flame/gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from aports/device/linux-mozilla-flame/gpu-msm-fix-gcc5-compile.patch
rename to aports/device/linux-t2m-flame/gpu-msm-fix-gcc5-compile.patch
diff --git a/aports/firmware/firmware-mozilla-flame/APKBUILD b/aports/firmware/firmware-t2m-flame/APKBUILD
similarity index 75%
rename from aports/firmware/firmware-mozilla-flame/APKBUILD
rename to aports/firmware/firmware-t2m-flame/APKBUILD
index 70603b5a..2c7e0889 100644
--- a/aports/firmware/firmware-mozilla-flame/APKBUILD
+++ b/aports/firmware/firmware-t2m-flame/APKBUILD
@@ -1,4 +1,4 @@
-pkgname=firmware-mozilla-flame
+pkgname=firmware-t2m-flame
 pkgver=1
 pkgrel=2
 pkgdesc="Mozilla Flame Firmware"
@@ -15,10 +15,10 @@ options="!check !strip !archcheck"
 
 package() {
 	mkdir -p "$pkgdir/lib/firmware/postmarketos"
-	for fw in $(find "${srcdir}/mozilla-flame-firmware-${_hash}/" -type f)
+	for fw in $(find "${srcdir}/t2m-flame-firmware-${_hash}/" -type f)
 	do
 		install -m644 $fw "$pkgdir/lib/firmware/postmarketos/"
 	done
 }
 
-sha512sums="865c6cb88d44c5305b088db4d244f9e178f2ddd7550c481aadeb6444fd853e004641b8900172ec326a11037aa170a658d32d9e62d0780ee50838e89983178384  firmware-mozilla-flame-503a4052a8bfdc3b4c06533f2d08fe4d6a923842.tar.gz"
+sha512sums="865c6cb88d44c5305b088db4d244f9e178f2ddd7550c481aadeb6444fd853e004641b8900172ec326a11037aa170a658d32d9e62d0780ee50838e89983178384  firmware-t2m-flame-503a4052a8bfdc3b4c06533f2d08fe4d6a923842.tar.gz"