diff --git a/device/testing/device-samsung-i9195/APKBUILD b/device/testing/device-samsung-serranolte/APKBUILD
similarity index 58%
rename from device/testing/device-samsung-i9195/APKBUILD
rename to device/testing/device-samsung-serranolte/APKBUILD
index ea1c8015f7144a42246079c9e53ea39a69d15a1d..ed8197e67af1c79fbcd49fd6328c697f0442887e 100644
--- a/device/testing/device-samsung-i9195/APKBUILD
+++ b/device/testing/device-samsung-serranolte/APKBUILD
@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-i9195
+pkgname=device-samsung-serranolte
 pkgdesc="Samsung Galaxy S4 Mini"
 pkgver=0.3
-pkgrel=10
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-i9195 mkbootimg"
+depends="postmarketos-base linux-samsung-serranolte mkbootimg mesa-dri-gallium"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"
 source="deviceinfo"
@@ -23,8 +23,10 @@ package() {
 nonfree_firmware() {
 	pkgdesc="Firmware for Modem and WiFi"
 	# Non-firmware packages placed here, because they aren't useful without firmware
-	depends="firmware-samsung-i9195-modem firmware-samsung-i9195-wlan msm-modem-downstream"
+	depends="firmware-samsung-serranolte-modem firmware-samsung-serranolte-wlan msm-modem-downstream"
 	mkdir "$subpkgdir"
 }
 
-sha512sums="bbcd37577a295733e01b4031e6a907e5640760ab7c46fe2e177d226b6d80e15b164ef6f3af6b8da14a24832ecf5fb4ee4d9b245e7fadc4f25a6ec3280558bf1c  deviceinfo"
+sha512sums="
+2fd91fdb47b46fc4e7e5f088bd5f83329c86b3806535ac5cd078a81daec1cf26b9811ed78afc9f3b143301bcb109d1736eba62cb7058846f9091e507a2ad9d3f  deviceinfo
+"
diff --git a/device/testing/device-samsung-i9195/deviceinfo b/device/testing/device-samsung-serranolte/deviceinfo
similarity index 94%
rename from device/testing/device-samsung-i9195/deviceinfo
rename to device/testing/device-samsung-serranolte/deviceinfo
index 7fc72c4e1fd5234d4cc137f6eff43231a229c532..d54f6f5104e66276ef8460a5e8d25fae8f57a1aa 100644
--- a/device/testing/device-samsung-i9195/deviceinfo
+++ b/device/testing/device-samsung-serranolte/deviceinfo
@@ -4,11 +4,11 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy S4 Mini"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-i9195"
+deviceinfo_codename="samsung-serranolte"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"
diff --git a/device/testing/firmware-samsung-i9195/APKBUILD b/device/testing/firmware-samsung-serranolte/APKBUILD
similarity index 84%
rename from device/testing/firmware-samsung-i9195/APKBUILD
rename to device/testing/firmware-samsung-serranolte/APKBUILD
index b9062c4118801430d02bb462e4973dcff14f24f7..c66c97b85424b7cc544f939852f229a58cd6a278 100644
--- a/device/testing/firmware-samsung-i9195/APKBUILD
+++ b/device/testing/firmware-samsung-serranolte/APKBUILD
@@ -1,14 +1,14 @@
-pkgname=firmware-samsung-i9195
+pkgname=firmware-samsung-serranolte
 # XDA post explains the meaning of the firmware version, which has been translated into the $pkgver
 pkgver=1.1.0
 _ver=I9195XXUCQG1
-pkgrel=1
+pkgrel=0
 _commit="f3c513732580e500fe27000683db268406806ed7"
 _commit_2="fb69a737df5f13c2975fd385a15908389fe5d5bd"
 pkgdesc="Samsung Galaxy S 4 Mini firmware"
 subpackages="$pkgname-modem $pkgname-wlan"
 url="https://forum.xda-developers.com/galaxy-s4-mini/general/modem-samsung-galaxy-s4-mini-gt-i9195-t3390780"
-arch="armhf"
+arch="armv7"
 license="proprietary"
 source="$pkgname-$_ver.tar.xz::https://drive.google.com/uc?export=download&id=1bKQ6m9avN6k2puJTZr55dIeGb8B7K_lT
 	$pkgname-$pkgver.tar.gz::https://github.com/j0ki/firmware-samsung-i9195/archive/$_commit.tar.gz
@@ -49,6 +49,8 @@ wlan() {
 	done
 }
 
-sha512sums="32e27bf12f40abd9a049562e4830d061518bd9efaf991cdc48c1aa3736bdc8c581eea14fa240fbaead255f83c7692d186f53a491837a662ac6368ca943634684  firmware-samsung-i9195-I9195XXUCQG1.tar.xz
-fdfd2aeb780a73dcb152e4f3554781c1338b8bd683cdc61e92965c7e0006ad2d88f55b0514e15e13b322ec83cdf11ba9ae2cd49892b4470807966b4ed8f55d5b  firmware-samsung-i9195-1.1.0.tar.gz
-8ac342f7a332512a4d04cd1c38937abd8634937a1b975b29290a265daf8cb37e0b1d739442e5b50e6c85ab14475f2837373d6994ebd9e6fc1f7fbac3204cc733  firmware-samsung-i9195-1.1.0-2.tar.gz"
+sha512sums="
+32e27bf12f40abd9a049562e4830d061518bd9efaf991cdc48c1aa3736bdc8c581eea14fa240fbaead255f83c7692d186f53a491837a662ac6368ca943634684  firmware-samsung-serranolte-I9195XXUCQG1.tar.xz
+fdfd2aeb780a73dcb152e4f3554781c1338b8bd683cdc61e92965c7e0006ad2d88f55b0514e15e13b322ec83cdf11ba9ae2cd49892b4470807966b4ed8f55d5b  firmware-samsung-serranolte-1.1.0.tar.gz
+8ac342f7a332512a4d04cd1c38937abd8634937a1b975b29290a265daf8cb37e0b1d739442e5b50e6c85ab14475f2837373d6994ebd9e6fc1f7fbac3204cc733  firmware-samsung-serranolte-1.1.0-2.tar.gz
+"
diff --git a/device/testing/linux-samsung-i9195/01_msm-fix-perf_trace_counters.patch b/device/testing/linux-samsung-serranolte/01_msm-fix-perf_trace_counters.patch
similarity index 100%
rename from device/testing/linux-samsung-i9195/01_msm-fix-perf_trace_counters.patch
rename to device/testing/linux-samsung-serranolte/01_msm-fix-perf_trace_counters.patch
diff --git a/device/testing/linux-samsung-i9195/02_gpu-msm-fix-gcc5-compile.patch b/device/testing/linux-samsung-serranolte/02_gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from device/testing/linux-samsung-i9195/02_gpu-msm-fix-gcc5-compile.patch
rename to device/testing/linux-samsung-serranolte/02_gpu-msm-fix-gcc5-compile.patch
diff --git a/device/testing/linux-samsung-i9195/03_fix-video-argb-setting.patch b/device/testing/linux-samsung-serranolte/03_fix-video-argb-setting.patch
similarity index 100%
rename from device/testing/linux-samsung-i9195/03_fix-video-argb-setting.patch
rename to device/testing/linux-samsung-serranolte/03_fix-video-argb-setting.patch
diff --git a/device/testing/linux-samsung-i9195/APKBUILD b/device/testing/linux-samsung-serranolte/APKBUILD
similarity index 78%
rename from device/testing/linux-samsung-i9195/APKBUILD
rename to device/testing/linux-samsung-serranolte/APKBUILD
index 5a29e8ace9dca441f900b191f521c29d1eeb9f97..690c7edcbb1e7355affd4a1a0e241cb52bc567b8 100644
--- a/device/testing/linux-samsung-i9195/APKBUILD
+++ b/device/testing/linux-samsung-serranolte/APKBUILD
@@ -1,12 +1,12 @@
 # Kernel config based on: arch/arm/configs/{samsung_serrano_defconfig, msm8930_serrano_eur_lte_defconfig}
 
-pkgname=linux-samsung-i9195
+pkgname=linux-samsung-serranolte
 pkgver=3.4.113
-pkgrel=6
+pkgrel=0
 pkgdesc="Samsung Samsung Galaxy S4 Mini kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
-_flavor="samsung-i9195"
+_flavor="samsung-serranolte"
 url="https://kernel.org"
 license="GPL2"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -49,8 +49,10 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="7ce3621f50e0c615795eed17fa5178ba2d2c3165b9267f80f088305f8cb591c704129d841cb4c82496f185a59669dccf61b527dbf21b548a923bdb96b666dc2d  linux-samsung-i9195-c4b753a5d44f42cee2191ecf5504bccdf53c838d.tar.gz
-ae7143619bcae5457c3c524472b59f0d383445d62de0882ea6d279af63c61189c398a3cd9c9af1e67e7dde4b9437017b62329ac3cb2f56ae4b0487d0da145da0  config-samsung-i9195.armhf
+sha512sums="
+7ce3621f50e0c615795eed17fa5178ba2d2c3165b9267f80f088305f8cb591c704129d841cb4c82496f185a59669dccf61b527dbf21b548a923bdb96b666dc2d  linux-samsung-serranolte-c4b753a5d44f42cee2191ecf5504bccdf53c838d.tar.gz
+0adc8f464d3b96484bb6a1e1282d8d6ae804a1ccddcbbccf09491c5c385dc23500940147532ebe59b3bd5bf3bcec32a89a5843ae0b2ec7f9bd824e99e4b08118  config-samsung-serranolte.armv7
 f85ced49ee2f2461adea68dac0a10452aa809a7d41d869092d94eb085344919a9a385dec0c48011f4601ca4f441700f7fe49075c7eca4fb2d66b01f7d413ccb7  01_msm-fix-perf_trace_counters.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd  03_fix-video-argb-setting.patch"
+e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd  03_fix-video-argb-setting.patch
+"
diff --git a/device/testing/linux-samsung-i9195/config-samsung-i9195.armhf b/device/testing/linux-samsung-serranolte/config-samsung-serranolte.armv7
similarity index 99%
rename from device/testing/linux-samsung-i9195/config-samsung-i9195.armhf
rename to device/testing/linux-samsung-serranolte/config-samsung-serranolte.armv7
index 388f5a31334f6c6c9a479a27dc682b0fc6712c5f..51b4ea00e9ab97f22f36dd62ecc2f08bee24f15f 100644
--- a/device/testing/linux-samsung-i9195/config-samsung-i9195.armhf
+++ b/device/testing/linux-samsung-serranolte/config-samsung-serranolte.armv7
@@ -3695,7 +3695,6 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_ABLK_HELPER=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
@@ -3747,7 +3746,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_ARM=y
+# CONFIG_CRYPTO_SHA256_ARM is not set
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA512_ARM_NEON=y
 # CONFIG_CRYPTO_TGR192 is not set
@@ -3758,7 +3757,7 @@ CONFIG_CRYPTO_SHA512_ARM_NEON=y
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_ARM=y
-CONFIG_CRYPTO_AES_ARM_BS=y
+# CONFIG_CRYPTO_AES_ARM_BS is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_BLOWFISH is not set