diff --git a/device/testing/device-clockworkpi-uconsole-cm4/device-clockworkpi-uconsole-cm4-openrc.post-upgrade b/device/testing/device-clockworkpi-uconsole-cm4/device-clockworkpi-uconsole-cm4-openrc.post-upgrade
deleted file mode 120000
index 7433a556a..000000000
--- a/device/testing/device-clockworkpi-uconsole-cm4/device-clockworkpi-uconsole-cm4-openrc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-./device-clockworkpi-uconsole-cm4-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/95-vchiq-permissions.rules b/device/testing/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-cm4/95-vchiq-permissions.rules
rename to device/testing/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD b/device/testing/device-clockworkpi-uconsole-rpi/APKBUILD
similarity index 80%
rename from device/testing/device-clockworkpi-uconsole-cm4/APKBUILD
rename to device/testing/device-clockworkpi-uconsole-rpi/APKBUILD
index 2064dbb60..3bfe44ad0 100644
--- a/device/testing/device-clockworkpi-uconsole-cm4/APKBUILD
+++ b/device/testing/device-clockworkpi-uconsole-rpi/APKBUILD
@@ -1,15 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Federico Amedeo Izzo <federico@izzo.pro>
-pkgname=device-clockworkpi-uconsole-cm4
-pkgdesc="Clockwork Tech ClockworkPi uConsole CM4"
-pkgver=2
+pkgname=device-clockworkpi-uconsole-rpi
+pkgdesc="Clockwork Tech ClockworkPi uConsole with Raspberry Pi compute modules"
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-clockworkpi-uconsole-cm4
+	linux-clockworkpi-uconsole-rpi
 	postmarketos-base
 	raspberrypi-bootloader
 "
@@ -24,6 +24,7 @@ source="
 	usercfg.txt
 	95-vchiq-permissions.rules
 "
+provides="device-clockworkpi-uconsole-cm4=$pkgver-r$pkgrel"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -51,7 +52,7 @@ openrc() {
 }
 
 sha512sums="
-8239d117839d3e3603c7ab73e598059bb521b81aeec5d6f7d0ec68d00cb9912bbad9fe5a0741e41e7ec94250729042dce91a6efb412c4e30c43a9c0b0a81a5b5  deviceinfo
+0636af702d2b5e48dfd99bc09bce57768f617f7322ab84ef4fbce3f91e60733a1652e7a5a061112f7f4b037d66f49f4613f3bc4d3504d3b351c719179d2b3ac0  deviceinfo
 d97e603ef83626ec12a2503035c8de4d3d4d548510b85b26b07382736c334ae0c420e6811612fa83795eb8aa349dae29ec9944708d57cdd04cce09db3c32de23  modules-initfs
 2c6d1c786e2ba16f26da89e836f09399e73f559553696a7bd03b495caaaa9195ba234d33b1bc90733915c8752aca8a1ca4c90d4c19057c7dcdfad163d6d761d2  usercfg.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/device-clockworkpi-uconsole-cm4-openrc.post-install b/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-cm4/device-clockworkpi-uconsole-cm4-openrc.post-install
rename to device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade b/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade
new file mode 120000
index 000000000..b4daa91bd
--- /dev/null
+++ b/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade
@@ -0,0 +1 @@
+device-clockworkpi-uconsole-rpi-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/deviceinfo b/device/testing/device-clockworkpi-uconsole-rpi/deviceinfo
similarity index 81%
rename from device/testing/device-clockworkpi-uconsole-cm4/deviceinfo
rename to device/testing/device-clockworkpi-uconsole-rpi/deviceinfo
index 598cf244a..06320440d 100644
--- a/device/testing/device-clockworkpi-uconsole-cm4/deviceinfo
+++ b/device/testing/device-clockworkpi-uconsole-rpi/deviceinfo
@@ -4,9 +4,9 @@
 # scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Clockwork Tech ClockworkPi uConsole CM4"
+deviceinfo_name="Clockwork Tech ClockworkPi uConsole with Rapsberry Pi compute modules"
 deviceinfo_manufacturer="Clockwork Tech"
