diff --git a/device/testing/device-samsung-i9305/90-android-touch-dev.rules b/device/testing/device-samsung-i9300/90-android-touch-dev.rules
similarity index 100%
rename from device/testing/device-samsung-i9305/90-android-touch-dev.rules
rename to device/testing/device-samsung-i9300/90-android-touch-dev.rules
diff --git a/device/testing/device-samsung-i9305/APKBUILD b/device/testing/device-samsung-i9300/APKBUILD
similarity index 61%
rename from device/testing/device-samsung-i9305/APKBUILD
rename to device/testing/device-samsung-i9300/APKBUILD
index 734614a2a..e16058cb8 100644
--- a/device/testing/device-samsung-i9305/APKBUILD
+++ b/device/testing/device-samsung-i9300/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-i9305
-pkgdesc="Samsung Galaxy SIII LTE"
+pkgname=device-samsung-i9300
+pkgdesc="Samsung Galaxy SIII"
 pkgver=1
-pkgrel=28
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,7 +12,8 @@ makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-kernel-mainline-i9300:kernel_mainline_i9300
+	$pkgname-kernel-mainline-i9305:kernel_mainline_i9305
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
@@ -32,21 +33,27 @@ package() {
 
 kernel_downstream() {
 	pkgdesc="Display and wifi works (see device table for details)"
-	depends="linux-samsung-i9305"
+	depends="linux-samsung-i9300"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-kernel_mainline() {
-	pkgdesc="For kernel development only (most features aren't working)"
+kernel_mainline_i9300() {
+	pkgdesc="(SIII) For kernel development only (most features aren't working)"
+	depends="linux-postmarketos-exynos4"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline_i9305() {
+	pkgdesc="(SIII LTE) For kernel development only (most features aren't working)"
 	depends="linux-postmarketos-exynos4"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-i9305"
+	depends="firmware-samsung-i9300"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="02e3cd88ae7d3f4af22cb3fb007d0eef931328dd1575677bca4bfbe735f25a2c74e44ba12be54fd4c7ad8c1b192b3035ff629cef56259c81d642d1b591d02ac4  deviceinfo
+sha512sums="d4c20476b353e40e2f74f07088f000165ccc555f04bfa96e6b87ed03c59365f131dc4e1739fbd39e6633967cd393e010170c9c3a8ca62ba7e0b24966a9b2d59b  deviceinfo
 d70a03210458c771f94db920a8d3162a03fc7727f0fbafef4c1575ebc659c937c082f5c7a4dcdd1572925b973d628c6f4cf895c3b8b2a59af8142824468fe7c4  90-android-touch-dev.rules"
diff --git a/device/testing/device-samsung-i9305/device-samsung-i9305.post-install b/device/testing/device-samsung-i9300/device-samsung-i9300.post-install
similarity index 100%
rename from device/testing/device-samsung-i9305/device-samsung-i9305.post-install
rename to device/testing/device-samsung-i9300/device-samsung-i9300.post-install
diff --git a/device/testing/device-samsung-i9305/deviceinfo b/device/testing/device-samsung-i9300/deviceinfo
similarity index 80%
rename from device/testing/device-samsung-i9305/deviceinfo
rename to device/testing/device-samsung-i9300/deviceinfo
index 58a634ff3..b45b4bd14 100644
--- a/device/testing/device-samsung-i9305/deviceinfo
+++ b/device/testing/device-samsung-i9300/deviceinfo
@@ -2,12 +2,14 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy SIII LTE"
+deviceinfo_name="Samsung Galaxy SIII"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-i9305"
+deviceinfo_codename="samsung-i9300"
 deviceinfo_year="2012"
-deviceinfo_append_dtb_mainline="true"
-deviceinfo_dtb_mainline="exynos4412-i9305"
+deviceinfo_append_dtb_mainline_i9300="true"
+deviceinfo_append_dtb_mainline_i9305="true"
+deviceinfo_dtb_mainline_i9300="exynos4412-i9300"
+deviceinfo_dtb_mainline_i9305="exynos4412-i9305"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"
 
diff --git a/device/testing/firmware-samsung-i9305/APKBUILD b/device/testing/firmware-samsung-i9300/APKBUILD
similarity index 84%
rename from device/testing/firmware-samsung-i9305/APKBUILD
rename to device/testing/firmware-samsung-i9300/APKBUILD
index 98f2734fa..2ade54b81 100644
--- a/device/testing/firmware-samsung-i9305/APKBUILD
+++ b/device/testing/firmware-samsung-i9300/APKBUILD
@@ -1,8 +1,8 @@
-pkgname=firmware-samsung-i9305
+pkgname=firmware-samsung-i9300
 pkgver=1
-pkgrel=3
+pkgrel=0
 _commit="d5a8735a6ad1fff3091f100383ac004f411d7528"
-pkgdesc="Samsung Galaxy SIII LTE Firmware"
+pkgdesc="Samsung Galaxy SIII Firmware"
 url="https://github.com/Androguide/android_vendor_samsung"
 arch="armv7"
 license="proprietary"
@@ -18,4 +18,4 @@ package() {
 		"$pkgdir"/lib/firmware/postmarketos/nvram_net.txt
 }
 
-sha512sums="6559320d23e6a73accacf8c760426cb5a0679ab34e353d24dde653b336eadf98c2aa28c783e7010bf9f32cc64baadc02a9fff09baac6ff8b535ed5bc94c8abc5  firmware-samsung-i9305-d5a8735a6ad1fff3091f100383ac004f411d7528.tar.gz"
+sha512sums="6559320d23e6a73accacf8c760426cb5a0679ab34e353d24dde653b336eadf98c2aa28c783e7010bf9f32cc64baadc02a9fff09baac6ff8b535ed5bc94c8abc5  firmware-samsung-i9300-d5a8735a6ad1fff3091f100383ac004f411d7528.tar.gz"
diff --git a/device/testing/linux-samsung-i9305/APKBUILD b/device/testing/linux-samsung-i9300/APKBUILD
similarity index 95%
rename from device/testing/linux-samsung-i9305/APKBUILD
rename to device/testing/linux-samsung-i9300/APKBUILD
index e64fe9b1b..a722e5cf1 100644
--- a/device/testing/linux-samsung-i9305/APKBUILD
+++ b/device/testing/linux-samsung-i9300/APKBUILD
@@ -12,7 +12,7 @@
 # - add kernel modules installation
 # - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
 
-_flavor=samsung-i9305
+_flavor=samsung-i9300
 _hash="fa8fa332fdec11744ffe0c742775cc22efe0d041"
 
 pkgname=linux-$_flavor
@@ -21,10 +21,10 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=8
+pkgrel=0
 arch="armv7"
 _config="config-$_flavor.$arch"
-pkgdesc="Samsung Galaxy SIII LTE kernel from LineageOS"
+pkgdesc="Samsung Galaxy SIII kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_samsung_smdk4412"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz busybox-static-$arch gcc6"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -115,6 +115,6 @@ package() {
 		INSTALL_MOD_PATH="$pkgdir" modules_install
 }
 
-sha512sums="d87dd54152980b30012fead62e639dde6ff0862d376790eac32800aeffd91482a220c7b1f233933a1879796dcaa3722e86c42a5f0e4df4168ae1f65362952779  linux-samsung-i9305-fa8fa332fdec11744ffe0c742775cc22efe0d041.tar.gz
-c1c667ff55603101ae0bb3cfb085a0536a4e817ee9e116b62bead734f758099b1abcbe21c2d8e4790de2a62bd48e3b60ae8e0eb529b829ad71e2ddf1e0296b8d  config-samsung-i9305.armv7
+sha512sums="d87dd54152980b30012fead62e639dde6ff0862d376790eac32800aeffd91482a220c7b1f233933a1879796dcaa3722e86c42a5f0e4df4168ae1f65362952779  linux-samsung-i9300-fa8fa332fdec11744ffe0c742775cc22efe0d041.tar.gz
+c1c667ff55603101ae0bb3cfb085a0536a4e817ee9e116b62bead734f758099b1abcbe21c2d8e4790de2a62bd48e3b60ae8e0eb529b829ad71e2ddf1e0296b8d  config-samsung-i9300.armv7
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h"
diff --git a/device/testing/linux-samsung-i9305/compiler-gcc6.h b/device/testing/linux-samsung-i9300/compiler-gcc6.h
similarity index 100%
rename from device/testing/linux-samsung-i9305/compiler-gcc6.h
rename to device/testing/linux-samsung-i9300/compiler-gcc6.h
diff --git a/device/testing/linux-samsung-i9305/config-samsung-i9305.armv7 b/device/testing/linux-samsung-i9300/config-samsung-i9300.armv7
similarity index 100%
rename from device/testing/linux-samsung-i9305/config-samsung-i9305.armv7
rename to device/testing/linux-samsung-i9300/config-samsung-i9300.armv7