diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 08a4a8feae..2077c09429 100755
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -261,14 +261,14 @@ void pgResetFn_statusLedConfig(statusLedConfig_t *statusLedConfig)
         statusLedConfig->ioTags[i] = IO_TAG_NONE;
     }
 
-#ifdef LED0
-    statusLedConfig->ioTags[0] = IO_TAG(LED0);
+#ifdef LED0_PIN
+    statusLedConfig->ioTags[0] = IO_TAG(LED0_PIN);
 #endif
-#ifdef LED1
-    statusLedConfig->ioTags[1] = IO_TAG(LED1);
+#ifdef LED1_PIN
+    statusLedConfig->ioTags[1] = IO_TAG(LED1_PIN);
 #endif
-#ifdef LED2
-    statusLedConfig->ioTags[2] = IO_TAG(LED2);
+#ifdef LED2_PIN
+    statusLedConfig->ioTags[2] = IO_TAG(LED2_PIN);
 #endif
 
     statusLedConfig->inversion = 0
diff --git a/src/main/fc/settings.c b/src/main/fc/settings.c
index 2b81e4ec6b..92d27bda64 100644
--- a/src/main/fc/settings.c
+++ b/src/main/fc/settings.c
@@ -595,7 +595,7 @@ const clivalue_t valueTable[] = {
 // PG_TELEMETRY_CONFIG
 #ifdef TELEMETRY
     { "tlm_switch",                 VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_switch) },
-    { "tlm_inverted",              VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_inverted) },
+    { "tlm_inverted",               VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, telemetry_inverted) },
     { "tlm_halfduplex",             VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, halfDuplex) },
     { "frsky_default_lat",          VAR_INT16  | MASTER_VALUE, .config.minmax = { -9000, 9000 }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, gpsNoFixLatitude) },
     { "frsky_default_long",         VAR_INT16  | MASTER_VALUE, .config.minmax = { -18000, 18000 }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, gpsNoFixLongitude) },
@@ -605,7 +605,7 @@ const clivalue_t valueTable[] = {
     { "hott_alarm_int",             VAR_UINT8  | MASTER_VALUE, .config.minmax = { 0, 120 }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, hottAlarmSoundInterval) },
     { "pid_in_tlm",                 VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = {TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, pidValuesAsTelemetry) },
 #if defined(TELEMETRY_IBUS)
-    { "report_cell_voltage",   VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, report_cell_voltage) },
+    { "report_cell_voltage",        VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, report_cell_voltage) },
 #endif
 #endif
 
diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h
index 42b292f0b2..33fb04fb8c 100644
--- a/src/main/target/AIR32/target.h
+++ b/src/main/target/AIR32/target.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PB5 // Blue LED - PB5
+#define LED0_PIN                PB5 // Blue LED - PB5
 
 #define BEEPER                  PA0
 
diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h
index b0a6b87197..f91f87b3ac 100755
--- a/src/main/target/AIRHEROF3/target.h
+++ b/src/main/target/AIRHEROF3/target.h
@@ -22,8 +22,8 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 #define CONFIG_PREFER_ACC_ON
 
-#define LED0                    PB3
-#define LED1                    PB4
+#define LED0_PIN                PB3
+#define LED1_PIN                PB4
 
 #define BEEPER                  PA12
 #define BEEPER_INVERTED
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index 55172ae6bc..596b4f47a7 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -22,8 +22,8 @@
 
 #define BRUSHED_ESC_AUTODETECT
 
-#define LED0                    PB3
-#define LED1                    PB4
+#define LED0_PIN                PB3
+#define LED1_PIN                PB4
 
 #define BEEPER                  PA12
 
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index ef8d085ee5..f0ce648bc9 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -28,8 +28,8 @@
 #define BRUSHED_ESC_AUTODETECT
 
 // LED's V1
