diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
index 311e114b29..11fcb3d087 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
@@ -1,3 +1 @@
 # cmake file
-
-set(PICO_BOARD garatronic_pybstick26_rp2040)
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
index d3fbce6993..681e0dec44 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
@@ -1,6 +1,4 @@
 # cmake file for Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
-
 set(MICROPY_PY_LWIP ON)
 set(MICROPY_PY_NETWORK_CYW43 ON)
 
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
index bc5d1ea65e..4746c6e267 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
@@ -1,4 +1,4 @@
 # cmake file for Wiznet W5100S-EVB-Pico.
-set(PICO_BOARD pico)
+set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5100S)
 set(MICROPY_PY_LWIP 1)
diff --git a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
index 875b89f2be..f7f2650bfa 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
@@ -1,4 +1,4 @@
 # cmake file for Wiznet W5500-EVB-Pico.
-set(PICO_BOARD pico)
+set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5500)
 set(MICROPY_PY_LWIP 1)