diff --git a/config/boards/pine64.conf b/config/boards/pine64.conf
index eb69b536b2..7c6392be4f 100644
--- a/config/boards/pine64.conf
+++ b/config/boards/pine64.conf
@@ -1,6 +1,6 @@
 # A64 quad core 512MB-2GB SoC GBE
 BOARD_NAME="Pine64"
-LINUXFAMILY="pine64"
+LINUXFAMILY="sun50iw1"
 BOOTCONFIG="pine64_plus_defconfig"
 #
 MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs"
diff --git a/config/boards/pine64so.conf b/config/boards/pine64so.conf
index 63bba268fd..03d245f950 100644
--- a/config/boards/pine64so.conf
+++ b/config/boards/pine64so.conf
@@ -1,6 +1,6 @@
 # A64 quad core 2GB SoC GBE
-BOARD_NAME="SoPine64"
-LINUXFAMILY="pine64"
+BOARD_NAME="SoPine A64"
+LINUXFAMILY="sun50iw1"
 BOOTCONFIG="pine64_so_defconfig"
 #
 MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723bs"
diff --git a/config/boards/pinebook-a64.wip b/config/boards/pinebook-a64.wip
index c3656785db..102593b73b 100644
--- a/config/boards/pinebook-a64.wip
+++ b/config/boards/pinebook-a64.wip
@@ -1,6 +1,6 @@
 # A64 quad core 2GB SoC Wi-Fi/BT
 BOARD_NAME="Pinebook A64"
-LINUXFAMILY="pine64"
+LINUXFAMILY="sun50iw1"
 BOOTCONFIG="pine64_plus_defconfig"
 #
 MODULES="sunxi_codec sunxi_i2s sunxi_sndcodec 8723cs r8152"
diff --git a/config/sources/pine64.conf b/config/sources/sun50iw1.conf
similarity index 96%
rename from config/sources/pine64.conf
rename to config/sources/sun50iw1.conf
index 4729ab6762..7a83f93cd0 100644
--- a/config/sources/pine64.conf
+++ b/config/sources/sun50iw1.conf
@@ -5,6 +5,8 @@ OVERLAY_PREFIX='sun50i-a64'
 
 case $BRANCH in
 	default)
+	# for backwards compatibility
+	LINUXFAMILY=pine64
 	BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-pine64-armbian.git'
 	BOOTDIR='u-boot-pine64'
 	BOOTBRANCH='branch:master'
