diff --git a/device/testing/device-nokia-rm846/APKBUILD b/device/testing/device-nokia-sand/APKBUILD
similarity index 54%
rename from device/testing/device-nokia-rm846/APKBUILD
rename to device/testing/device-nokia-sand/APKBUILD
index def3daf0e..9304d8887 100644
--- a/device/testing/device-nokia-rm846/APKBUILD
+++ b/device/testing/device-nokia-sand/APKBUILD
@@ -1,5 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-nokia-rm846
+pkgname=device-nokia-sand
 pkgdesc="Lumia 620"
 pkgver=0.1
 pkgrel=3
@@ -7,7 +7,7 @@ url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-nokia-rm846 mkbootimg mdss-fb-init-hack mesa-dri-swrast"
+depends="postmarketos-base linux-nokia-sand mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -18,4 +18,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 }
-sha512sums="726416e68be38030301067af174e20799e3949f24403f0d246bf4c1c0ad2b0a320ca3bf0e7933ff14bffdc84318e69b0bb25f59202e73b4d9c2bc2c8a9fc8956  deviceinfo"
+sha512sums="
+07108161ccae2fbc29d969a88fac08c51072951c24b4a7909428fd5d281e8d43ce593d3c33a2629da17bc574b1b24617aae63f27020ff4f2cbd36b1cb4f6a825  deviceinfo
+"
diff --git a/device/testing/device-nokia-rm846/deviceinfo b/device/testing/device-nokia-sand/deviceinfo
similarity index 96%
rename from device/testing/device-nokia-rm846/deviceinfo
rename to device/testing/device-nokia-sand/deviceinfo
index fa70a2db7..fdf608aab 100644
--- a/device/testing/device-nokia-rm846/deviceinfo
+++ b/device/testing/device-nokia-sand/deviceinfo
@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Nokia Lumia 620"
 deviceinfo_manufacturer="Nokia"
-deviceinfo_codename="nokia-rm846"
+deviceinfo_codename="nokia-sand"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
diff --git a/device/testing/linux-nokia-rm846/00_fix_return_address.patch b/device/testing/linux-nokia-sand/00_fix_return_address.patch
similarity index 100%
rename from device/testing/linux-nokia-rm846/00_fix_return_address.patch
rename to device/testing/linux-nokia-sand/00_fix_return_address.patch
diff --git a/device/testing/linux-nokia-rm846/02_gpu-msm-fix-gcc5-compile.patch b/device/testing/linux-nokia-sand/02_gpu-msm-fix-gcc5-compile.patch
similarity index 100%
rename from device/testing/linux-nokia-rm846/02_gpu-msm-fix-gcc5-compile.patch
rename to device/testing/linux-nokia-sand/02_gpu-msm-fix-gcc5-compile.patch
diff --git a/device/testing/linux-nokia-rm846/APKBUILD b/device/testing/linux-nokia-sand/APKBUILD
similarity index 87%
rename from device/testing/linux-nokia-rm846/APKBUILD
rename to device/testing/linux-nokia-sand/APKBUILD
index 29edc4109..e716880bf 100644
--- a/device/testing/linux-nokia-rm846/APKBUILD
+++ b/device/testing/linux-nokia-sand/APKBUILD
@@ -1,12 +1,12 @@
 # Kernel config based on: arch/arm/configs/lineage_zeal_defconfig
 
-pkgname=linux-nokia-rm846
+pkgname=linux-nokia-sand
 pkgver=3.4.0
 pkgrel=3
 pkgdesc="Lumia 620 kernel fork"
 arch="armv7"
 _carch="arm"
-_flavor="nokia-rm846"
+_flavor="nokia-sand"
 url="https://kernel.org"
 license="GPL2"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -62,8 +62,10 @@ package() {
 		return 1
 	fi
 }
-sha512sums="6a576c9bfb645083d1d8477daae647ee44f15732414cb73a585d1c7e27c5481ccdcd98d6e8fe100b61400f1c3186a3339c2d438fb605177e1d11832e93dbc70b  linux-nokia-rm846-28fe134696ce748ddaaf3633d3e345d3509276bd.tar.gz
-2486c86d2debe239a339d03a7ebddd34ef32a19694f88c71373d6ae3a08fd7ce21ee408225236d9ca25ff9a35c95e9df288f16655709a0c4e5682256c99c6c25  config-nokia-rm846.armv7
+sha512sums="
+6a576c9bfb645083d1d8477daae647ee44f15732414cb73a585d1c7e27c5481ccdcd98d6e8fe100b61400f1c3186a3339c2d438fb605177e1d11832e93dbc70b  linux-nokia-sand-28fe134696ce748ddaaf3633d3e345d3509276bd.tar.gz
+2486c86d2debe239a339d03a7ebddd34ef32a19694f88c71373d6ae3a08fd7ce21ee408225236d9ca25ff9a35c95e9df288f16655709a0c4e5682256c99c6c25  config-nokia-sand.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  psmouse_base.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
+"
diff --git a/device/testing/linux-nokia-rm846/config-nokia-rm846.armv7 b/device/testing/linux-nokia-sand/config-nokia-sand.armv7
similarity index 100%
rename from device/testing/linux-nokia-rm846/config-nokia-rm846.armv7
rename to device/testing/linux-nokia-sand/config-nokia-sand.armv7
diff --git a/device/testing/linux-nokia-rm846/psmouse_base.patch b/device/testing/linux-nokia-sand/psmouse_base.patch
similarity index 100%
rename from device/testing/linux-nokia-rm846/psmouse_base.patch
rename to device/testing/linux-nokia-sand/psmouse_base.patch