-#define LED0                    PB4
-#define LED1                    PB5
+#define LED0_PIN                PB4
+#define LED1_PIN                PB5
 
 // LED's V2
 #define LED0_A                  PB8
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index cf7b5f17cf..bb7b3329d0 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -25,8 +25,8 @@
 
 #define USBD_PRODUCT_STRING "AlienFlight F4"
 
-#define LED0                    PC12
-#define LED1                    PD2
+#define LED0_PIN                PC12
+#define LED1_PIN                PD2
 
 #define BEEPER                  PC13
 #define BEEPER_INVERTED
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index ca4cfcd439..7e07c38670 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -25,8 +25,8 @@
 
 #define USBD_PRODUCT_STRING "AlienFlightNG F7"
 
-#define LED0                    PC12
-#define LED1                    PD2
+#define LED0_PIN                PC12
+#define LED1_PIN                PD2
 
 #define BEEPER                  PC13
 #define BEEPER_INVERTED
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index 116a7e930d..01bcfc995c 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -20,7 +20,7 @@
 
 #define USBD_PRODUCT_STRING "BeeRotorF4"
 
-#define LED0                    PB4
+#define LED0_PIN                PB4
 
 #define BEEPER                  PB3
 #define BEEPER_INVERTED
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index cd5516755a..a9ec2522bd 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -28,9 +28,9 @@
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 
-#define LED0                    PB6
-#define LED1                    PB5
-#define LED2                    PB4
+#define LED0_PIN                PB6
+#define LED1_PIN                PB5
+#define LED2_PIN                PB4
 
 #define BEEPER                  PC1
 #define BEEPER_OPT              PB7
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 7fdd2af6b7..d03e0aa676 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -17,7 +17,7 @@
 
 #define TARGET_BOARD_IDENTIFIER "CC3D" // CopterControl 3D
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 
 #define INVERTER_PIN_UART1      PB2 // PB2 (BOOT1) used as inverter select GPIO
 
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index c44f461412..848cfd3c66 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -24,9 +24,9 @@
 #define STM32F3DISCOVERY
 #endif
 
-#define LED0                    PE8 // Blue LEDs - PE8/PE12
+#define LED0_PIN                PE8 // Blue LEDs - PE8/PE12
 #define LED0_INVERTED
-#define LED1                    PE10  // Orange LEDs - PE10/PE14
+#define LED1_PIN                PE10  // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
 #define BEEPER                  PE9 // Red LEDs - PE9/PE13
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index cfb52ab8b0..84d573b88c 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -21,9 +21,9 @@
 #define USE_HARDWARE_REVISION_DETECTION
 #define TARGET_BUS_INIT
 
-#define LED0                    PC14
-#define LED1                    PC13
-#define LED2                    PC15
+#define LED0_PIN                PC14
+#define LED1_PIN                PC13
+#define LED2_PIN                PC15
 
 #undef BEEPER
 
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 0b0638d659..8ddfe2e402 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -24,7 +24,7 @@
 #endif
 
 
-#define LED0                      PB5
+#define LED0_PIN                  PB5
 #define BEEPER                    PB4
 #define BEEPER_INVERTED
 #define BEEPER_PWM_HZ             3800 // Beeper PWM frequency in Hz
diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h
index b9b781f84a..62ab3fe003 100644
--- a/src/main/target/CLRACINGF7/target.h
+++ b/src/main/target/CLRACINGF7/target.h
@@ -20,7 +20,7 @@
 
 #define USBD_PRODUCT_STRING "CLRACINGF7"
 
-#define LED0                    PB0
+#define LED0_PIN                PB0
 #define BEEPER                  PB4
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index 47f1a60ceb..14df4b4594 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -26,8 +26,8 @@
 
 #define TARGET_XTAL_MHZ         16
 
-#define LED0                    PC14
-#define LED1                    PC13
+#define LED0_PIN                PC14
+#define LED1_PIN                PC13
 
 #define BEEPER                  PC5
 
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index 52bd44f43a..73843b2e52 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -26,9 +26,9 @@
 
 #undef USE_RX_MSP // never used.
 
