diff --git a/device/community/device-samsung-serranovelte/APKBUILD b/device/community/device-samsung-serranove/APKBUILD
similarity index 67%
rename from device/community/device-samsung-serranovelte/APKBUILD
rename to device/community/device-samsung-serranove/APKBUILD
index 004483fdc..00ea00741 100644
--- a/device/community/device-samsung-serranovelte/APKBUILD
+++ b/device/community/device-samsung-serranove/APKBUILD
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Minecrell <minecrell@minecrell.net>
-pkgname=device-samsung-serranovelte
+pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -15,9 +15,11 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-mainline-modem:kernel_mainline_modem
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
 	$pkgname-phosh
 "
+_substitutes="device-samsung-serranovelte"
+replaces="$_substitutes"
+provides="$replaces=$pkgver-r$pkgrel"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -30,35 +32,36 @@ package() {
 kernel_mainline() {
 	pkgdesc="Close to mainline kernel (no modem, audio routed directly)"
 	depends="linux-postmarketos-qcom-msm8916"
+	replaces="$_substitutes-kernel-mainline"
+	provides="$replaces=$pkgver-r$pkgrel"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 kernel_mainline_modem() {
 	pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)"
 	depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem"
+	replaces="$_substitutes-kernel-mainline-modem"
+	provides="$replaces=$pkgver-r$pkgrel"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-samsung-serranovelte-venus firmware-samsung-serranovelte-wcnss"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-samsung-serranovelte-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-serranove-wcnss-nv"
+	replaces="$_substitutes-nonfree-firmware"
+	provides="$replaces=$pkgver-r$pkgrel"
 	mkdir "$subpkgdir"
 }
 
 phosh() {
+	replaces="$_substitutes-phosh"
+	provides="$replaces=$pkgver-r$pkgrel"
 	install_if="$pkgname postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/rootston.ini \
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
 sha512sums="
-6b82958b52b1924b9ac7f78928e2c267297744abd044f03197f538c790243ffdc555a2b7ffdea724d7ec1d398f4a12563cef0eecc43daa6a780e45bfe27a080e  deviceinfo
+b0f7f042e48b664837bae2251ee2bec21dd9ce916da6f5a5cf1fbc2f4b158e4e035cb317a89fd522394e33c1bb079be2eedb13358fb789a04cd61f62798c1d8f  deviceinfo
 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini
 "
diff --git a/device/community/device-samsung-serranovelte/deviceinfo b/device/community/device-samsung-serranove/deviceinfo
similarity index 97%
rename from device/community/device-samsung-serranovelte/deviceinfo
rename to device/community/device-samsung-serranove/deviceinfo
index 6a308963f..16c3b20d8 100644
--- a/device/community/device-samsung-serranovelte/deviceinfo
+++ b/device/community/device-samsung-serranove/deviceinfo
@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy S4 Mini Value Edition"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-serranovelte"
+deviceinfo_codename="samsung-serranove"
 deviceinfo_year="2015"
 deviceinfo_dtb_mainline="qcom-msm8916-samsung-serranovelte"
 deviceinfo_dtb_mainline_modem="qcom-msm8916-samsung-serranovelte-modem"
diff --git a/device/community/device-samsung-serranovelte/rootston.ini b/device/community/device-samsung-serranove/rootston.ini
similarity index 100%
rename from device/community/device-samsung-serranovelte/rootston.ini
rename to device/community/device-samsung-serranove/rootston.ini
diff --git a/device/community/firmware-samsung-serranove/APKBUILD b/device/community/firmware-samsung-serranove/APKBUILD
new file mode 100644
index 000000000..baded54d4
--- /dev/null
+++ b/device/community/firmware-samsung-serranove/APKBUILD
@@ -0,0 +1,28 @@
+pkgname=firmware-samsung-serranove
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Samsung Galaxy S4 Mini Value Edition"
+url="https://pepethekingprawn.gitlab.io/firmware/"
+subpackages="$pkgname-wcnss-nv:wcnss_nv"
+arch="armv7"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+source="https://pepethekingprawn.gitlab.io/firmware/GT-I9195I.tar.xz"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+wcnss_nv() {
+	pkgdesc="Samsung Galaxy S4 Mini Value Edition WiFi/BT firmware configuration"
+	replaces="firmware-samsung-serranovelte-wcnss"
+	cd "$srcdir"
+	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="
+9064ef28a3bb19a193b47f7d689ae397cdccd7cd8469bc8f7cdd4a76006a15c3f57b9a6081b9c4bd1e8499816cf244bc82337f956799a58dfc8ed40130ce5686  GT-I9195I.tar.xz
+"
diff --git a/device/community/firmware-samsung-serranovelte/APKBUILD b/device/community/firmware-samsung-serranovelte/APKBUILD
deleted file mode 100644
index b3063c887..000000000
--- a/device/community/firmware-samsung-serranovelte/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-pkgname=firmware-samsung-serranovelte
-pkgver=2
-pkgrel=0
-pkgdesc="Firmware for Samsung Galaxy S4 Mini Value Edition"
-url="https://pepethekingprawn.gitlab.io/firmware/"
-subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
-arch="armv7"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-source="https://pepethekingprawn.gitlab.io/firmware/GT-I9195I.tar.xz"
-
-_fwdir="/lib/firmware/postmarketos"
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-modem() {
-	pkgdesc="Samsung Galaxy S4 Mini Value Edition modem firmware"
-	install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir"
-	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
-}
-
-venus() {
-	pkgdesc="Samsung Galaxy S4 Mini Value Edition video firmware"
-	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
-}
-
-wcnss() {
-	pkgdesc="Samsung Galaxy S4 Mini Value Edition WiFi/BT firmware"
-	cd "$srcdir"
-	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
-}
-
-sha512sums="9064ef28a3bb19a193b47f7d689ae397cdccd7cd8469bc8f7cdd4a76006a15c3f57b9a6081b9c4bd1e8499816cf244bc82337f956799a58dfc8ed40130ce5686  GT-I9195I.tar.xz"