diff --git a/src/main/drivers/inverter.c b/src/main/drivers/inverter.c
index c945deb584..27eaddfc3f 100644
--- a/src/main/drivers/inverter.c
+++ b/src/main/drivers/inverter.c
@@ -43,16 +43,16 @@ static void initInverter(ioTag_t ioTag)
 
 void initInverters(void)
 {
-#ifdef INVERTER_PIN_USART1
-    initInverter(IO_TAG(INVERTER_PIN_USART1));
+#ifdef INVERTER_PIN_UART1
+    initInverter(IO_TAG(INVERTER_PIN_UART1));
 #endif
 
-#ifdef INVERTER_PIN_USART2
-    initInverter(IO_TAG(INVERTER_PIN_USART2));
+#ifdef INVERTER_PIN_UART2
+    initInverter(IO_TAG(INVERTER_PIN_UART2));
 #endif
 
-#ifdef INVERTER_PIN_USART3
-    initInverter(IO_TAG(INVERTER_PIN_USART3));
+#ifdef INVERTER_PIN_UART3
+    initInverter(IO_TAG(INVERTER_PIN_UART3));
 #endif
 
 #ifdef INVERTER_PIN_UART4
@@ -63,8 +63,8 @@ void initInverters(void)
     initInverter(IO_TAG(INVERTER_PIN_UART5));
 #endif
 
-#ifdef INVERTER_PIN_USART6
-    initInverter(IO_TAG(INVERTER_PIN_USART6));
+#ifdef INVERTER_PIN_UART6
+    initInverter(IO_TAG(INVERTER_PIN_UART6));
 #endif
 }
 
@@ -73,21 +73,21 @@ void enableInverter(USART_TypeDef *USARTx, bool on)
 #ifdef USE_INVERTER
     IO_t pin = IO_NONE;
 
-#ifdef INVERTER_PIN_USART1
+#ifdef INVERTER_PIN_UART1
     if (USARTx == USART1) {
-        pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART1));
+        pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART1));
     }
 #endif
 
-#ifdef INVERTER_PIN_USART2
+#ifdef INVERTER_PIN_UART2
     if (USARTx == USART2) {
-        pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART2));
+        pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART2));
     }
 #endif
 
-#ifdef INVERTER_PIN_USART3
+#ifdef INVERTER_PIN_UART3
     if (USARTx == USART3) {
-        pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART3));
+        pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART3));
     }
 #endif
 
@@ -103,9 +103,9 @@ void enableInverter(USART_TypeDef *USARTx, bool on)
     }
 #endif
 
-#ifdef INVERTER_PIN_USART6
+#ifdef INVERTER_PIN_UART6
     if (USARTx == USART6) {
-        pin = IOGetByTag(IO_TAG(INVERTER_PIN_USART6));
+        pin = IOGetByTag(IO_TAG(INVERTER_PIN_UART6));
     }
 #endif
 
diff --git a/src/main/drivers/inverter.h b/src/main/drivers/inverter.h
index c20740bb29..b03ce094c3 100644
--- a/src/main/drivers/inverter.h
+++ b/src/main/drivers/inverter.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#if defined(INVERTER_PIN_USART1) || defined(INVERTER_PIN_USART2) || defined(INVERTER_PIN_USART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_USART6)
+#if defined(INVERTER_PIN_UART1) || defined(INVERTER_PIN_UART2) || defined(INVERTER_PIN_UART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_UART6)
 #define USE_INVERTER
 #endif
 
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 9b12a3dd17..e3d230c56f 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -31,7 +31,7 @@
 #define BEEPER                  PC13
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART2     PC15
+#define INVERTER_PIN_UART2      PC15
 
 // MPU interrupt
 #define USE_EXTI
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 86798eae9e..bede921086 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -36,8 +36,8 @@
 #define BEEPER_OPT              PB7
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART6     PB15
-//#define INVERTER_PIN_USART1     PC9
+#define INVERTER_PIN_UART6      PB15
+//#define INVERTER_PIN_UART1     PC9
 
 #define UART1_INVERTER          PC9
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index a5adf65a05..f1d962bed5 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -19,7 +19,7 @@
 
 #define LED0                    PB3
 