-#define LED0                    PC15
-#define LED1                    PC14
-#define LED2                    PC13
+#define LED0_PIN                PC15
+#define LED1_PIN                PC14
+#define LED2_PIN                PC13
 
 #define BEEPER                  PB13
 #define BEEPER_INVERTED
diff --git a/src/main/target/CRAZYFLIE2/target.h b/src/main/target/CRAZYFLIE2/target.h
index e61ed7c0fd..2a45adf722 100644
--- a/src/main/target/CRAZYFLIE2/target.h
+++ b/src/main/target/CRAZYFLIE2/target.h
@@ -42,9 +42,9 @@
 #define USED_TIMERS             ( TIM_N(2) | TIM_N(4) )
 #endif
 
-#define LED0                    PD2
-#define LED1                    PC0
-#define LED2                    PC3
+#define LED0_PIN                PD2
+#define LED1_PIN                PC0
+#define LED2_PIN                PC3
 
 // Using STM32F405RG, 64 pin package (LQFP64)
 // 16 pins per port, ports A, B, C, and also PD2
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index cd6206c225..a59e827abc 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -22,11 +22,11 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
 // tqfp48 pin 34
-#define LED0                    PA13
+#define LED0_PIN                PA13
 // tqfp48 pin 37
-#define LED1                    PA14
+#define LED1_PIN                PA14
 // tqfp48 pin 38
-#define LED2                    PA15
+#define LED2_PIN                PA15
 
 #define BEEPER                  PB2
 #define BEEPER_INVERTED
diff --git a/src/main/target/ELLE0/target.h b/src/main/target/ELLE0/target.h
index ec5cd8aaae..9ba906cc4f 100644
--- a/src/main/target/ELLE0/target.h
+++ b/src/main/target/ELLE0/target.h
@@ -22,9 +22,9 @@
 
 #define USBD_PRODUCT_STRING "Elle0"
 
-#define LED0                    PA8
-#define LED1                    PB4
-#define LED2                    PC2
+#define LED0_PIN                PA8
+#define LED1_PIN                PB4
+#define LED2_PIN                PC2
 
 // MPU9250 interrupt
 #define USE_EXTI
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index df1f436278..91280a0fa5 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -20,9 +20,9 @@
 
 #define USBD_PRODUCT_STRING     "Swift-Flyer F4BY"
 
-#define LED0                    PE3 // Blue LED
-#define LED1                    PE2 // Red LED
-#define LED2                    PE1 // Blue LED
+#define LED0_PIN                PE3 // Blue LED
+#define LED1_PIN                PE2 // Red LED
+#define LED2_PIN                PE1 // Blue LED
 
 #define BEEPER                  PE5
 
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index 1f66ab2438..5e5069d0c7 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -19,8 +19,8 @@
 #define TARGET_BOARD_IDENTIFIER "FORT"
 #define USBD_PRODUCT_STRING     "FortiniF4"
 /*--------------LED----------------*/
-#define LED0                    PB5
-#define LED1                    PB6
+#define LED0_PIN                PB5
+#define LED1_PIN                PB6
 #define LED_STRIP
 /*---------------------------------*/
 
diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h
index f340f76369..2b7d9ed722 100644
--- a/src/main/target/FF_PIKOBLX/target.h
+++ b/src/main/target/FF_PIKOBLX/target.h
@@ -32,8 +32,8 @@
 #define TARGET_CONFIG
 #define BRUSHED_ESC_AUTODETECT
 
-#define LED0                    PB9
-#define LED1                    PB5
+#define LED0_PIN                PB9
+#define LED1_PIN                PB5
 
 #define BEEPER                  PA0
 #define BEEPER_INVERTED
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index 10ee4f1588..ab0cb499cc 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -19,8 +19,8 @@
 #define TARGET_BOARD_IDENTIFIER "PIK4"
 #define USBD_PRODUCT_STRING     "PikoF4"
 /*--------------LED----------------*/
