124 files changed, 42 insertions, 42 deletions
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 3a4b0ef23..5e9e31ad0 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -4,8 +4,8 @@ ifdef BOARD_DIR
 # the path as the board name.
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
-# If not given on the command line, then default to pca10040.
-BOARD ?= pca10040
+# If not given on the command line, then default to PCA10040.
+BOARD ?= PCA10040
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index fde04e61f..889ead5d4 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -41,7 +41,7 @@ This is a port of MicroPython to the Nordic Semiconductor nRF series of chips.
   * [PCA10056](http://www.nordicsemi.com/eng/Products/nRF52840-Preview-DK)
   * [PCA10059](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle)
   * [Particle Xenon](https://docs.particle.io/xenon/)
-  * [nRF52840 MDK USB Dongle](boards/nrf52840-mdk-usb-dongle/README.md)
+  * [nRF52840 MDK USB Dongle](boards/NRF52840_MDK_USB_DONGLE/README.md)
 * nRF9160
   * [PCA10090](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF9160-DK)
   * [Actinius Icarus](https://www.actinius.com/icarus)
@@ -63,8 +63,8 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
 Alternatively the target board could be defined:
 
     make submodules
-    make BOARD=pca10040
-    make BOARD=pca10040 deploy
+    make BOARD=PCA10040
+    make BOARD=PCA10040 deploy
 
 ## Compile without LTO enabled
 
@@ -73,7 +73,7 @@ targets in the nrf-port. The `-flto` linker flag can be toggled easily by using
 the argument LTO when building. The example below shows how to disable LTO for
 the compilation:
 
-    make BOARD=pca10040 LTO=0
+    make BOARD=PCA10040 LTO=0
 
 **Note**: There have been several issues with use of LTO in conjunction with
 GNU ARM Embedded Toolchain 7.2.1/4Q17. It's recommended to use a toolchain after
@@ -88,11 +88,11 @@ First prepare the bluetooth folder by downloading Bluetooth LE stacks and header
 
 If the Bluetooth stacks has been downloaded, compile the target with the following command:
 
-    make BOARD=pca10040 SD=s132
+    make BOARD=PCA10040 SD=s132
 
 The **make sd** will trigger a flash of the bluetooth stack before that application is flashed. Note that **make sd** will perform a full erase of the chip, which could cause 3rd party bootloaders to also be wiped.
 
-    make BOARD=pca10040 SD=s132 sd
+    make BOARD=PCA10040 SD=s132 sd
 
 Note: further tuning of features to include in bluetooth or even setting up the device to use REPL over Bluetooth can be configured in the `bluetooth_conf.h`.
 
@@ -104,7 +104,7 @@ it in the specific target board's `mpconfigboard.mk`.
 
 For example:
 
-    make BOARD=pca10040 FROZEN_MANIFEST=path/to/manifest.py
+    make BOARD=PCA10040 FROZEN_MANIFEST=path/to/manifest.py
 
 In case of using the target board's makefile, add a line similar to this:
 
@@ -117,7 +117,7 @@ As the `oofatfs` module is not having header guards that can exclude the impleme
 
 For example:
 
-     make BOARD=pca10040 MICROPY_VFS_FAT=1
+     make BOARD=PCA10040 MICROPY_VFS_FAT=1
 
 ## Enable MICROPY_VFS_LFS1 or MICROPY_VFS_LFS2
 
@@ -127,7 +127,7 @@ or `MICROPY_VFS_LFS2` can be set. This will be in addition of setting
 
 For example:
 
-    make BOARD=pca10056 MICROPY_VFS_LFS2=1
+    make BOARD=PCA10056 MICROPY_VFS_LFS2=1
 
 ## Set file system size
 
@@ -141,7 +141,7 @@ linker script syntax as it is passed directly.
 For example, if we want to override the default file system size set by the
 linker scripts to use 256K:
 
-    make BOARD=pca10056 MICROPY_VFS_LFS2=1 FS_SIZE=256K
+    make BOARD=PCA10056 MICROPY_VFS_LFS2=1 FS_SIZE=256K
 
 Also note that changing this size between builds might cause loss of files
 present from a previous firmware as it will format the file system due to a new
@@ -151,25 +151,25 @@ location.
 
 Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Bootloader     | Default Flash Util
 ---------------------|-------------------------|------------------------|----------------|-------------------
-microbit             | s110                    | Peripheral             |                | [PyOCD](#pyocdopenocd-targets)
-pca10000             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10001             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10028             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-pca10031             | s110                    | Peripheral             |                | [Segger](#segger-targets)
-wt51822_s4at         | s110                    | Peripheral             |                | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
-pca10040             | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
-feather52            | s132                    | Peripheral and Central |                | Manual, SWDIO and SWCLK solder points on the bottom side of the board
-arduino_primo        | s132                    | Peripheral and Central |                | [PyOCD](#pyocdopenocd-targets)
-ibk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-idk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-blueio_tag_evim      | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
-evk_nina_b1          | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
-pca10056             | s140                    | Peripheral and Central |                | [Segger](#segger-targets)
-pca10059             | s140                    | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
-particle_xenon       | s140                    | Peripheral and Central |                | [Black Magic Probe](#black-magic-probe-targets)
-nrf52840-mdk-usb-dongle | s140                 | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
-pca10090             | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
-actinius_icarus      | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
+MICROBIT             | s110                    | Peripheral             |                | [PyOCD](#pyocdopenocd-targets)
+PCA10000             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10001             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10028             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+PCA10031             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+WT51822_S4AT         | s110                    | Peripheral             |                | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
+PCA10040             | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+FEATHER52            | s132                    | Peripheral and Central |                | Manual, SWDIO and SWCLK solder points on the bottom side of the board
+ARDUINO_PRIMO        | s132                    | Peripheral and Central |                | [PyOCD](#pyocdopenocd-targets)
+IBK_BLYST_NANO       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+IDK_BLYST_NANO       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+BLUEIO_TAG_EVIM      | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+EVK_NINA_B1          | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+PCA10056             | s140                    | Peripheral and Central |                | [Segger](#segger-targets)
+PCA10059             | s140                    | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+PARTICLE_XENON       | s140                    | Peripheral and Central |                | [Black Magic Probe](#black-magic-probe-targets)
+NRF52840_MDK_USB_DONGLE | s140                 | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+PCA10090             | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
+ACTINIUS_ICARUS      | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
 
 ## IDAP-M/IDAP-Link Targets
 
@@ -218,7 +218,7 @@ to trim of the MBR in case SoftDevice flashing is requested.
 `nrfutil` as flashing backend also requires a serial port parameter to be defined
 in addition to the `deploy` target of make. For example:
 
-    make BOARD=nrf52840-mdk-usb-dongle NRFUTIL_PORT=/dev/ttyACM0 deploy
+    make BOARD=NRF52840_MDK_USB_DONGLE NRFUTIL_PORT=/dev/ttyACM0 deploy
 
 If the target device is connected to `/dev/ttyACM0` serial port, the
 `NRFUTIL_PORT` parameter to make can be elided as it is the default serial
@@ -228,7 +228,7 @@ When enabling Bluetooth LE, as with the other flash utils, the SoftDevice
 needs to be flashed in the first firmware update. This can be done by issuing
 the `sd` target instead of `deploy`. For example:
 
-    make BOARD=nrf52840-mdk-usb-dongle SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
+    make BOARD=NRF52840_MDK_USB_DONGLE SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
 
 ## Bluetooth LE REPL
 
diff --git a/ports/nrf/boards/actinius_icarus/board.json b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
index c1d9f1c4e..c1d9f1c4e 100644
--- a/ports/nrf/boards/actinius_icarus/board.json
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/board.json
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
index 46960cab8..46960cab8 100644
--- a/ports/nrf/boards/actinius_icarus/mpconfigboard.h
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
index 8e6f75b36..8e6f75b36 100644
--- a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk
diff --git a/ports/nrf/boards/actinius_icarus/pins.csv b/ports/nrf/boards/ACTINIUS_ICARUS/pins.csv
index 50c284dfd..50c284dfd 100644
--- a/ports/nrf/boards/actinius_icarus/pins.csv
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/pins.csv
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.c b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.c
index 954639756..954639756 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/board.c
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.c
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
index 9079fbd66..9079fbd66 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/board.json
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
index 0d94a537b..0d94a537b 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/deploy.md
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
index 1e35ae8c4..1e35ae8c4 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/manifest.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.py
index 821795e17..821795e17 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/modules/imu.py
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/modules/imu.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
index 71349e08c..71349e08c 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
index cb2ff5c6b..148a9f101 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 6.1.1
 SD=s140
 
-LD_FILES += boards/arduino_nano_33_ble_sense/nano_bootloader.ld boards/nrf52840_1M_256k.ld
+LD_FILES += boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld
index 209a1d447..209a1d447 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/nano_bootloader.ld
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
index 9d931634f..9d931634f 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/pins.csv
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/ARDUINO_PRIMO/board.json
index f7afed0ce..f7afed0ce 100644
--- a/ports/nrf/boards/arduino_primo/board.json
+++ b/ports/nrf/boards/ARDUINO_PRIMO/board.json
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
index 271cef032..271cef032 100644
--- a/ports/nrf/boards/arduino_primo/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.mk b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
index e814d3d55..e814d3d55 100644
--- a/ports/nrf/boards/arduino_primo/mpconfigboard.mk
+++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.mk
diff --git a/ports/nrf/boards/arduino_primo/pins.csv b/ports/nrf/boards/ARDUINO_PRIMO/pins.csv
index 90bf84a04..90bf84a04 100644
--- a/ports/nrf/boards/arduino_primo/pins.csv
+++ b/ports/nrf/boards/ARDUINO_PRIMO/pins.csv
diff --git a/ports/nrf/boards/blueio_tag_evim/board.json b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
index 5b6e5747d..5b6e5747d 100644
--- a/ports/nrf/boards/blueio_tag_evim/board.json
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/board.json
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
index 0ca3ca161..0ca3ca161 100644
--- a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
index c3164c8f0..c3164c8f0 100644
--- a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.mk
diff --git a/ports/nrf/boards/blueio_tag_evim/pins.csv b/ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
index 90bf84a04..90bf84a04 100644
--- a/ports/nrf/boards/blueio_tag_evim/pins.csv
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/pins.csv
diff --git a/ports/nrf/boards/dvk_bl652/board.json b/ports/nrf/boards/DVK_BL652/board.json
index 5c9cfad26..5c9cfad26 100644
--- a/ports/nrf/boards/dvk_bl652/board.json
+++ b/ports/nrf/boards/DVK_BL652/board.json
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
index e83e55517..e83e55517 100644
--- a/ports/nrf/boards/dvk_bl652/mpconfigboard.h
+++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk b/ports/nrf/boards/DVK_BL652/mpconfigboard.mk
index 30767d766..30767d766 100644
--- a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk
+++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.mk
diff --git a/ports/nrf/boards/dvk_bl652/pins.csv b/ports/nrf/boards/DVK_BL652/pins.csv
index 78e249fca..78e249fca 100644
--- a/ports/nrf/boards/dvk_bl652/pins.csv
+++ b/ports/nrf/boards/DVK_BL652/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b1/board.json b/ports/nrf/boards/EVK_NINA_B1/board.json
index 657b0fa06..657b0fa06 100644
--- a/ports/nrf/boards/evk_nina_b1/board.json
+++ b/ports/nrf/boards/EVK_NINA_B1/board.json
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
index 72aeb4492..72aeb4492 100644
--- a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
index 96245e3e4..96245e3e4 100644
--- a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
+++ b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b1/pins.csv b/ports/nrf/boards/EVK_NINA_B1/pins.csv
index 876c7ddc1..876c7ddc1 100644
--- a/ports/nrf/boards/evk_nina_b1/pins.csv
+++ b/ports/nrf/boards/EVK_NINA_B1/pins.csv
diff --git a/ports/nrf/boards/evk_nina_b3/board.json b/ports/nrf/boards/EVK_NINA_B3/board.json
index 54e3dc358..54e3dc358 100644
--- a/ports/nrf/boards/evk_nina_b3/board.json
+++ b/ports/nrf/boards/EVK_NINA_B3/board.json
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
index d4ce93a0a..d4ce93a0a 100644
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
index ca555d393..ca555d393 100644
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
+++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.mk
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/EVK_NINA_B3/pins.csv
index e6190bac0..e6190bac0 100644
--- a/ports/nrf/boards/evk_nina_b3/pins.csv
+++ b/ports/nrf/boards/EVK_NINA_B3/pins.csv
diff --git a/ports/nrf/boards/feather52/board.json b/ports/nrf/boards/FEATHER52/board.json
index 344b880ba..344b880ba 100644
--- a/ports/nrf/boards/feather52/board.json
+++ b/ports/nrf/boards/FEATHER52/board.json
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h
index cef44ca40..cef44ca40 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.h
+++ b/ports/nrf/boards/FEATHER52/mpconfigboard.h
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/FEATHER52/mpconfigboard.mk
index 96245e3e4..96245e3e4 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.mk
+++ b/ports/nrf/boards/FEATHER52/mpconfigboard.mk
diff --git a/ports/nrf/boards/feather52/pins.csv b/ports/nrf/boards/FEATHER52/pins.csv
index be1ab7f2e..be1ab7f2e 100644
--- a/ports/nrf/boards/feather52/pins.csv
+++ b/ports/nrf/boards/FEATHER52/pins.csv
diff --git a/ports/nrf/boards/ibk_blyst_nano/board.json b/ports/nrf/boards/IBK_BLYST_NANO/board.json
index 562c33607..562c33607 100644
--- a/ports/nrf/boards/ibk_blyst_nano/board.json
+++ b/ports/nrf/boards/IBK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
index 63d2944f6..63d2944f6 100644
--- a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
index c3164c8f0..c3164c8f0 100644
--- a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
+++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/ibk_blyst_nano/pins.csv b/ports/nrf/boards/IBK_BLYST_NANO/pins.csv
index 90bf84a04..90bf84a04 100644
--- a/ports/nrf/boards/ibk_blyst_nano/pins.csv
+++ b/ports/nrf/boards/IBK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/idk_blyst_nano/board.json b/ports/nrf/boards/IDK_BLYST_NANO/board.json
index 199721698..199721698 100644
--- a/ports/nrf/boards/idk_blyst_nano/board.json
+++ b/ports/nrf/boards/IDK_BLYST_NANO/board.json
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
index 73b1c6ff7..73b1c6ff7 100644
--- a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
index c3164c8f0..c3164c8f0 100644
--- a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
+++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.mk
diff --git a/ports/nrf/boards/idk_blyst_nano/pins.csv b/ports/nrf/boards/IDK_BLYST_NANO/pins.csv
index 90bf84a04..90bf84a04 100644
--- a/ports/nrf/boards/idk_blyst_nano/pins.csv
+++ b/ports/nrf/boards/IDK_BLYST_NANO/pins.csv
diff --git a/ports/nrf/boards/microbit/board.json b/ports/nrf/boards/MICROBIT/board.json
index 872727bb9..872727bb9 100644
--- a/ports/nrf/boards/microbit/board.json
+++ b/ports/nrf/boards/MICROBIT/board.json
diff --git a/ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld b/ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
index fc286ecba..fc286ecba 100644
--- a/ports/nrf/boards/microbit/custom_nrf51822_s110_microbit.ld
+++ b/ports/nrf/boards/MICROBIT/custom_nrf51822_s110_microbit.ld
diff --git a/ports/nrf/boards/microbit/modules/AUTHORS b/ports/nrf/boards/MICROBIT/modules/AUTHORS
index 60ed2e52e..60ed2e52e 100644
--- a/ports/nrf/boards/microbit/modules/AUTHORS
+++ b/ports/nrf/boards/MICROBIT/modules/AUTHORS
diff --git a/ports/nrf/boards/microbit/modules/LICENSE b/ports/nrf/boards/MICROBIT/modules/LICENSE
index 621229028..621229028 100644
--- a/ports/nrf/boards/microbit/modules/LICENSE
+++ b/ports/nrf/boards/MICROBIT/modules/LICENSE
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.h b/ports/nrf/boards/MICROBIT/modules/boardmodules.h
index da5039528..da5039528 100644
--- a/ports/nrf/boards/microbit/modules/boardmodules.h
+++ b/ports/nrf/boards/MICROBIT/modules/boardmodules.h
diff --git a/ports/nrf/boards/microbit/modules/boardmodules.mk b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
index eb8f10861..84a606c44 100644
--- a/ports/nrf/boards/microbit/modules/boardmodules.mk
+++ b/ports/nrf/boards/MICROBIT/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_MICROBIT_DIR = boards/microbit/modules
+BOARD_MICROBIT_DIR = boards/MICROBIT/modules
 
 INC += -I./$(BOARD_MICROBIT_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/MICROBIT/modules/iters.c
index b16a4c665..b16a4c665 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/MICROBIT/modules/iters.c
diff --git a/ports/nrf/boards/microbit/modules/iters.h b/ports/nrf/boards/MICROBIT/modules/iters.h
index f7f716c8b..f7f716c8b 100644
--- a/ports/nrf/boards/microbit/modules/iters.h
+++ b/ports/nrf/boards/MICROBIT/modules/iters.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
index d6f6ab0a9..d6f6ab0a9 100644
--- a/ports/nrf/boards/microbit/modules/microbitconstimage.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimage.h b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
index 45d58c4a0..45d58c4a0 100644
--- a/ports/nrf/boards/microbit/modules/microbitconstimage.h
+++ b/ports/nrf/boards/MICROBIT/modules/microbitconstimage.h
diff --git a/ports/nrf/boards/microbit/modules/microbitconstimagetuples.c b/ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
index 3773b1ed5..3773b1ed5 100644
--- a/ports/nrf/boards/microbit/modules/microbitconstimagetuples.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitconstimagetuples.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
index ff3c499fa..ff3c499fa 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.c
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.h b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
index 2a916a7db..2a916a7db 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.h
+++ b/ports/nrf/boards/MICROBIT/modules/microbitdisplay.h
diff --git a/ports/nrf/boards/microbit/modules/microbitfont.h b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
index 2ae0c8fab..2ae0c8fab 100644
--- a/ports/nrf/boards/microbit/modules/microbitfont.h
+++ b/ports/nrf/boards/MICROBIT/modules/microbitfont.h
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
index 08ef4babc..08ef4babc 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/MICROBIT/modules/microbitimage.c
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.h b/ports/nrf/boards/MICROBIT/modules/microbitimage.h
index 41a6aff4c..41a6aff4c 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.h
+++ b/ports/nrf/boards/MICROBIT/modules/microbitimage.h
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
index 06b3e5f6a..06b3e5f6a 100644
--- a/ports/nrf/boards/microbit/modules/modmicrobit.c
+++ b/ports/nrf/boards/MICROBIT/modules/modmicrobit.c
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.h b/ports/nrf/boards/MICROBIT/modules/modmicrobit.h
index ba65bd299..ba65bd299 100644
--- a/ports/nrf/boards/microbit/modules/modmicrobit.h
+++ b/ports/nrf/boards/MICROBIT/modules/modmicrobit.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h
index 4c6e05120..4c6e05120 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.h
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.h
diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
index 6fdd2bc50..6c7e1b46b 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.mk
@@ -4,7 +4,7 @@ MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 
 ifneq ($(SD),)
-LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
+LD_FILES += boards/MICROBIT/custom_nrf51822_s110_microbit.ld
 FROZEN_MANIFEST ?=
 else
 MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/microbit/pins.csv b/ports/nrf/boards/MICROBIT/pins.csv
index 40413ef97..40413ef97 100644
--- a/ports/nrf/boards/microbit/pins.csv
+++ b/ports/nrf/boards/MICROBIT/pins.csv
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
index f993c7dc5..f993c7dc5 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
index 99d0caad2..99d0caad2 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/board.json
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
index feafe8a14..feafe8a14 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
index 3a26a92b7..3a26a92b7 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.mk
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
index 571628637..571628637 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/pins.csv
diff --git a/ports/nrf/boards/particle_xenon/board.json b/ports/nrf/boards/PARTICLE_XENON/board.json
index 1f6b90b75..1f6b90b75 100644
--- a/ports/nrf/boards/particle_xenon/board.json
+++ b/ports/nrf/boards/PARTICLE_XENON/board.json
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
index 012a04458..012a04458 100644
--- a/ports/nrf/boards/particle_xenon/mpconfigboard.h
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
index d28324f76..d28324f76 100644
--- a/ports/nrf/boards/particle_xenon/mpconfigboard.mk
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.mk
diff --git a/ports/nrf/boards/particle_xenon/pins.csv b/ports/nrf/boards/PARTICLE_XENON/pins.csv
index 30f05c556..30f05c556 100644
--- a/ports/nrf/boards/particle_xenon/pins.csv
+++ b/ports/nrf/boards/PARTICLE_XENON/pins.csv
diff --git a/ports/nrf/boards/pca10000/board.json b/ports/nrf/boards/PCA10000/board.json
index 1f6e73869..1f6e73869 100644
--- a/ports/nrf/boards/pca10000/board.json
+++ b/ports/nrf/boards/PCA10000/board.json
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h
index e56e0edf8..e56e0edf8 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10000/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/PCA10000/mpconfigboard.mk
index 64cf513c0..64cf513c0 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10000/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10000/pins.csv b/ports/nrf/boards/PCA10000/pins.csv
index 75fcbaca7..75fcbaca7 100644
--- a/ports/nrf/boards/pca10000/pins.csv
+++ b/ports/nrf/boards/PCA10000/pins.csv
diff --git a/ports/nrf/boards/pca10001/board.json b/ports/nrf/boards/PCA10001/board.json
index ca1a42df7..ca1a42df7 100644
--- a/ports/nrf/boards/pca10001/board.json
+++ b/ports/nrf/boards/PCA10001/board.json
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h
index a2e845539..a2e845539 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10001/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/PCA10001/mpconfigboard.mk
index 64cf513c0..64cf513c0 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10001/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10001/pins.csv b/ports/nrf/boards/PCA10001/pins.csv
index 659fc87e0..659fc87e0 100644
--- a/ports/nrf/boards/pca10001/pins.csv
+++ b/ports/nrf/boards/PCA10001/pins.csv
diff --git a/ports/nrf/boards/pca10028/board.json b/ports/nrf/boards/PCA10028/board.json
index f80cea469..f80cea469 100644
--- a/ports/nrf/boards/pca10028/board.json
+++ b/ports/nrf/boards/PCA10028/board.json
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
index 7abb5845e..7abb5845e 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10028/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/PCA10028/mpconfigboard.mk
index 83b26a1de..83b26a1de 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10028/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10028/pins.csv b/ports/nrf/boards/PCA10028/pins.csv
index 33f9b8eec..33f9b8eec 100644
--- a/ports/nrf/boards/pca10028/pins.csv
+++ b/ports/nrf/boards/PCA10028/pins.csv
diff --git a/ports/nrf/boards/pca10031/board.json b/ports/nrf/boards/PCA10031/board.json
index fb7c774ca..fb7c774ca 100644
--- a/ports/nrf/boards/pca10031/board.json
+++ b/ports/nrf/boards/PCA10031/board.json
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
index f16236623..f16236623 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10031/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/PCA10031/mpconfigboard.mk
index 83b26a1de..83b26a1de 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10031/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10031/pins.csv b/ports/nrf/boards/PCA10031/pins.csv
index f70089866..f70089866 100644
--- a/ports/nrf/boards/pca10031/pins.csv
+++ b/ports/nrf/boards/PCA10031/pins.csv
diff --git a/ports/nrf/boards/pca10040/board.json b/ports/nrf/boards/PCA10040/board.json
index d1680e53a..d1680e53a 100644
--- a/ports/nrf/boards/pca10040/board.json
+++ b/ports/nrf/boards/PCA10040/board.json
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
index 00a56c2ea..00a56c2ea 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/PCA10040/mpconfigboard.mk
index 96245e3e4..96245e3e4 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10040/pins.csv b/ports/nrf/boards/PCA10040/pins.csv
index 90bf84a04..90bf84a04 100644
--- a/ports/nrf/boards/pca10040/pins.csv
+++ b/ports/nrf/boards/PCA10040/pins.csv
diff --git a/ports/nrf/boards/pca10056/board.json b/ports/nrf/boards/PCA10056/board.json
index 763d8d824..763d8d824 100644
--- a/ports/nrf/boards/pca10056/board.json
+++ b/ports/nrf/boards/PCA10056/board.json
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
index fa39764a7..fa39764a7 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/PCA10056/mpconfigboard.mk
index d8ee0f8a2..d8ee0f8a2 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10056/pins.csv b/ports/nrf/boards/PCA10056/pins.csv
index e6190bac0..e6190bac0 100644
--- a/ports/nrf/boards/pca10056/pins.csv
+++ b/ports/nrf/boards/PCA10056/pins.csv
diff --git a/ports/nrf/boards/pca10059/board.json b/ports/nrf/boards/PCA10059/board.json
index 14bd8bf7e..14bd8bf7e 100644
--- a/ports/nrf/boards/pca10059/board.json
+++ b/ports/nrf/boards/PCA10059/board.json
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.h b/ports/nrf/boards/PCA10059/modules/boardmodules.h
index 1d70ec916..1d70ec916 100644
--- a/ports/nrf/boards/pca10059/modules/boardmodules.h
+++ b/ports/nrf/boards/PCA10059/modules/boardmodules.h
diff --git a/ports/nrf/boards/pca10059/modules/boardmodules.mk b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
index 413790fbe..d1457cde7 100644
--- a/ports/nrf/boards/pca10059/modules/boardmodules.mk
+++ b/ports/nrf/boards/PCA10059/modules/boardmodules.mk
@@ -1,4 +1,4 @@
-BOARD_PCA10059_DIR = boards/pca10059/modules
+BOARD_PCA10059_DIR = boards/PCA10059/modules
 
 INC += -I./$(BOARD_PCA10059_DIR)
 CFLAGS += -DBOARD_SPECIFIC_MODULES
diff --git a/ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c b/ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
index 8ae5e218a..8ae5e218a 100644
--- a/ports/nrf/boards/pca10059/modules/recover_uicr_regout0.c
+++ b/ports/nrf/boards/PCA10059/modules/recover_uicr_regout0.c
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
index 904a0871e..904a0871e 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/PCA10059/mpconfigboard.mk
index 3a26a92b7..3a26a92b7 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10059/pins.csv b/ports/nrf/boards/PCA10059/pins.csv
index 9d142b9f1..9d142b9f1 100644
--- a/ports/nrf/boards/pca10059/pins.csv
+++ b/ports/nrf/boards/PCA10059/pins.csv
diff --git a/ports/nrf/boards/pca10090/board.json b/ports/nrf/boards/PCA10090/board.json
index 56525ef3a..56525ef3a 100644
--- a/ports/nrf/boards/pca10090/board.json
+++ b/ports/nrf/boards/PCA10090/board.json
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h
index 95cf8d654..95cf8d654 100644
--- a/ports/nrf/boards/pca10090/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10090/mpconfigboard.h
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.mk b/ports/nrf/boards/PCA10090/mpconfigboard.mk
index cc7e7c368..cc7e7c368 100644
--- a/ports/nrf/boards/pca10090/mpconfigboard.mk
+++ b/ports/nrf/boards/PCA10090/mpconfigboard.mk
diff --git a/ports/nrf/boards/pca10090/pins.csv b/ports/nrf/boards/PCA10090/pins.csv
index 7d060f68f..7d060f68f 100644
--- a/ports/nrf/boards/pca10090/pins.csv
+++ b/ports/nrf/boards/PCA10090/pins.csv
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld b/ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
index 0ff02f218..0ff02f218 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.c b/ports/nrf/boards/SEEED_XIAO_NRF52/board.c
index 25c9e1721..25c9e1721 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/board.c
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/board.c
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
index d40355bb2..d40355bb2 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/board.json
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/board.json
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/deploy.md b/ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
index a66731c30..a66731c30 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/deploy.md
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/deploy.md
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
index 18fbe327d..18fbe327d 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
index c2fc21918..1f495a9c6 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 7.3.0
 SD=s140
-LD_FILES += boards/seeed_xiao_nrf52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
+LD_FILES += boards/SEEED_XIAO_NRF52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
 
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/pins.csv b/ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
index 6cb050c57..6cb050c57 100644
--- a/ports/nrf/boards/seeed_xiao_nrf52/pins.csv
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/pins.csv
diff --git a/ports/nrf/boards/wt51822_s4at/board.json b/ports/nrf/boards/WT51822_S4AT/board.json
index 89d008c6f..89d008c6f 100644
--- a/ports/nrf/boards/wt51822_s4at/board.json
+++ b/ports/nrf/boards/WT51822_S4AT/board.json
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
index 7997aa269..7997aa269 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h
+++ b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
index d0de24ba4..d0de24ba4 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
+++ b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.mk
diff --git a/ports/nrf/boards/wt51822_s4at/pins.csv b/ports/nrf/boards/WT51822_S4AT/pins.csv
index ae98cb793..ae98cb793 100644
--- a/ports/nrf/boards/wt51822_s4at/pins.csv
+++ b/ports/nrf/boards/WT51822_S4AT/pins.csv
diff --git a/tools/ci.sh b/tools/ci.sh
index 98e78dc78..b9bfb7eef 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -204,10 +204,10 @@ function ci_nrf_build {
     ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/nrf submodules
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
-    make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
-    make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10040
+    make ${MAKEOPTS} -C ports/nrf BOARD=MICROBIT
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10056 SD=s140
+    make ${MAKEOPTS} -C ports/nrf BOARD=PCA10090
 }
 
 ########################################################################################