diff --git a/device/community/soc-qcom-msm8916/APKBUILD b/device/community/soc-qcom-msm8916/APKBUILD
index 7b3ffe149..07239b2c5 100644
--- a/device/community/soc-qcom-msm8916/APKBUILD
+++ b/device/community/soc-qcom-msm8916/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
 pkgver=7
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
@@ -23,7 +23,7 @@ package() {
 }
 
 modem() {
-	depends="msm-modem-mainline q6voiced"
+	depends="msm-modem-rpmsg q6voiced"
 	install="$subpkgname.post-install"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index d8082e1e0..6a7a4aacc 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/device/testing/device-fairphone-fp2/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
 pkgver=2
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -56,7 +56,7 @@ downstream_firmware() {
 
 mainline_firmware() {
 	pkgdesc="Firmware support packages for mainline kernel"
-	depends="msm-modem-mainline firmware-adreno"
+	depends="msm-modem-rpmsg firmware-adreno"
 	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index d6bb9a328..0c5564989 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
 pkgver=2
-pkgrel=21
+pkgrel=22
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -55,7 +55,7 @@ weston() {
 
 nonfree_firmware() {
 	pkgdesc="WiFi, GPU, Modem and ADSP firmware"
-	depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem msm-modem-mainline"
+	depends="linux-firmware-qcom linux-firmware-brcm firmware-adreno firmware-lg-hammerhead-adsp firmware-lg-hammerhead-modem msm-modem-rpmsg"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-oneplus-oneplus3/APKBUILD b/device/testing/device-oneplus-oneplus3/APKBUILD
index cbe5a3553..9482f98ef 100644
--- a/device/testing/device-oneplus-oneplus3/APKBUILD
+++ b/device/testing/device-oneplus-oneplus3/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-oneplus3
 pkgdesc="OnePlus 3"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,7 +32,7 @@ nonfree_firmware() {
 		linux-firmware-ath10k
 		linux-firmware-qca
 		firmware-oneplus-oneplus3-op3
-		msm-modem-mainline
+		msm-modem-rpmsg
 		"
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/device-oneplus-oneplus3t/APKBUILD b/device/testing/device-oneplus-oneplus3t/APKBUILD
index 81fc49b76..9249cf7e0 100644
--- a/device/testing/device-oneplus-oneplus3t/APKBUILD
+++ b/device/testing/device-oneplus-oneplus3t/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-oneplus3t
 pkgdesc="OnePlus 3T"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,7 +32,7 @@ nonfree_firmware() {
 		linux-firmware-ath10k
 		linux-firmware-qca
 		firmware-oneplus-oneplus3-op3t
-		msm-modem-mainline
+		msm-modem-rpmsg
 		"
 	mkdir "$subpkgdir"
 }
diff --git a/device/testing/soc-qcom-sdm845/APKBUILD b/device/testing/soc-qcom-sdm845/APKBUILD
index 9df3f742f..8b007d9d0 100644
--- a/device/testing/soc-qcom-sdm845/APKBUILD
+++ b/device/testing/soc-qcom-sdm845/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -16,7 +16,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem-mainline"
+	depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem"
 	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
-}
\ No newline at end of file
+}
diff --git a/modem/msm-modem/APKBUILD b/modem/msm-modem/APKBUILD
index 9593ce774..cd296b222 100644
--- a/modem/msm-modem/APKBUILD
+++ b/modem/msm-modem/APKBUILD
@@ -1,25 +1,25 @@
 pkgname=msm-modem
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Common support for Qualcomm MSM modems"
 url="https://postmarketos.org/"
 arch="armhf armv7 aarch64"
 license="GPL-3.0-or-later"
 depends="rmtfs rmtfs-openrc"
 install="$pkgname.post-install"
-subpackages="$pkgname-mainline $pkgname-downstream"
-source="udev-mainline.rules udev-downstream.rules"
+subpackages="$pkgname-rpmsg $pkgname-downstream"
+source="udev-rpmsg.rules udev-downstream.rules"
 options="!check"
 
 package() {
 	mkdir -p "$pkgdir"
 }
 
-mainline() {
-	pkgdesc="$pkgdesc (mainline)"
+rpmsg() {
+	pkgdesc="$pkgdesc (via RPMSG)"
 	depends="$pkgname rpmsgexport"
 
-	install -Dm644 "$srcdir/udev-mainline.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
+	install -Dm644 "$srcdir/udev-rpmsg.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
 }
 
 downstream() {
@@ -29,5 +29,5 @@ downstream() {
 	install -Dm644 "$srcdir/udev-downstream.rules" "$subpkgdir/usr/lib/udev/rules.d/55-$pkgname.rules"
 }
 
-sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab  udev-mainline.rules
+sha512sums="f842f617c441b8e6c1f8a7802792f5dfc22ab92216641f54e1a1fb8faec00a78b473baf02ef85b6ec295a88aa89a25325479380e1e65db62be879064782790ab  udev-rpmsg.rules
 64a40fb88d40ae0ff64d3545f7a54c6f10f2ab366ef75b8b158c2d5a3733223839c87aed8d5c6685d5056a5840d3943e68c76bd1bda2b48388161849d5e253f3  udev-downstream.rules"
diff --git a/modem/msm-modem/udev-mainline.rules b/modem/msm-modem/udev-rpmsg.rules
similarity index 100%
rename from modem/msm-modem/udev-mainline.rules
rename to modem/msm-modem/udev-rpmsg.rules