diff --git a/patch/kernel/pine64-dev/add-h5-a64-simplefb.patch b/patch/kernel/sun50iw1-dev/add-h5-a64-simplefb.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add-h5-a64-simplefb.patch
rename to patch/kernel/sun50iw1-dev/add-h5-a64-simplefb.patch
diff --git a/patch/kernel/pine64-dev/add-mtd-spi-nor-dts.patch.disabled b/patch/kernel/sun50iw1-dev/add-mtd-spi-nor-dts.patch.disabled
similarity index 100%
rename from patch/kernel/pine64-dev/add-mtd-spi-nor-dts.patch.disabled
rename to patch/kernel/sun50iw1-dev/add-mtd-spi-nor-dts.patch.disabled
diff --git a/patch/kernel/pine64-dev/add-overlay-compilation-support.patch b/patch/kernel/sun50iw1-dev/add-overlay-compilation-support.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add-overlay-compilation-support.patch
rename to patch/kernel/sun50iw1-dev/add-overlay-compilation-support.patch
diff --git a/patch/kernel/pine64-dev/add-sun50i-a64-overlays.patch b/patch/kernel/sun50iw1-dev/add-sun50i-a64-overlays.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add-sun50i-a64-overlays.patch
rename to patch/kernel/sun50iw1-dev/add-sun50i-a64-overlays.patch
diff --git a/patch/kernel/pine64-dev/add_BergMicro_flashes_to_SPI-NOR.patch b/patch/kernel/sun50iw1-dev/add_BergMicro_flashes_to_SPI-NOR.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add_BergMicro_flashes_to_SPI-NOR.patch
rename to patch/kernel/sun50iw1-dev/add_BergMicro_flashes_to_SPI-NOR.patch
diff --git a/patch/kernel/pine64-dev/add_configfs_overlay_for_v4.10.x.patch b/patch/kernel/sun50iw1-dev/add_configfs_overlay_for_v4.10.x.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add_configfs_overlay_for_v4.10.x.patch
rename to patch/kernel/sun50iw1-dev/add_configfs_overlay_for_v4.10.x.patch
diff --git a/patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.10.x.patch b/patch/kernel/sun50iw1-dev/add_proc_cpuinfo_entries_for_v4.10.x.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add_proc_cpuinfo_entries_for_v4.10.x.patch
rename to patch/kernel/sun50iw1-dev/add_proc_cpuinfo_entries_for_v4.10.x.patch
diff --git a/patch/kernel/pine64-dev/add_sun50i_a64_rccu.patch b/patch/kernel/sun50iw1-dev/add_sun50i_a64_rccu.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add_sun50i_a64_rccu.patch
rename to patch/kernel/sun50iw1-dev/add_sun50i_a64_rccu.patch
diff --git a/patch/kernel/pine64-dev/add_sun50i_a64_rpio.patch b/patch/kernel/sun50iw1-dev/add_sun50i_a64_rpio.patch
similarity index 100%
rename from patch/kernel/pine64-dev/add_sun50i_a64_rpio.patch
rename to patch/kernel/sun50iw1-dev/add_sun50i_a64_rpio.patch
diff --git a/patch/kernel/pine64-dev/enable-fsl-timer-errata.patch b/patch/kernel/sun50iw1-dev/enable-fsl-timer-errata.patch
similarity index 100%
rename from patch/kernel/pine64-dev/enable-fsl-timer-errata.patch
rename to patch/kernel/sun50iw1-dev/enable-fsl-timer-errata.patch
diff --git a/patch/kernel/pine64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/sun50iw1-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
similarity index 100%
rename from patch/kernel/pine64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
rename to patch/kernel/sun50iw1-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
diff --git a/patch/kernel/pine64-dev/remove-localversion.patch b/patch/kernel/sun50iw1-dev/remove-localversion.patch
similarity index 100%
rename from patch/kernel/pine64-dev/remove-localversion.patch
rename to patch/kernel/sun50iw1-dev/remove-localversion.patch
diff --git a/patch/kernel/pine64-dev/scripts-dtc-Update-to-version-with-overlays.patch b/patch/kernel/sun50iw1-dev/scripts-dtc-Update-to-version-with-overlays.patch
similarity index 100%
rename from patch/kernel/pine64-dev/scripts-dtc-Update-to-version-with-overlays.patch
rename to patch/kernel/sun50iw1-dev/scripts-dtc-Update-to-version-with-overlays.patch
diff --git a/patch/kernel/pine64-dev/spi-patch-for-A64-4.10.x.patch b/patch/kernel/sun50iw1-dev/spi-patch-for-A64-4.10.x.patch
similarity index 100%
rename from patch/kernel/pine64-dev/spi-patch-for-A64-4.10.x.patch
rename to patch/kernel/sun50iw1-dev/spi-patch-for-A64-4.10.x.patch
diff --git a/patch/kernel/pine64-dev/spi-sun6i-allow-large-transfers.patch b/patch/kernel/sun50iw1-dev/spi-sun6i-allow-large-transfers.patch
similarity index 100%
rename from patch/kernel/pine64-dev/spi-sun6i-allow-large-transfers.patch
rename to patch/kernel/sun50iw1-dev/spi-sun6i-allow-large-transfers.patch
diff --git a/patch/kernel/pine64-dev/spidev-remove-warnings.patch b/patch/kernel/sun50iw1-dev/spidev-remove-warnings.patch
similarity index 100%
rename from patch/kernel/pine64-dev/spidev-remove-warnings.patch
rename to patch/kernel/sun50iw1-dev/spidev-remove-warnings.patch