diff --git a/device/testing/device-asus-x00td/APKBUILD b/device/testing/device-asus-x00td/APKBUILD
index 7f3a94f380173c2eef5d9fb093b9e18f1f8c14dd..2dda635b17c2b2bbed84ba0897a5a57ab3d57e76 100644
--- a/device/testing/device-asus-x00td/APKBUILD
+++ b/device/testing/device-asus-x00td/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-asus-x00td
 pkgdesc="Asus ZenFone Max Pro M1"
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -43,5 +43,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-af08bb13607d21483e3c87ab392a741dfc362e536afd9d6cc5b63863852fab1bf8058e7329b5308fa969b3ebfec10b4d8d760010e59e10e3a308c88fd88a2d0e  deviceinfo
+1832ab46901d057e7a9371f634cf9eb535227760ff515637af22604344290a715a77fd17a7d05f8d879d41416eb37dbab0ad2e7443e41379272a40f519ca3c92  deviceinfo
 "
diff --git a/device/testing/device-asus-x00td/deviceinfo b/device/testing/device-asus-x00td/deviceinfo
index e5f8fae965c42026609fc77b0e8346165e5e42c3..df18ec42486adcf14d7aafe40ec9e272e4377d31 100644
--- a/device/testing/device-asus-x00td/deviceinfo
+++ b/device/testing/device-asus-x00td/deviceinfo
@@ -34,4 +34,4 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
-deviceinfo_usb_rndis_function_downstream="rndis_bam.rndis"
+deviceinfo_usb_network_function_downstream="rndis_bam.rndis"
diff --git a/device/testing/device-motorola-nash/APKBUILD b/device/testing/device-motorola-nash/APKBUILD
index a18b8e58503b1086f5f45d7a5e8d6cca107667a4..999ec7e4e802d679333cb191df66a5a1b8b5a0c5 100644
--- a/device/testing/device-motorola-nash/APKBUILD
+++ b/device/testing/device-motorola-nash/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-motorola-nash
 pkgdesc="Motorola Moto Z2 Force"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-f4a1a89ab4c99481309efca6b5fdfd2210d2732a4db5f90f40a623a275b629bc7c5966aaf54c4c0f4ed4325472c7e9d3cf0a3fe8c8dce681010b7ff2c683ab56  deviceinfo
+0b0bf79357d11ed144c24100495afda79db7de034b3d94e25cf67255b7e6201fa290d213cc64e83eea9369e3df0ca3f981084028a9214a07073ecfcb939c2fde  deviceinfo
 "