-#define INVERTER_PIN_USART1     PB2 // PB2 (BOOT1) used as inverter select GPIO
+#define INVERTER_PIN_UART1      PB2 // PB2 (BOOT1) used as inverter select GPIO
 
 #define BEEPER                  PA15
 #define BEEPER_OPT              PA2
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index 23aeb41045..7d47898118 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -31,7 +31,7 @@
 
 #define BEEPER                  PC5
 
-#define INVERTER_PIN_USART2     PB2 // PB2 used as inverter select GPIO
+#define INVERTER_PIN_UART2      PB2 // PB2 used as inverter select GPIO
 
 #define MPU6000_CS_PIN          PC4
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 75de359bd8..dafe2c9a2d 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -26,7 +26,7 @@
 
 #define BEEPER                  PE5
 
-#define INVERTER_PIN_USART6     PD3
+#define INVERTER_PIN_UART6      PD3
 
 
 
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index 4b936f28cc..4580a07b64 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -27,7 +27,7 @@
 #define BEEPER                  PC15
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART6 PC8
+#define INVERTER_PIN_UART6      PC8
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC4
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 43aed66f0d..4d5c53fc5b 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -27,7 +27,7 @@
 #define BEEPER                  PA8
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART1     PC0 // PC0 used as inverter select GPIO
+#define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
 // MPU6000 interrupts
 #define USE_EXTI
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index 849e484632..d4fcd2e2c2 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -27,7 +27,7 @@
 
 #define BEEPER                  PA8
 
-#define INVERTER_PIN_USART1 PC0 // PC0 used as inverter select GPIO
+#define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
 // MPU6000 interrupts
 #define USE_EXTI
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 9fc3dcad58..ac9550a55c 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -27,7 +27,7 @@
 #define BARO_XCLR_PIN           PC13
 #define BARO_EOC_PIN            PC14
 
-#define INVERTER_PIN_USART2                PB2 // PB2 (BOOT1) abused as inverter select GPIO
+#define INVERTER_PIN_UART2      PB2 // PB2 (BOOT1) abused as inverter select GPIO
 
 #define USE_EXTI
 #define MAG_INT_EXTI            PC14
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 973b01a3d7..2a2d632328 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -45,7 +45,7 @@
 //#define BARO_XCLR_PIN           PC13
 //#define BARO_EOC_PIN            PC14
 
-#define INVERTER_PIN_USART2       PB2 // PB2 (BOOT1) abused as inverter select GPIO
+#define INVERTER_PIN_UART2        PB2 // PB2 (BOOT1) abused as inverter select GPIO
 
 #define USE_EXTI
 #define MAG_INT_EXTI            PC14
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index e6d24758e0..9eea160f0e 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -33,7 +33,7 @@
 #define BEEPER                  PB4
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART1     PC0 // PC0 used as inverter select GPIO
+#define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 6b03f68670..349f6ad655 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -68,7 +68,7 @@
 #endif
 
 // PC0 used as inverter select GPIO
-#define INVERTER_PIN_USART1     PC0
+#define INVERTER_PIN_UART1      PC0
 
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index a32dbf7a37..fadc4b7f32 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -28,7 +28,7 @@
 
 #define BEEPER                  PC13
 
-#define INVERTER_PIN_USART2     PC15 //Sbus on USART 2 of nano.
+#define INVERTER_PIN_UART2      PC15 //Sbus on USART 2 of nano.
 
 #define MPU6500_CS_PIN          PB12
 #define MPU6500_SPI_INSTANCE    SPI2
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index 628a5c92dd..46a7be6dce 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -30,7 +30,7 @@
 #define BEEPER                  PC9
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART6     PC6
+#define INVERTER_PIN_UART6      PC6
 
 #define USE_ESC_SENSOR
 
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 4147a780d6..8c9283f456 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -26,7 +26,7 @@
 #define BEEPER PA0
 #define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART6 PD7
+#define INVERTER_PIN_UART6 PD7
 
 #define MPU6500_CS_PIN        PE10
 #define MPU6500_SPI_INSTANCE  SPI2
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index fa65750add..17e04007b2 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -27,8 +27,7 @@
 #define BEEPER                  PC9
 //#define BEEPER_INVERTED
 
-#define INVERTER_PIN_USART6     PB15
-
+#define INVERTER_PIN_UART6      PB15
 
 // Gyro interrupt
 #define USE_EXTI