diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig
index 892f9322183..b4abc805a13 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/audiopack/defconfig
@@ -19,9 +19,9 @@
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig
index c80738a7468..5aa3824e3a2 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/composite/defconfig
@@ -15,9 +15,9 @@
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig
index d1b5c36e027..dda6b8d95bb 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nsh/defconfig
@@ -12,9 +12,9 @@
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig
index 5b82d03f0d3..cf18b4d1083 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/nshsram/defconfig
@@ -13,9 +13,9 @@
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_STACKDUMP=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig
index f946ecb15aa..8a622620736 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/smp/defconfig
@@ -12,9 +12,9 @@
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig
index c31263971ea..19b85980356 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbmsc/defconfig
@@ -15,9 +15,9 @@
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig
index bdd3beccadc..1f2ee6df3a0 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/usbnsh/defconfig
@@ -13,9 +13,9 @@
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_RP23XX_UART0 is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y
diff --git a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig
index bb025a5f139..a44cc901ef2 100644
--- a/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig
+++ b/boards/arm/rp23xx/pimoroni-pico-2-plus/configs/userled/defconfig
@@ -13,9 +13,9 @@
 # CONFIG_NSH_DISABLE_LOSMART is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="raspberrypi-pico-2"
+CONFIG_ARCH_BOARD="pimoroni-pico-2-plus"
 CONFIG_ARCH_BOARD_COMMON=y
-CONFIG_ARCH_BOARD_RASPBERRYPI_PICO_2=y
+CONFIG_ARCH_BOARD_PIMORONI_PICO_2_PLUS=y
 CONFIG_ARCH_CHIP="rp23xx"
 CONFIG_ARCH_CHIP_RP23XX=y
 CONFIG_ARCH_RAMVECTORS=y