diff --git a/device/testing/device-motorola-nash/deviceinfo b/device/testing/device-motorola-nash/deviceinfo
index b6e2b8c8985df205414e96089232c35a30870db5..c5a17e98da99088f170cfb9aa8a9aff0eadf964c 100644
--- a/device/testing/device-motorola-nash/deviceinfo
+++ b/device/testing/device-motorola-nash/deviceinfo
@@ -30,4 +30,4 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # USB related
-deviceinfo_usb_rndis_function="rndis.gs4"
+deviceinfo_usb_network_function="rndis.gs4"
diff --git a/device/testing/device-motorola-payton/APKBUILD b/device/testing/device-motorola-payton/APKBUILD
index 6abd70b0936ee0108d476f2c0a3b247225cd8b20..dca7b80e452442aa342749415516d93f7d87a4a3 100644
--- a/device/testing/device-motorola-payton/APKBUILD
+++ b/device/testing/device-motorola-payton/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-motorola-payton
 pkgdesc="Motorola Moto X4"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,7 +23,7 @@ package() {
 
 
 sha512sums="
-c5e3605061850c0e2388d989308ac768de05a2535ce839bbef7b61492629df586f9b76dc8e1a6a08f03cc4409c311309d1e5f00a333ef37f00f40665b0291c91  deviceinfo
+66a3899cfe21927e6241a3a2fa3998fa9eb54ffbad4fc4b536487f20b6e8b8dfc852d02a33bbc350bfc1300732f9f664644b64781e525c37d4b9a62d819a4099  deviceinfo
 3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515  directfbrc
 fed190ea8ef9470e30046bcd421b475684b88a03912730813d6364bf669dc01b1e311ceb68c3ae7fdd0b3a7ce75ff24ee546ecd0be40119ecf79a097870613ea  fb.modes
 "
diff --git a/device/testing/device-motorola-payton/deviceinfo b/device/testing/device-motorola-payton/deviceinfo
index 1f041812215bc6895278f3d50d6e2f315c5761f8..b51af81d7aa419e3c9460a3ee1961502812e1d7b 100644
--- a/device/testing/device-motorola-payton/deviceinfo
+++ b/device/testing/device-motorola-payton/deviceinfo
@@ -30,4 +30,4 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # USB related
-deviceinfo_usb_rndis_function="rndis_bam.rndis"
+deviceinfo_usb_network_function="rndis_bam.rndis"
diff --git a/device/testing/device-xiaomi-lavender/APKBUILD b/device/testing/device-xiaomi-lavender/APKBUILD
index bb327443d561109f4cf3ff07b08689a31ebda7ca..4bd4e66e9de203e0d2c95f7be7defc80cf13868d 100644
--- a/device/testing/device-xiaomi-lavender/APKBUILD
+++ b/device/testing/device-xiaomi-lavender/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-lavender
 pkgdesc="Xiaomi Redmi Note 7"
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -37,5 +37,5 @@ kernel_mainline() {
 }
 
 sha512sums="
-f0d38ff8b01768b1147f48a1dfbdb30306db6971dc1dcb860acbc0650c682e372353e60302c1c3e909860dc606d8c2db4700ec140c897a46e9bc234f159d4bf2  deviceinfo
+ba63ba13678522f9358dc2f1aaa018d4a69c886fd0b4887e6e91b99993218cdac698f0b2e72d1700f09ff4f246fdcd25c3e0771f847f7564657fb1bd20a248b6  deviceinfo
 "
diff --git a/device/testing/device-xiaomi-lavender/deviceinfo b/device/testing/device-xiaomi-lavender/deviceinfo
index 184615b5863e8cd150fa34ed083371c6927d47fe..087368cfb6c6ff06d41b94dd94bbe56851ea9f51 100644
--- a/device/testing/device-xiaomi-lavender/deviceinfo
+++ b/device/testing/device-xiaomi-lavender/deviceinfo
@@ -37,4 +37,4 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_usb_idVendor="0x2717"
 # Mi/Redmi series (RNDIS)
 deviceinfo_usb_idProduct="0xff80"
-deviceinfo_usb_rndis_function_downstream="rndis_bam.rndis"
+deviceinfo_usb_network_function_downstream="rndis_bam.rndis"
diff --git a/device/testing/device-xiaomi-platina/APKBUILD b/device/testing/device-xiaomi-platina/APKBUILD
index 4d2586c3fd1b80fdd0fb3f7ffbe69686100d7900..5407cdc691d302f068c65ab6ada3b9e520864d65 100644
--- a/device/testing/device-xiaomi-platina/APKBUILD
+++ b/device/testing/device-xiaomi-platina/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-xiaomi-platina
 pkgdesc="Xiaomi Mi 8 Lite"
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -36,5 +36,5 @@ kernel_mainline() {
 }
 
 sha512sums="
-6f61447493fcfe144576a13760708f669c9992731a0ba33f732cfb40f686d16139cef74805481b85b54dfcbfc32c69d51b9c6944bf582dbe7151379ce8aeabf4  deviceinfo
+a763ec1e7742ae747f7b7e6e75d190e3e914b0922decea0bb322cfacaa82ab92e7e69126f276e41b2c604cfe6c37f39dc550e2261bee336be8c2205137bedead  deviceinfo
 "
diff --git a/device/testing/device-xiaomi-platina/deviceinfo b/device/testing/device-xiaomi-platina/deviceinfo
index d79a7b579f2056e4b57d8da5ff29c12d042bf672..5e789c763672fd6870ee94b9e93391cf8fbfbc02 100644
--- a/device/testing/device-xiaomi-platina/deviceinfo
+++ b/device/testing/device-xiaomi-platina/deviceinfo
@@ -40,4 +40,4 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_usb_idVendor="0x2717"
 # Mi/Redmi series (RNDIS)
 deviceinfo_usb_idProduct="0xff80"
-deviceinfo_usb_rndis_function_downstream="rndis_bam.rndis"
+deviceinfo_usb_network_function_downstream="rndis_bam.rndis"
diff --git a/device/testing/device-xiaomi-whyred/APKBUILD b/device/testing/device-xiaomi-whyred/APKBUILD
index 641af68b78b597065eacdc67c0dcde1aace7f942..8050901508a742ac5d7f4785ceef5e7a037ad280 100644
--- a/device/testing/device-xiaomi-whyred/APKBUILD
+++ b/device/testing/device-xiaomi-whyred/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-whyred
 pkgdesc="Xiaomi Redmi Note 5"
 pkgver=1.0
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -22,5 +22,5 @@ package() {
 
 
 sha512sums="
-ced418013aa6e52ba2158c2ad0551a20b0578d54d8154c7126b95bc4bceaa8e94677d07a9731e48b345861c04f73fc1b58b4635bb857dbdf1cfc7377e54caf66  deviceinfo
+818662013b4fed6591feaa3fa20bfa2adabd013726eaaf559e7cd1e703267a7e815be0eca57645d38d6ea9841db465084ae468e3b42410e3f3f0f7c3420f54dd  deviceinfo
 "
diff --git a/device/testing/device-xiaomi-whyred/deviceinfo b/device/testing/device-xiaomi-whyred/deviceinfo
index 62d1c3f3cd051abe05a7618170705658e27f15d5..d87cc227a677571e6cf2099c9608c9560b87f72d 100644
--- a/device/testing/device-xiaomi-whyred/deviceinfo
+++ b/device/testing/device-xiaomi-whyred/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Xiaomi Redmi Note 5"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-whyred"
 deviceinfo_year="2018"
-deviceinfo_usb_rndis_function="rndis_bam.rndis"
+deviceinfo_usb_network_function="rndis_bam.rndis"
 deviceinfo_arch="aarch64"
 
 # Device related
diff --git a/device/unmaintained/device-xiaomi-cepheus-downstream/APKBUILD b/device/unmaintained/device-xiaomi-cepheus-downstream/APKBUILD
index 46a56ef175e56a3cd303f8e429f106c9e4ce3814..41b288eae31bf3ddff1c2df582ad29fbb83459dc 100644
--- a/device/unmaintained/device-xiaomi-cepheus-downstream/APKBUILD
+++ b/device/unmaintained/device-xiaomi-cepheus-downstream/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-cepheus-downstream
 pkgdesc="Xiaomi Mi 9"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -25,5 +25,5 @@ package() {
 }
 
 sha512sums="
-85230176c0c94884eaef85ca77f3dbee78884bd4a05b0da0509331d2c098355b6da437767d8619ceb217d9e4cb2dee33cef91bee860ee3938f60b4834bcd73d0  deviceinfo
+ee52ac16542a599f397fba5ddbb82028d666dec7f509a4b9298df248ac98a129c7f2eb4452282c5de38f7f97516da6ba70ea027a0fea075881f6a7f5d2ca10c7  deviceinfo
 "
diff --git a/device/unmaintained/device-xiaomi-cepheus-downstream/deviceinfo b/device/unmaintained/device-xiaomi-cepheus-downstream/deviceinfo
index 1b4319f74e595c6aaa2328b15b509f3281f6c843..9d86998636e1a626d04a4fb57ef30365baa12d7f 100644
--- a/device/unmaintained/device-xiaomi-cepheus-downstream/deviceinfo
+++ b/device/unmaintained/device-xiaomi-cepheus-downstream/deviceinfo
@@ -36,4 +36,4 @@ deviceinfo_rootfs_image_sector_size="4096"
 deviceinfo_usb_idVendor="0x2717"
 # Mi/Redmi series (RNDIS)
 deviceinfo_usb_idProduct="0xff80"
-deviceinfo_usb_rndis_function="rndis.rndis"
+deviceinfo_usb_network_function="rndis.rndis"