diff --git a/app/boards/arm/bluemacro840/CMakeLists.txt b/app/boards/arm/bluemacro840/CMakeLists.txt
index 00952c30..c04423d0 100644
--- a/app/boards/arm/bluemacro840/CMakeLists.txt
+++ b/app/boards/arm/bluemacro840/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
   -c 
diff --git a/app/boards/arm/bluemacro840/Kconfig b/app/boards/arm/bluemacro840/Kconfig
index 0e6743d3..7f7fefd2 100644
--- a/app/boards/arm/bluemacro840/Kconfig
+++ b/app/boards/arm/bluemacro840/Kconfig
@@ -1,8 +1,8 @@
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
 	select SOC_DCDC_NRF52X
 	default y
-	depends on BOARD_BLUEMICRO840_V1
-
+	depends on BOARD_BLUEMACRO840_V1
diff --git a/app/boards/arm/bluemacro840/Kconfig.board b/app/boards/arm/bluemacro840/Kconfig.board
index bc271af3..896568a2 100644
--- a/app/boards/arm/bluemacro840/Kconfig.board
+++ b/app/boards/arm/bluemacro840/Kconfig.board
@@ -1,8 +1,8 @@
-# BlueMicro840 board configuration
+# BlueMacro840 board configuration
 
-# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-config BOARD_BLUEMICRO840_V1
-	bool "BlueMicro840_V1"
+config BOARD_BLUEMACRO840_V1
+	bool "BlueMacro840_V1"
 	depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/bluemacro840/Kconfig.defconfig b/app/boards/arm/bluemacro840/Kconfig.defconfig
index 2b55e17c..f9e66408 100644
--- a/app/boards/arm/bluemacro840/Kconfig.defconfig
+++ b/app/boards/arm/bluemacro840/Kconfig.defconfig
@@ -1,12 +1,12 @@
-# BlueMicro840 board configuration
+# BlueMacro840 board configuration
 
-# Copyright (c) 2020 Pete Johanson, Derek Schmell
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-if BOARD_BLUEMICRO840_V1
+if BOARD_BLUEMACRO840_V1
 
 config BOARD
-	default "bluemicro840_v1"
+	default "bluemacro840_v1"
 
 if USB
 
@@ -30,4 +30,4 @@ config ZMK_USB
 config ZMK_BATTERY_VOLTAGE_DIVIDER
 	default y
 
-endif # BOARD_BLUEMICRO840_V1
+endif # BOARD_BLUEMACRO840_V1
diff --git a/app/boards/arm/bluemacro840/bluemacro840_v1.dts b/app/boards/arm/bluemacro840/bluemacro840_v1.dts
index 31551f4f..0cc2ac69 100644
--- a/app/boards/arm/bluemacro840/bluemacro840_v1.dts
+++ b/app/boards/arm/bluemacro840/bluemacro840_v1.dts
@@ -1,16 +1,15 @@
 /*
- * Copyright (c) 2020 Pete Johanson, Derek Schmell
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
-#include "arduino_pro_micro_pins.dtsi"
 
 / {
-	model = "BlueMicro840_V1";
-	compatible = "bluemicro840,v1";
+	model = "BlueMacro840_V1";
+	compatible = "bluemacro840,v1";
 
 	chosen {
 		zephyr,code-partition = &code_partition;
@@ -21,9 +20,14 @@
 	leds {
 		compatible = "gpio-leds";
 		blue_led: led_0 {
-			gpios = <&gpio0 42 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 			label = "Blue LED";
 		};
+		red_led: led_1 {
+			gpios = <&gpio1 04 GPIO_ACTIVE_HIGH>;
+			label = "Red LED";
+		};
+
 	};
 
 	ext-power {
@@ -60,14 +64,14 @@
 
 &i2c0 {
 	compatible = "nordic,nrf-twi";
-	sda-pin = <15>;
-	scl-pin = <17>;
+	sda-pin = <30>;
+	scl-pin = <2>;
 };
 
 &uart0 {
 	compatible = "nordic,nrf-uarte";
-	tx-pin = <6>;
-	rx-pin = <8>;
+	tx-pin = <28>;
+	rx-pin = <45>;
 };
 
 &usbd {
diff --git a/app/boards/arm/bluemacro840/bluemacro840_v1.yaml b/app/boards/arm/bluemacro840/bluemacro840_v1.yaml
index 9e1dd54c..52fe4f1f 100644
--- a/app/boards/arm/bluemacro840/bluemacro840_v1.yaml
+++ b/app/boards/arm/bluemacro840/bluemacro840_v1.yaml
@@ -1,5 +1,5 @@
-identifier: bluemicro840_v1
-name: BlueMicro840_V1
+identifier: bluemacro840_v1
+name: BlueMacro840_V1
 type: mcu
 arch: arm
 toolchain:
diff --git a/app/boards/arm/bluemacro840/bluemacro840_v1_defconfig b/app/boards/arm/bluemacro840/bluemacro840_v1_defconfig
index 96f03ca4..a4974333 100644
--- a/app/boards/arm/bluemacro840/bluemacro840_v1_defconfig
+++ b/app/boards/arm/bluemacro840/bluemacro840_v1_defconfig
@@ -1,8 +1,9 @@
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_BLUEMICRO840_V1=y
+CONFIG_BOARD_BLUEMACRO840_V1=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
diff --git a/app/boards/arm/bluemacro840/board.cmake b/app/boards/arm/bluemacro840/board.cmake
index fa847d50..c191f5b5 100644
--- a/app/boards/arm/bluemacro840/board.cmake
+++ b/app/boards/arm/bluemacro840/board.cmake
@@ -1,5 +1,7 @@
+# Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
 board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
+
 include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)