diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
index 4d2d04d9..48cb246a 100644
--- a/.github/workflows/micropython.yml
+++ b/.github/workflows/micropython.yml
@@ -69,9 +69,9 @@ jobs:
       matrix:
         include:
         - name: pico
-          board: PICO
+          board: RPI_PICO
         - name: picow
-          board: PICO_W
+          board: RPI_PICO_W
         - name: tiny2040
           board: PIMORONI_TINY2040
         - name: picolipo_4mb
@@ -84,11 +84,11 @@ jobs:
           board: PICO_W_ENVIRO
           patch: true
         - name: galactic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: cosmic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: stellar_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: inky_frame
           board: PICO_W_INKY
           patch: true
diff --git a/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake b/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake
index 4644016a..c6399e33 100644
--- a/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake
+++ b/micropython/board/PICO_W_ENVIRO/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Enviro with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
diff --git a/micropython/board/PICO_W_INKY/mpconfigboard.cmake b/micropython/board/PICO_W_INKY/mpconfigboard.cmake
index e06f0cb7..7feece04 100644
--- a/micropython/board/PICO_W_INKY/mpconfigboard.cmake
+++ b/micropython/board/PICO_W_INKY/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
+set(MICROPY_BOARD RPI_PICO_W)
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
diff --git a/micropython/board/PICO/board.json b/micropython/board/RPI_PICO/board.json
similarity index 100%
rename from micropython/board/PICO/board.json
rename to micropython/board/RPI_PICO/board.json
diff --git a/micropython/board/PICO/manifest.py b/micropython/board/RPI_PICO/manifest.py
similarity index 100%
rename from micropython/board/PICO/manifest.py
rename to micropython/board/RPI_PICO/manifest.py
diff --git a/micropython/board/PICO/mpconfigboard.cmake b/micropython/board/RPI_PICO/mpconfigboard.cmake
similarity index 73%
rename from micropython/board/PICO/mpconfigboard.cmake
rename to micropython/board/RPI_PICO/mpconfigboard.cmake
index 4ec156b0..c89ff780 100644
--- a/micropython/board/PICO/mpconfigboard.cmake
+++ b/micropython/board/RPI_PICO/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico
+set(PICO_BOARD "pico")
 
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/micropython/board/PICO/mpconfigboard.h b/micropython/board/RPI_PICO/mpconfigboard.h
similarity index 100%
rename from micropython/board/PICO/mpconfigboard.h
rename to micropython/board/RPI_PICO/mpconfigboard.h
diff --git a/micropython/board/PICO/pins.csv b/micropython/board/RPI_PICO/pins.csv
similarity index 100%
rename from micropython/board/PICO/pins.csv
rename to micropython/board/RPI_PICO/pins.csv
diff --git a/micropython/board/PICO_W/board.json b/micropython/board/RPI_PICO_W/board.json
similarity index 100%
rename from micropython/board/PICO_W/board.json
rename to micropython/board/RPI_PICO_W/board.json
diff --git a/micropython/board/PICO_W/manifest.py b/micropython/board/RPI_PICO_W/manifest.py
similarity index 100%
rename from micropython/board/PICO_W/manifest.py
rename to micropython/board/RPI_PICO_W/manifest.py
diff --git a/micropython/board/PICO_W/mpconfigboard.cmake b/micropython/board/RPI_PICO_W/mpconfigboard.cmake
similarity index 80%
rename from micropython/board/PICO_W/mpconfigboard.cmake
rename to micropython/board/RPI_PICO_W/mpconfigboard.cmake
index 9182e843..ef975156 100644
--- a/micropython/board/PICO_W/mpconfigboard.cmake
+++ b/micropython/board/RPI_PICO_W/mpconfigboard.cmake
@@ -1,4 +1,5 @@
 # cmake file for Raspberry Pi Pico W
+set(PICO_BOARD "pico_w")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
diff --git a/micropython/board/PICO_W/mpconfigboard.h b/micropython/board/RPI_PICO_W/mpconfigboard.h
similarity index 100%
rename from micropython/board/PICO_W/mpconfigboard.h
rename to micropython/board/RPI_PICO_W/mpconfigboard.h
diff --git a/micropython/board/PICO_W/pins.csv b/micropython/board/RPI_PICO_W/pins.csv
similarity index 100%
rename from micropython/board/PICO_W/pins.csv
rename to micropython/board/RPI_PICO_W/pins.csv