-#define LED0                    PA15
-#define LED1                    PB6
+#define LED0_PIN                PA15
+#define LED1_PIN                PB6
 #define LED_STRIP
 /*---------------------------------*/
 
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index 8855c40c0c..027919a90d 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -21,8 +21,8 @@
 
 #define USBD_PRODUCT_STRING  "FishDroneF4"
 
-#define LED0                    PC13
-#define LED1                    PC14
+#define LED0_PIN                PC13
+#define LED1_PIN                PC14
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index e3d4484e01..550666518b 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -21,7 +21,7 @@
 #define TARGET_CONFIG
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index f715d723d2..26b83a916e 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -19,7 +19,7 @@
 #define USBD_PRODUCT_STRING "FRSKYF4"
 #define TARGET_CONFIG
 
-#define LED0                    PB5
+#define LED0_PIN                PB5
 #define BEEPER                  PB4
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 464d7e2cc5..5a9d893841 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -28,7 +28,7 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 #define CONFIG_PREFER_ACC_ON
 
-#define LED0                    PC14
+#define LED0_PIN                PC14
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 45d9c65113..182b662e30 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -25,8 +25,8 @@
     #define USBD_PRODUCT_STRING     "FuryF4"
 #endif
 
-#define LED0                    PB5
-#define LED1                    PB4
+#define LED0_PIN                PB5
+#define LED1_PIN                PB4
 
 #define BEEPER                  PA8
 #define BEEPER_INVERTED
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index e7c09271b1..335d1513a1 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -21,8 +21,8 @@
 
 #define USBD_PRODUCT_STRING "FuryF7"
 
-#define LED0                    PB5
-#define LED1                    PB4
+#define LED0_PIN                PB5
+#define LED1_PIN                PB4
 
 #define BEEPER                  PD10
 #define BEEPER_INVERTED
diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h
index 6a4e3a140e..f63687d568 100644
--- a/src/main/target/IMPULSERCF3/target.h
+++ b/src/main/target/IMPULSERCF3/target.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB7
+#define LED0_PIN                PB7
 
 #define BEEPER                  PC15
 
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index bec37f4b37..41a478ffa5 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index e9eef103fd..2367ef2151 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0        PB3
+#define LED0_PIN    PB3
 
 #define BEEPER      PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 8e2874df0c..8edd69b2fc 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -20,9 +20,9 @@
 
 #define USBD_PRODUCT_STRING "KakuteF4-V1"
 
-#define LED0                    PB5
-#define LED1                    PB4
-#define LED2                    PB6
+#define LED0_PIN                PB5
+#define LED1_PIN                PB4
+#define LED2_PIN                PB6
 
 #define BEEPER                  PC9
 #define BEEPER_INVERTED
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index a552c0089c..46e7b3c445 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -29,7 +29,7 @@
 #define ESCSERIAL_TIMER_TX_HARDWARE 6
 #define REMAP_TIM17_DMA
 
-#define LED0                    PB1
+#define LED0_PIN                PB1
 
 #define BEEPER                  PB13
 #define BEEPER_INVERTED
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index bcc469df0d..0f72485724 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -32,11 +32,11 @@
 #endif
 
 #if defined(PLUMF4) || defined(KIWIF4V2)
-#define LED0                    PB4
+#define LED0_PIN                PB4
 
 #else
-#define LED0                    PB5
-#define LED1                    PB4				
+#define LED0_PIN                PB5
+#define LED1_PIN                PB4				
 #endif
 
 #define BEEPER                  PA8
diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h
index 8d8e4e291a..d8fa00132b 100755
--- a/src/main/target/KROOZX/target.h
+++ b/src/main/target/KROOZX/target.h
@@ -27,8 +27,8 @@
 #define TARGET_CONFIG
 #define TARGET_PREINIT
 
