diff --git a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
index 195d4d54ca..1e6379a07b 100644
--- a/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
+++ b/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/pins.csv
@@ -147,6 +147,6 @@ D5,P210
 LED1,P107
 LED2,P400
 LED3,P800
-LED_R,P107
-LED_G,P400
-LED_B,P800
+LED_RED,P107
+LED_GREEN,P400
+LED_BLUE,P800
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
index 1e42a4f8de..47d9b5b043 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -19,9 +19,9 @@ A2,GPIO28
 A3,GPIO29
 SDA,GPIO12
 SCL,GPIO13
-LEDR,EXT_GPIO0
-LEDG,EXT_GPIO1
-LEDB,EXT_GPIO2
+LED_RED,EXT_GPIO0
+LED_GREEN,EXT_GPIO1
+LED_BLUE,EXT_GPIO2
 D18,EXT_GPIO3
 D19,EXT_GPIO4
 D20,EXT_GPIO5
diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
index 29f1e61401..a9b8cbfc7b 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.h
@@ -184,9 +184,9 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_USRSW_PRESSED    (1)
 
 // LEDs
-#define MICROPY_HW_LED1             (pyb_pin_LEDR) // red
-#define MICROPY_HW_LED2             (pyb_pin_LEDG) // green
-#define MICROPY_HW_LED3             (pyb_pin_LEDB) // yellow
+#define MICROPY_HW_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
 
diff --git a/ports/stm32/boards/ARDUINO_GIGA/pins.csv b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
index c27b5d8cd4..91c5c6d586 100644
--- a/ports/stm32/boards/ARDUINO_GIGA/pins.csv
+++ b/ports/stm32/boards/ARDUINO_GIGA/pins.csv
@@ -179,9 +179,9 @@ UART6_RX,PC7
 BOOT0,BOOT0
 DAC1,PA4
 DAC2,PA5
-LEDR,PI12
-LEDG,PJ13
-LEDB,PE3
+LED_RED,PI12
+LED_GREEN,PJ13
+LED_BLUE,PE3
 I2C1_SDA,PB9
 I2C1_SCL,PB8
 I2C2_SDA,PB11
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
index 276288d287..7cb3d85d3d 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.h
@@ -180,9 +180,9 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_CAN_IS_RESERVED(id) (id != PYB_CAN_1)
 
 // LEDs
-#define MICROPY_HW_LED1             (pyb_pin_LEDR) // red
-#define MICROPY_HW_LED2             (pyb_pin_LEDG) // green
-#define MICROPY_HW_LED3             (pyb_pin_LEDB) // yellow
+#define MICROPY_HW_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
 
diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
index c092965aaf..8ff21e6453 100644
--- a/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
+++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/pins.csv
@@ -180,9 +180,9 @@ BOOT0,BOOT0
 OSCEN,PH1
 DAC1,-PA4
 DAC2,-PA5
-LEDR,PE3
-LEDG,PC13
-LEDB,-PF4
+LED_RED,PE3
+LED_GREEN,PC13
+LED_BLUE,-PF4
 I2C1_SCL,PB8
 I2C1_SDA,PB9
 I2C2_SCL,PF1
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 452ec00d70..349ca9e001 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -177,9 +177,9 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_USRSW_PRESSED    (1)
 
 // LEDs
-#define MICROPY_HW_LED1             (pyb_pin_LEDR) // red
-#define MICROPY_HW_LED2             (pyb_pin_LEDG) // green
-#define MICROPY_HW_LED3             (pyb_pin_LEDB) // yellow
+#define MICROPY_HW_LED1             (pyb_pin_LED_RED) // red
+#define MICROPY_HW_LED2             (pyb_pin_LED_GREEN) // green
+#define MICROPY_HW_LED3             (pyb_pin_LED_BLUE) // yellow
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
 
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index 6ab00f02ec..ea8710b25f 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -203,9 +203,9 @@ BOOT0,BOOT0
 OSCEN,PH1
 DAC1,PA4
 DAC2,-PA5
-LEDR,PK5
-LEDG,PK6
-LEDB,PK7
+LED_RED,PK5
+LED_GREEN,PK6
+LED_BLUE,PK7
 I2C1_SDA,PB7
 I2C1_SCL,PB6
 I2C3_SDA,PH8