-deviceinfo_codename="clockworkpi-uconsole-cm4"
+deviceinfo_codename="clockworkpi-uconsole-rpi"
 deviceinfo_year="2023"
 deviceinfo_arch="aarch64"
 deviceinfo_disable_dhcpd="true"
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/modules-initfs b/device/testing/device-clockworkpi-uconsole-rpi/modules-initfs
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-cm4/modules-initfs
rename to device/testing/device-clockworkpi-uconsole-rpi/modules-initfs
diff --git a/device/testing/device-clockworkpi-uconsole-cm4/usercfg.txt b/device/testing/device-clockworkpi-uconsole-rpi/usercfg.txt
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-cm4/usercfg.txt
rename to device/testing/device-clockworkpi-uconsole-rpi/usercfg.txt
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/0001-video-backlight-add-OCP8178-backlight-driver.patch b/device/testing/linux-clockworkpi-uconsole-rpi/0001-video-backlight-add-OCP8178-backlight-driver.patch
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/0001-video-backlight-add-OCP8178-backlight-driver.patch
rename to device/testing/linux-clockworkpi-uconsole-rpi/0001-video-backlight-add-OCP8178-backlight-driver.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/0002-gpu-drm-add-CWU50-and-CWD686-panels.patch b/device/testing/linux-clockworkpi-uconsole-rpi/0002-gpu-drm-add-CWU50-and-CWD686-panels.patch
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/0002-gpu-drm-add-CWU50-and-CWD686-panels.patch
rename to device/testing/linux-clockworkpi-uconsole-rpi/0002-gpu-drm-add-CWU50-and-CWD686-panels.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/0003-power-supply-add-axp20x-drivers.patch b/device/testing/linux-clockworkpi-uconsole-rpi/0003-power-supply-add-axp20x-drivers.patch
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/0003-power-supply-add-axp20x-drivers.patch
rename to device/testing/linux-clockworkpi-uconsole-rpi/0003-power-supply-add-axp20x-drivers.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/0004-arm64-configs-update-bcm2712-bcm2711-defconfig.patch b/device/testing/linux-clockworkpi-uconsole-rpi/0004-arm64-configs-update-bcm2712-bcm2711-defconfig.patch
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/0004-arm64-configs-update-bcm2712-bcm2711-defconfig.patch
rename to device/testing/linux-clockworkpi-uconsole-rpi/0004-arm64-configs-update-bcm2712-bcm2711-defconfig.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/0005-arm-boot-overlays-add-uconsole-overlays.patch b/device/testing/linux-clockworkpi-uconsole-rpi/0005-arm-boot-overlays-add-uconsole-overlays.patch
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/0005-arm-boot-overlays-add-uconsole-overlays.patch
rename to device/testing/linux-clockworkpi-uconsole-rpi/0005-arm-boot-overlays-add-uconsole-overlays.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/APKBUILD b/device/testing/linux-clockworkpi-uconsole-rpi/APKBUILD
similarity index 90%
rename from device/testing/linux-clockworkpi-uconsole-cm4/APKBUILD
rename to device/testing/linux-clockworkpi-uconsole-rpi/APKBUILD
index 9039e049f..b3de4482c 100644
--- a/device/testing/linux-clockworkpi-uconsole-cm4/APKBUILD
+++ b/device/testing/linux-clockworkpi-uconsole-rpi/APKBUILD
@@ -1,17 +1,18 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/bcm2711_defconfig
 # Maintainer: Federico Amedeo Izzo <federico@izzo.pro>
-pkgname=linux-clockworkpi-uconsole-cm4
+pkgname=linux-clockworkpi-uconsole-rpi
 pkgver=6.12.30
 pkgrel=0
-pkgdesc="Clockwork Tech ClockworkPi uConsole CM4 kernel fork"
+pkgdesc="Clockwork Tech ClockworkPi uConsole Rapsberry Pi kernel fork"
 arch="aarch64"
 _carch="arm64"
-_flavor="clockworkpi-uconsole-cm4"
+_flavor="clockworkpi-uconsole-rpi"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
 depends="linux-firmware-brcm"
+provides="linux-clockworkpi-uconsole-cm4=$pkgver-r$pkgrel"
 makedepends="
 	bash
 	bc
@@ -73,8 +74,8 @@ package() {
 }
 
 sha512sums="
-93b4a8b35cf4aae85c634a16b301ab61f6ec526fa581cd32ac654738b88f31ac16e033322f172e492db6cfcf1c2b11a73f2b9bddd0e8c4afc2cd70d85f7b1319  linux-clockworkpi-uconsole-cm4-1ec873f3f18c98f0dc6d51db5b75958e109a0e5c.tar.gz
-3654a748386272673423f84f5bfcdd79d5d79d4272c279afdc5ab257468eaa27a20e0b6465681e88c8fb45f6129d3b865b6598fec977e3fd3009d3aea33e9323  config-clockworkpi-uconsole-cm4.aarch64
+93b4a8b35cf4aae85c634a16b301ab61f6ec526fa581cd32ac654738b88f31ac16e033322f172e492db6cfcf1c2b11a73f2b9bddd0e8c4afc2cd70d85f7b1319  linux-clockworkpi-uconsole-rpi-1ec873f3f18c98f0dc6d51db5b75958e109a0e5c.tar.gz
+3654a748386272673423f84f5bfcdd79d5d79d4272c279afdc5ab257468eaa27a20e0b6465681e88c8fb45f6129d3b865b6598fec977e3fd3009d3aea33e9323  config-clockworkpi-uconsole-rpi.aarch64
 f984d9150424470e34570e5c6ecc938ce5af214e4bfbd56c57425e4f4dc563952086392a50906a51298a6480060ff16f4a5487fc1f6ff353653148b52808e91e  0001-video-backlight-add-OCP8178-backlight-driver.patch
 538a5c2bca24e757163c386ea7b63b07453c9c60b2168ec17589bf39f1fd7249268b17c7fc857e73965fd18d07a8a45c75a58b146a19791d53f0e0efad61157c  0002-gpu-drm-add-CWU50-and-CWD686-panels.patch
 b22a4e0fcee83d36b441a2e60e78ac1d0f4dbdbb815081ca9a02eb2aa747dd9a912fed59eb11afafef9ee9d1e0aefdfed586eba7a665e031d83558df68096d42  0003-power-supply-add-axp20x-drivers.patch
diff --git a/device/testing/linux-clockworkpi-uconsole-cm4/config-clockworkpi-uconsole-cm4.aarch64 b/device/testing/linux-clockworkpi-uconsole-rpi/config-clockworkpi-uconsole-rpi.aarch64
similarity index 100%
rename from device/testing/linux-clockworkpi-uconsole-cm4/config-clockworkpi-uconsole-cm4.aarch64
rename to device/testing/linux-clockworkpi-uconsole-rpi/config-clockworkpi-uconsole-rpi.aarch64