-#define LED0                    PA14 // Red LED
-#define LED1                    PA13 // Green LED
+#define LED0_PIN                PA14 // Red LED
+#define LED1_PIN                PA13 // Green LED
 
 #define BEEPER                  PC1
 
diff --git a/src/main/target/LUMBAF3/target.h b/src/main/target/LUMBAF3/target.h
index 2fcc9369f8..04c6650772 100644
--- a/src/main/target/LUMBAF3/target.h
+++ b/src/main/target/LUMBAF3/target.h
@@ -17,7 +17,7 @@
 
 #define TARGET_BOARD_IDENTIFIER "MCF3"	// LumbaF3 Flight Controller by mC
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 #define BEEPER                  PC15
 
 // MPU6000 interrupts
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index 88e86f5ad8..fea3621eea 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -26,10 +26,10 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PC15
-#define LED1                    PC14
+#define LED0_PIN                PC15
+#define LED1_PIN                PC14
 #ifndef LUXV2_RACE
-#define LED2                    PC13
+#define LED2_PIN                PC13
 #endif
 
 #ifdef LUXV2_RACE
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 430fb68a55..bff65e156e 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -22,8 +22,8 @@
 
 #define USBD_PRODUCT_STRING  "MatekF4"
 
-#define LED0                    PB9
-#define LED1                    PA14
+#define LED0_PIN                PB9
+#define LED1_PIN                PA14
 
 #define BEEPER                  PC13
 #define BEEPER_INVERTED
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index a741a3f23c..7c2431aa44 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -19,8 +19,8 @@
 
 #define TARGET_BOARD_IDENTIFIER "MSKY" // Micro sciSKY
 
-#define LED0                    PB3
-#define LED1                    PB4
+#define LED0_PIN                PB3
+#define LED1_PIN                PB4
 
 #define BEEPER                  PA12
 
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index c9d6db3056..f9e0d681ff 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -22,8 +22,8 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 #define TARGET_CONFIG
 
-#define LED0                    PB5 // Blue LEDs - PB5
-//#define LED1                    PB9 // Green LEDs - PB9
+#define LED0_PIN                PB5 // Blue LEDs - PB5
+//#define LED1_PIN                PB9 // Green LEDs - PB9
 
 #define BEEPER                  PA0
 #define BEEPER_INVERTED
diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h
index d646884666..0e249af074 100755
--- a/src/main/target/MULTIFLITEPICO/target.h
+++ b/src/main/target/MULTIFLITEPICO/target.h
@@ -22,7 +22,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index fd267ae29d..1de6785bf4 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -26,8 +26,8 @@
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 
-#define LED0                    PB3
-#define LED1                    PB4
+#define LED0_PIN                PB3
+#define LED1_PIN                PB4
 
 #define BEEPER                  PA12
 
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index 3756f95f10..3106be009f 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -24,9 +24,9 @@
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 
-#define LED0                    PB6
-#define LED1                    PB5
-#define LED2                    PB4
+#define LED0_PIN                PB6
+#define LED1_PIN                PB5
+#define LED2_PIN                PB4
 
 #define BEEPER                  PC1
 #define BEEPER_INVERTED
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index cb712f652b..5e47a26e11 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -26,7 +26,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index f7e66c3805..daf21aac86 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -33,8 +33,8 @@
 #define USBD_SERIALNUMBER_STRING "0x8020000" // Remove this at the next major release (?)
 #endif
 
-#define LED0                    PB5
-//#define LED1                    PB4 // Remove this at the next major release
+#define LED0_PIN                PB5
+//#define LED1_PIN                PB4 // Remove this at the next major release
 #define BEEPER                  PB4
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 12fabe9529..2461db0b35 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -19,7 +19,7 @@
 
 #define USBD_PRODUCT_STRING "OmnibusF7"
 
-#define LED0                    PE0
+#define LED0_PIN                PE0
 
 #define BEEPER                  PD15
 #define BEEPER_INVERTED
diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h
index 1fe543c435..139d760d08 100755
--- a/src/main/target/RACEBASE/target.h
+++ b/src/main/target/RACEBASE/target.h
@@ -21,10 +21,10 @@
 #define USE_HARDWARE_REVISION_DETECTION
 #define TARGET_CONFIG
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 #define LED0_INVERTED
 
-#define LED1                    PB4
+#define LED1_PIN                PB4
 #define LED1_INVERTED
 
 #define BEEPER                  PA12
diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h
index 5dfa3dca79..93f1e37309 100644
--- a/src/main/target/RCEXPLORERF3/target.h
+++ b/src/main/target/RCEXPLORERF3/target.h
@@ -21,8 +21,8 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0        PB4
-#define LED1        PB5
+#define LED0_PIN    PB4
+#define LED1_PIN    PB5
 
 #define BEEPER      PA0
 #define BEEPER_INVERTED
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 283912fefc..0c3926c7e5 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -48,10 +48,10 @@
 
 #endif
 
-#define LED0                    PB5
+#define LED0_PIN                PB5
 #if defined(PODIUMF4)
-#define LED1                    PB4
-#define LED2                    PB6
+#define LED1_PIN                PB4
+#define LED2_PIN                PB6
 #endif
 
 // Disable LED1, conflicts with AirbotF4/Flip32F4/Revolt beeper
@@ -64,7 +64,7 @@
 #define BEEPER                  PB6
 #define BEEPER_INVERTED
 #else
-#define LED1                    PB4
+#define LED1_PIN                PB4
 // Leave beeper here but with none as io - so disabled unless mapped.
 #define BEEPER                  NONE
 #endif
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 87a9b4008d..67c178b5b4 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -23,8 +23,8 @@
 #define USBD_SERIALNUMBER_STRING "0x8010000"
 #endif
 
-#define LED0                    PC14
-#define LED1                    PC13
+#define LED0_PIN                PC14
+#define LED1_PIN                PC13
 
 #define BEEPER                  PC13
 
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index 73ceb71ace..b83c875a10 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -19,8 +19,8 @@
 
 #define TARGET_BOARD_IDENTIFIER "RGF3" // rgSSD_F3
 
-#define LED0                     PC1
-#define LED1                     PC0
+#define LED0_PIN                 PC1
+#define LED1_PIN                 PC0
 
 #define BEEPER                   PA8
 #define BEEPER_INVERTED
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index 19f51f4d91..34fbef33fa 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -21,7 +21,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 
 #define BEEPER                  PC15
 
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 4f8c84e623..52b68f9cbc 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -19,7 +19,7 @@
 
 #define TARGET_BOARD_IDENTIFIER "SIRF"
 
-#define LED0                    PB2
+#define LED0_PIN                PB2
 #define BEEPER                  PA1
 
 
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index 0d7e768e2d..ef2fb481f0 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -21,8 +21,8 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB4  // Blue (Rev 1 & 2) - PB4
-#define LED1                    PB5  // Green (Rev 1) / Red (Rev 2) - PB5
+#define LED0_PIN                PB4  // Blue (Rev 1 & 2) - PB4
+#define LED1_PIN                PB5  // Green (Rev 1) / Red (Rev 2) - PB5
 
 #define BEEPER                  PA1
 #define BEEPER_INVERTED
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index c7275f34d5..626b10dd2b 100755
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -23,9 +23,9 @@
     #define USBD_SERIALNUMBER_STRING "0x8020000"
 #endif
 
-#define LED0                    PB5
-#define LED1                    PB4
-#define LED2                    PB6
+#define LED0_PIN                PB5
+#define LED1_PIN                PB4
+#define LED2_PIN                PB6
 
 #define BEEPER                  PC9
 #define BEEPER_INVERTED
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 99a0069123..baf48775ea 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -30,11 +30,11 @@
 #if defined(ZCOREF3)
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PB8
+#define LED0_PIN                PB8
 #else
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 #endif
 
 #define BEEPER                  PC15
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index a1e84fe49a..80da46617b 100755
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -46,7 +46,7 @@
 
 #define BRUSHED_ESC_AUTODETECT
 
