diff --git a/device/testing/device-oneplus-cheeseburger/APKBUILD b/device/testing/device-oneplus-cheeseburger/APKBUILD
index d7a14bb3d..362381783 100644
--- a/device/testing/device-oneplus-cheeseburger/APKBUILD
+++ b/device/testing/device-oneplus-cheeseburger/APKBUILD
@@ -4,12 +4,12 @@
 pkgname="device-oneplus-cheeseburger"
 pkgdesc="OnePlus 5"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-oneplus-cheeseburger mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-oneplus-msm8998 mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
diff --git a/device/testing/linux-oneplus-cheeseburger/0001-use-relative-header-includes.patch b/device/testing/linux-oneplus-msm8998/0001-use-relative-header-includes.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0001-use-relative-header-includes.patch
rename to device/testing/linux-oneplus-msm8998/0001-use-relative-header-includes.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/0002-fix-TRACE_INCLUDE_PATH-paths.patch b/device/testing/linux-oneplus-msm8998/0002-fix-TRACE_INCLUDE_PATH-paths.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0002-fix-TRACE_INCLUDE_PATH-paths.patch
rename to device/testing/linux-oneplus-msm8998/0002-fix-TRACE_INCLUDE_PATH-paths.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/0003-fix-synaptics_s3320-touchscreen-driver-input.patch b/device/testing/linux-oneplus-msm8998/0003-fix-synaptics_s3320-touchscreen-driver-input.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0003-fix-synaptics_s3320-touchscreen-driver-input.patch
rename to device/testing/linux-oneplus-msm8998/0003-fix-synaptics_s3320-touchscreen-driver-input.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/0004-disable-interfering-bt_power-rfkill.patch b/device/testing/linux-oneplus-msm8998/0004-disable-interfering-bt_power-rfkill.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0004-disable-interfering-bt_power-rfkill.patch
rename to device/testing/linux-oneplus-msm8998/0004-disable-interfering-bt_power-rfkill.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/0005-update-msm8998-qpnp-rtc-driver-src-with-sm8150.patch b/device/testing/linux-oneplus-msm8998/0005-update-msm8998-qpnp-rtc-driver-src-with-sm8150.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0005-update-msm8998-qpnp-rtc-driver-src-with-sm8150.patch
rename to device/testing/linux-oneplus-msm8998/0005-update-msm8998-qpnp-rtc-driver-src-with-sm8150.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/0006-disable-various-spammy-driver-logging.patch b/device/testing/linux-oneplus-msm8998/0006-disable-various-spammy-driver-logging.patch
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/0006-disable-various-spammy-driver-logging.patch
rename to device/testing/linux-oneplus-msm8998/0006-disable-various-spammy-driver-logging.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/APKBUILD b/device/testing/linux-oneplus-msm8998/APKBUILD
similarity index 92%
rename from device/testing/linux-oneplus-cheeseburger/APKBUILD
rename to device/testing/linux-oneplus-msm8998/APKBUILD
index fa752c795..d694081b7 100644
--- a/device/testing/linux-oneplus-cheeseburger/APKBUILD
+++ b/device/testing/linux-oneplus-msm8998/APKBUILD
@@ -2,13 +2,13 @@
 # Kernel config based on: arch/arm64/configs/lineage_oneplus5_defconfig (https://git.io/JvmDf)
 # Contributor: Jami Kettunen <jami.kettunen@protonmail.com>
 
-pkgname="linux-oneplus-cheeseburger"
+pkgname="linux-oneplus-msm8998"
 pkgver=4.4.217
 pkgrel=0
-pkgdesc="OnePlus 5 downstream kernel fork"
+pkgdesc="OnePlus 5/5T downstream kernel fork"
 arch="aarch64"
 _carch="arm64"
-_flavor="oneplus-cheeseburger"
+_flavor="oneplus-msm8998"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps"
@@ -52,8 +52,8 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="fea5a566ce4f1ef93e08cdd4d0edb3afe358105865b8583231cdeaccaaa3484d567230fdd4b3cea5e77fa1b7ff9bf9486b8d1ba1c757fc3477db35d9a93f3db4  linux-oneplus-cheeseburger-dac686aa9a9491551e70a6d35d8636f823eb97e9.tar.gz
-2fa4fe807711b7595c92488f3f16c287b40663dd16cea22e406e57a6c888a9151987490fb910c48ca766af398ed6612336df7c7662234a839429d15de1256599  config-oneplus-cheeseburger.aarch64
+sha512sums="fea5a566ce4f1ef93e08cdd4d0edb3afe358105865b8583231cdeaccaaa3484d567230fdd4b3cea5e77fa1b7ff9bf9486b8d1ba1c757fc3477db35d9a93f3db4  linux-oneplus-msm8998-dac686aa9a9491551e70a6d35d8636f823eb97e9.tar.gz
+2fa4fe807711b7595c92488f3f16c287b40663dd16cea22e406e57a6c888a9151987490fb910c48ca766af398ed6612336df7c7662234a839429d15de1256599  config-oneplus-msm8998.aarch64
 f369bb6510a5c0581eb2db6ef565d0e93e117b5960c91f52bebd5aa931d65fe91bdc0ec9673107756aa1b5118208d75af116925630aed9025a8f5e303ae1f980  0001-use-relative-header-includes.patch
 a484dc777b37b43eb54f8beb20eef51b7a9177928f97f1b200951c6ece70805e7fa3762f4ad0686525021254fd1f0b5d36c207cf27a04ec65cfe55f88c3d1c12  0002-fix-TRACE_INCLUDE_PATH-paths.patch
 a29c158497e8ef4afddce57e42e54de81629ddf85df4a229282b528ec63475bfa5ed4cc6ff5f77d22300c7124655807355aa7b0cc25d8b02e122b752777f677a  0003-fix-synaptics_s3320-touchscreen-driver-input.patch
diff --git a/device/testing/linux-oneplus-cheeseburger/config-oneplus-cheeseburger.aarch64 b/device/testing/linux-oneplus-msm8998/config-oneplus-msm8998.aarch64
similarity index 100%
rename from device/testing/linux-oneplus-cheeseburger/config-oneplus-cheeseburger.aarch64
rename to device/testing/linux-oneplus-msm8998/config-oneplus-msm8998.aarch64