diff --git a/device/device-pine-pinetab/99-pinetab-keyboard.hwdb b/device/device-pine64-pinetab/99-pinetab-keyboard.hwdb
similarity index 100%
rename from device/device-pine-pinetab/99-pinetab-keyboard.hwdb
rename to device/device-pine64-pinetab/99-pinetab-keyboard.hwdb
diff --git a/device/device-pine-pinetab/APKBUILD b/device/device-pine64-pinetab/APKBUILD
similarity index 91%
rename from device/device-pine-pinetab/APKBUILD
rename to device/device-pine64-pinetab/APKBUILD
index dd2205d49..d71a3b72f 100644
--- a/device/device-pine-pinetab/APKBUILD
+++ b/device/device-pine64-pinetab/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname="device-pine-pinetab"
-pkgdesc="Pine64 Pinetab"
+pkgname="device-pine64-pinetab"
+pkgdesc="PINE64 PineTab"
 pkgver=0.1
 pkgrel=6
 url="https://postmarketos.org"
@@ -66,7 +66,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="78b3414f198f2efbfcb12d6240e26a34cd48f00f75a0469c57c372a84aaac75a8f5ddd23f8cb1c16b9a9de6b2a11a8f537a1cd486f75dfbce213541f6890211b  deviceinfo
+sha512sums="43ee4f4dde203bb5f3cd6323bc170ddd40413ec17668828bb0a14a9ee747350a514aeeb5c9673978f293583a6e2d4867d6012379c8c5fff18ca060e9d2c1593c  deviceinfo
 8f15bb62704ad5379c6f77c5ea766e69587a11829539cc339b486b72e248e04cc6202b505f12846f6537f259412f7749ce50d0b15227da182afe17fe7dd303e5  uboot-script.cmd
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
 8d1ef04911f1cfa7eda8185f4f4d807af23105a7c8f23d8c18f02afeccd8ab124de70c2e2760c154a3128fe3793447039fb0abf37aa496f597d27051e275033e  99-pinetab-keyboard.hwdb
diff --git a/device/device-pine-pinetab/device-pine-pinetab.post-install b/device/device-pine64-pinetab/device-pine-pinetab.post-install
similarity index 100%
rename from device/device-pine-pinetab/device-pine-pinetab.post-install
rename to device/device-pine64-pinetab/device-pine-pinetab.post-install
diff --git a/device/device-pine-pinetab/deviceinfo b/device/device-pine64-pinetab/deviceinfo
similarity index 87%
rename from device/device-pine-pinetab/deviceinfo
rename to device/device-pine64-pinetab/deviceinfo
index b95ad90b0..616bacc00 100644
--- a/device/device-pine-pinetab/deviceinfo
+++ b/device/device-pine64-pinetab/deviceinfo
@@ -2,9 +2,9 @@
 # Please use double quotes only. You can source this file in shell scripts.
 
 deviceinfo_format_version="0"
-deviceinfo_name="Pine64 Pinetab"
-deviceinfo_manufacturer="Pine64"
-deviceinfo_codename="pine-pinetab"
+deviceinfo_name="PINE64 PineTab"
+deviceinfo_manufacturer="PINE64"
+deviceinfo_codename="pine64-pinetab"
 deviceinfo_date=""
 deviceinfo_dtb="allwinner/sun50i-a64-pinetab"
 deviceinfo_modules_initfs=""
diff --git a/device/device-pine-pinetab/sway.conf b/device/device-pine64-pinetab/sway.conf
similarity index 100%
rename from device/device-pine-pinetab/sway.conf
rename to device/device-pine64-pinetab/sway.conf
diff --git a/device/device-pine-pinetab/uboot-script.cmd b/device/device-pine64-pinetab/uboot-script.cmd
similarity index 100%
rename from device/device-pine-pinetab/uboot-script.cmd
rename to device/device-pine64-pinetab/uboot-script.cmd
diff --git a/device/device-pine-pinetab/weston.ini b/device/device-pine64-pinetab/weston.ini
similarity index 100%
rename from device/device-pine-pinetab/weston.ini
rename to device/device-pine64-pinetab/weston.ini