-#define LED0                    PB8
+#define LED0_PIN                PB8
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index 30536dc657..eefad26999 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -22,7 +22,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PB8
+#define LED0_PIN                PB8
 #else
 #define TARGET_BOARD_IDENTIFIER "SRFM"
 
@@ -32,7 +32,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PB3
+#define LED0_PIN                PB3
 #endif
 
 #define BEEPER                  PC15
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 4fa325d14c..de917c8595 100755
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -22,8 +22,8 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PB9
-#define LED1                    PB2
+#define LED0_PIN                PB9
+#define LED1_PIN                PB2
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/SPRACINGF3OSD/target.h b/src/main/target/SPRACINGF3OSD/target.h
index bd2d30a798..c532c98cf2 100644
--- a/src/main/target/SPRACINGF3OSD/target.h
+++ b/src/main/target/SPRACINGF3OSD/target.h
@@ -22,7 +22,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
-#define LED0                    PA15
+#define LED0_PIN                PA15
 
 #define USE_EXTI
 
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index 33061f23b8..256e1a31c9 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -26,7 +26,7 @@
 
 #define USBD_PRODUCT_STRING     "SP Racing F4 NEO"
 
-#define LED0                    PA0
+#define LED0_PIN                PA0
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index 5007562183..04b18fde14 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -27,16 +27,16 @@
 #define USBD_PRODUCT_STRING                 "SP Racing F4 NEO"
 
 #if (SPRACINGF4NEO_REV >= 3)
-    #define LED0                            PA0
-    #define LED1                            PB1
+    #define LED0_PIN                        PA0
+    #define LED1_PIN                        PB1
 #endif
 #if (SPRACINGF4NEO_REV == 2)
-    #define LED0                            PB9
-    #define LED1                            PB2
+    #define LED0_PIN                        PB9
+    #define LED1_PIN                        PB2
 #endif
 #if (SPRACINGF4NEO_REV == 1)
-    #define LED0                            PB9
-    #define LED1                            PB2
+    #define LED0_PIN                        PB9
+    #define LED1_PIN                        PB2
 #endif
 
 #define BEEPER                              PC15
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index 1bf54b7eaa..460e8c1d94 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -31,9 +31,9 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define LED0                    PE8  // Blue LEDs - PE8/PE12
+#define LED0_PIN                PE8  // Blue LEDs - PE8/PE12
 #define LED0_INVERTED
-#define LED1                    PE10 // Orange LEDs - PE10/PE14
+#define LED1_PIN                PE10 // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
 #define BEEPER                  PD12
diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h
index 423c459f69..dd2706bffa 100644
--- a/src/main/target/TINYFISH/target.h
+++ b/src/main/target/TINYFISH/target.h
@@ -22,8 +22,8 @@
 #define TARGET_BOARD_IDENTIFIER "TFSH" // http://fishpepper.de/projects/tinyFISH
 
 
-#define LED0                    PC14
-#define LED1                    PA13
+#define LED0_PIN                PC14
+#define LED1_PIN                PA13
 
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index ff34683003..5984c6accf 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -22,7 +22,7 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
 
-#define LED0                    PC14
+#define LED0_PIN                PC14
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 5c101ced58..bcb65b557c 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -21,9 +21,9 @@
 
 #define USBD_PRODUCT_STRING     "YupiF4"
 
-#define LED0                    PB6
-#define LED1                    PB4
-#define LED2                    PB5
+#define LED0_PIN                PB6
+#define LED1_PIN                PB4
+#define LED2_PIN                PB5
 
 #define BEEPER                  PC9
 #define BEEPER_PWM_HZ           2200 // Beeper PWM frequency in Hz