diff --git a/board/bananapi/overlay/etc/board b/board/bananapi/overlay/etc/board
deleted file mode 100644
index 44e71628a7..0000000000
--- a/board/bananapi/overlay/etc/board
+++ /dev/null
@@ -1 +0,0 @@
-bananapi
diff --git a/board/bananapi/boot-fwupdater.cmd b/board/bananapim1/boot-fwupdater.cmd
similarity index 100%
rename from board/bananapi/boot-fwupdater.cmd
rename to board/bananapim1/boot-fwupdater.cmd
diff --git a/board/bananapi/boot.cmd b/board/bananapim1/boot.cmd
similarity index 100%
rename from board/bananapi/boot.cmd
rename to board/bananapim1/boot.cmd
diff --git a/board/bananapi/kernel.config b/board/bananapim1/kernel.config
similarity index 100%
rename from board/bananapi/kernel.config
rename to board/bananapim1/kernel.config
diff --git a/board/bananapi/linux-usb-host.patch.gz b/board/bananapim1/linux-usb-host.patch.gz
similarity index 100%
rename from board/bananapi/linux-usb-host.patch.gz
rename to board/bananapim1/linux-usb-host.patch.gz
diff --git a/board/bananapi/mkimage.sh b/board/bananapim1/mkimage.sh
similarity index 100%
rename from board/bananapi/mkimage.sh
rename to board/bananapim1/mkimage.sh
diff --git a/board/bananapi/overlay-initramfs/remove_initramfs b/board/bananapim1/overlay-initramfs/remove_initramfs
similarity index 100%
rename from board/bananapi/overlay-initramfs/remove_initramfs
rename to board/bananapim1/overlay-initramfs/remove_initramfs
diff --git a/board/bananapim1/overlay/etc/board b/board/bananapim1/overlay/etc/board
new file mode 100644
index 0000000000..20d3dc685b
--- /dev/null
+++ b/board/bananapim1/overlay/etc/board
@@ -0,0 +1 @@
+bananapim1
diff --git a/board/bananapi/overlay/etc/init.d/boardsn b/board/bananapim1/overlay/etc/init.d/boardsn
similarity index 100%
rename from board/bananapi/overlay/etc/init.d/boardsn
rename to board/bananapim1/overlay/etc/init.d/boardsn
diff --git a/board/bananapi/overlay/usr/libexec/fw-prepare-boot b/board/bananapim1/overlay/usr/libexec/fw-prepare-boot
similarity index 100%
rename from board/bananapi/overlay/usr/libexec/fw-prepare-boot
rename to board/bananapim1/overlay/usr/libexec/fw-prepare-boot
diff --git a/board/bananapi/postscript.sh b/board/bananapim1/postscript.sh
similarity index 100%
rename from board/bananapi/postscript.sh
rename to board/bananapim1/postscript.sh
diff --git a/board/bananapi/uInitrd b/board/bananapim1/uInitrd
similarity index 100%
rename from board/bananapi/uInitrd
rename to board/bananapim1/uInitrd
diff --git a/configs/bananapi_defconfig b/configs/bananapim1_defconfig
similarity index 90%
rename from configs/bananapi_defconfig
rename to configs/bananapim1_defconfig
index 17193fd080..452bb1664b 100644
--- a/configs/bananapi_defconfig
+++ b/configs/bananapim1_defconfig
@@ -2,7 +2,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapi"
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1"
 BR2_OPTIMIZE_2=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
@@ -10,14 +10,14 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_TZ_INFO=y
-BR2_ROOTFS_OVERLAY="board/common/overlay board/bananapi/overlay"
+BR2_ROOTFS_OVERLAY="board/common/overlay board/bananapim1/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.70"
-BR2_LINUX_KERNEL_PATCH="board/bananapi/linux-usb-host.patch.gz"
+BR2_LINUX_KERNEL_PATCH="board/bananapim1/linux-usb-host.patch.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bananapi/kernel.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bananapim1/kernel.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/bananapi_initramfs_defconfig b/configs/bananapim1_initramfs_defconfig
similarity index 84%
rename from configs/bananapi_initramfs_defconfig
rename to configs/bananapim1_initramfs_defconfig
index a03996cb7e..c8562303f7 100644
--- a/configs/bananapi_initramfs_defconfig
+++ b/configs/bananapim1_initramfs_defconfig
@@ -3,13 +3,13 @@ BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapi-initramfs"
+BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-bananapim1-initramfs"
 BR2_OPTIMIZE_2=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton-initramfs"
-BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapi/overlay-initramfs"
+BR2_ROOTFS_OVERLAY="board/common/overlay-initramfs board/bananapim1/overlay-initramfs"
 BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox_initramfs.config"
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y