diff --git a/device/unmaintained/device-bq-picmt/APKBUILD b/device/unmaintained/device-bq-paella-downstream/APKBUILD
similarity index 65%
rename from device/unmaintained/device-bq-picmt/APKBUILD
rename to device/unmaintained/device-bq-paella-downstream/APKBUILD
index e8360fe91..c6baa1d93 100644
--- a/device/unmaintained/device-bq-picmt/APKBUILD
+++ b/device/unmaintained/device-bq-paella-downstream/APKBUILD
@@ -1,14 +1,14 @@
 # Unmaintained: Downstream port, only for testing. Use mainline port (bq-paella)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-bq-picmt
-pkgdesc="BQ Aquaris X5"
+pkgname=device-bq-paella-downstream
+pkgdesc="BQ Aquaris X5 (Downstream)"
 pkgver=1
-pkgrel=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-bq-picmt mkbootimg qemu mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-bq-paella-downstream mkbootimg qemu mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -28,4 +28,4 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="c6da1cf28790a6fbb76da251b0c966d4a5d444ab41208a812c5f514a37bee9bf050d4f94be5e5c18c862d4a2f356cda7b89522c655e6bd287af96f1ab078e38a  deviceinfo"
+sha512sums="e872f7f78d9add160fc962dc6053a490edce1cda8c306e47b9e90098640af5e83556e138242abfc76757cd913bf4c56d9c3857533fcdb780a1578e641ecf015e  deviceinfo"
diff --git a/device/unmaintained/device-bq-picmt/deviceinfo b/device/unmaintained/device-bq-paella-downstream/deviceinfo
similarity index 96%
rename from device/unmaintained/device-bq-picmt/deviceinfo
rename to device/unmaintained/device-bq-paella-downstream/deviceinfo
index 6f0ef84b5..3d77129c3 100644
--- a/device/unmaintained/device-bq-picmt/deviceinfo
+++ b/device/unmaintained/device-bq-paella-downstream/deviceinfo
@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="BQ Aquaris X5"
 deviceinfo_manufacturer="BQ"
-deviceinfo_codename="bq-picmt"
+deviceinfo_codename="bq-paella-downstream"
 deviceinfo_year="2015"
 deviceinfo_arch="armv7"
 
diff --git a/device/unmaintained/linux-bq-picmt/APKBUILD b/device/unmaintained/linux-bq-paella-downstream/APKBUILD
similarity index 87%
rename from device/unmaintained/linux-bq-picmt/APKBUILD
rename to device/unmaintained/linux-bq-paella-downstream/APKBUILD
index 41b6a0721..1333a62a1 100644
--- a/device/unmaintained/linux-bq-picmt/APKBUILD
+++ b/device/unmaintained/linux-bq-paella-downstream/APKBUILD
@@ -2,13 +2,13 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/picmt_defconfig
 
-pkgname=linux-bq-picmt
+pkgname=linux-bq-paella-downstream
 pkgver=3.10.49
 pkgrel=0
-pkgdesc="BQ Aquaris X5 kernel fork"
+pkgdesc="BQ Aquaris X5 downstream kernel fork"
 arch="armv7"
 _carch="arm"
-_flavor="bq-picmt"
+_flavor="bq-paella-downstream"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -47,6 +47,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="409acfb8f8951e3b0d1a11160d2f21e5f4f7de932187ab35828df84b6a3532a9711eceae82105bc93785a0fff1483b994c51ceb4cb60ec34943db137a4091480  linux-bq-picmt-f727041ed84edbe41169f612430ec23fe0754a7e.tar.gz
-0393408784501f499dbd41f4e24389e2deab73d55201dc1dcb5a95f0e33d0823aa8d090bab47f8facba518600840098e754a65118cfc002f220581aed4d842ab  config-bq-picmt.armv7
+sha512sums="409acfb8f8951e3b0d1a11160d2f21e5f4f7de932187ab35828df84b6a3532a9711eceae82105bc93785a0fff1483b994c51ceb4cb60ec34943db137a4091480  linux-bq-paella-downstream-f727041ed84edbe41169f612430ec23fe0754a7e.tar.gz
+0393408784501f499dbd41f4e24389e2deab73d55201dc1dcb5a95f0e33d0823aa8d090bab47f8facba518600840098e754a65118cfc002f220581aed4d842ab  config-bq-paella-downstream.armv7
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
diff --git a/device/unmaintained/linux-bq-picmt/config-bq-picmt.armv7 b/device/unmaintained/linux-bq-paella-downstream/config-bq-paella-downstream.armv7
similarity index 100%
rename from device/unmaintained/linux-bq-picmt/config-bq-picmt.armv7
rename to device/unmaintained/linux-bq-paella-downstream/config-bq-paella-downstream.armv7
diff --git a/device/unmaintained/linux-bq-picmt/gcc10-extern_YYLOC_global_declaration.patch b/device/unmaintained/linux-bq-paella-downstream/gcc10-extern_YYLOC_global_declaration.patch
similarity index 100%
rename from device/unmaintained/linux-bq-picmt/gcc10-extern_YYLOC_global_declaration.patch
rename to device/unmaintained/linux-bq-paella-downstream/gcc10-extern_YYLOC_global_declaration.patch