9 files changed, 13 insertions, 13 deletions
diff --git a/app/boards/arm/bluemicro52840_v1/CMakeLists.txt b/app/boards/arm/bluemicro840/CMakeLists.txt
index 00952c3..00952c3 100644
--- a/app/boards/arm/bluemicro52840_v1/CMakeLists.txt
+++ b/app/boards/arm/bluemicro840/CMakeLists.txt
diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig b/app/boards/arm/bluemicro840/Kconfig
index 67751a0..0e6743d 100644
--- a/app/boards/arm/bluemicro52840_v1/Kconfig
+++ b/app/boards/arm/bluemicro840/Kconfig
@@ -4,5 +4,5 @@ config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
 	select SOC_DCDC_NRF52X
 	default y
-	depends on BOARD_BLUEMICRO52840_V1
+	depends on BOARD_BLUEMICRO840_V1
 
diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.board b/app/boards/arm/bluemicro840/Kconfig.board
index dea0555..bc271af 100644
--- a/app/boards/arm/bluemicro52840_v1/Kconfig.board
+++ b/app/boards/arm/bluemicro840/Kconfig.board
@@ -1,8 +1,8 @@
-# BlueMicro52840_V1 board configuration
+# BlueMicro840 board configuration
 
 # Copyright (c) 2020 Pete Johanson, Derek Schmell
 # SPDX-License-Identifier: MIT
 
-config BOARD_BLUEMICRO52840_V1
-	bool "BlueMicro52840_V1"
+config BOARD_BLUEMICRO840_V1
+	bool "BlueMicro840_V1"
 	depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig b/app/boards/arm/bluemicro840/Kconfig.defconfig
index 90a5ed9..566b5a4 100644
--- a/app/boards/arm/bluemicro52840_v1/Kconfig.defconfig
+++ b/app/boards/arm/bluemicro840/Kconfig.defconfig
@@ -1,12 +1,12 @@
-# BlueMicro52840 board configuration
+# BlueMicro840 board configuration
 
 # Copyright (c) 2020 Pete Johanson, Derek Schmell
 # SPDX-License-Identifier: MIT
 
-if BOARD_BLUEMICRO52840_V1
+if BOARD_BLUEMICRO840_V1
 
 config BOARD
-	default "bluemicro52840_v1"
+	default "bluemicro840_v1"
 
 if USB
 
@@ -27,4 +27,4 @@ config ZMK_BLE
 config ZMK_USB
 	default y
 
-endif # BOARD_BLUEMICRO52840_V1
+endif # BOARD_BLUEMICRO840_V1
diff --git a/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
index 940d891..940d891 100644
--- a/app/boards/arm/bluemicro52840_v1/arduino_pro_micro_pins.dtsi
+++ b/app/boards/arm/bluemicro840/arduino_pro_micro_pins.dtsi
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
index f8abc66..c693662 100644
--- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.dts
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts
@@ -9,8 +9,8 @@
 #include "arduino_pro_micro_pins.dtsi"
 
 / {
-	model = "BlueMicro52840_V1";
-	compatible = "bluemicro52840,v1";
+	model = "BlueMicro840_V1";
+	compatible = "bluemicro840,v1";
 
 	chosen {
 		zephyr,code-partition = &code_partition;
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml b/app/boards/arm/bluemicro840/bluemicro840_v1.yaml
index fca969d..9e1dd54 100644
--- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1.yaml
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1.yaml
@@ -1,5 +1,5 @@
-identifier: bluemicro52840_v1
-name: BlueMicro52840_V1
+identifier: bluemicro840_v1
+name: BlueMicro840_V1
 type: mcu
 arch: arm
 toolchain:
diff --git a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
index f87e69d..96f03ca 100644
--- a/app/boards/arm/bluemicro52840_v1/bluemicro52840_v1_defconfig
+++ b/app/boards/arm/bluemicro840/bluemicro840_v1_defconfig
@@ -2,7 +2,7 @@
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_BLUEMICRO52840_V1=y
+CONFIG_BOARD_BLUEMICRO840_V1=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
diff --git a/app/boards/arm/bluemicro52840_v1/board.cmake b/app/boards/arm/bluemicro840/board.cmake
index fa847d5..fa847d5 100644
--- a/app/boards/arm/bluemicro52840_v1/board.cmake
+++ b/app/boards/arm/bluemicro840/board.cmake