diff --git a/src/main/config/config.c b/src/main/config/config.c
index 003b7c32a..3d15e233e 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -835,7 +835,7 @@ void validateAndFixConfig(void)
     }
 #endif
 
-#if defined(CC3D) && defined(DISPLAY) && defined(USE_USART3)
+#if defined(CC3D) && defined(DISPLAY) && defined(USE_UART3)
     if (doesConfigurationUsePort(SERIAL_PORT_USART3) && feature(FEATURE_DISPLAY)) {
         featureClear(FEATURE_DISPLAY);
     }
diff --git a/src/main/drivers/pwm_mapping.c b/src/main/drivers/pwm_mapping.c
index 1cf9cd948..2636b6135 100755
--- a/src/main/drivers/pwm_mapping.c
+++ b/src/main/drivers/pwm_mapping.c
@@ -132,7 +132,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
             continue;
 #endif
 
-#if defined(STM32F303xC) && defined(USE_USART3)
+#if defined(STM32F303xC) && defined(USE_UART3)
         // skip UART3 ports (PB10/PB11)
         if (init->useUART3 && (timerHardwarePtr->tag == IO_TAG(UART3_TX_PIN) || timerHardwarePtr->tag == IO_TAG(UART3_RX_PIN)))
             continue;
diff --git a/src/main/drivers/serial_uart.c b/src/main/drivers/serial_uart.c
index 8a7999bea..3bee96b89 100644
--- a/src/main/drivers/serial_uart.c
+++ b/src/main/drivers/serial_uart.c
@@ -99,26 +99,26 @@ serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback,
     uartPort_t *s = NULL;
 
     if (USARTx == USART1) {
-        s = serialUSART1(baudRate, mode, options);
-#ifdef USE_USART2
+        s = serialUART1(baudRate, mode, options);
+#ifdef USE_UART2
     } else if (USARTx == USART2) {
-        s = serialUSART2(baudRate, mode, options);
+        s = serialUART2(baudRate, mode, options);
 #endif
-#ifdef USE_USART3
+#ifdef USE_UART3
     } else if (USARTx == USART3) {
-        s = serialUSART3(baudRate, mode, options);
+        s = serialUART3(baudRate, mode, options);
 #endif
-#ifdef USE_USART4
+#ifdef USE_UART4
     } else if (USARTx == UART4) {
-        s = serialUSART4(baudRate, mode, options);
+        s = serialUART4(baudRate, mode, options);
 #endif
-#ifdef USE_USART5
+#ifdef USE_UART5
     } else if (USARTx == UART5) {
-        s = serialUSART5(baudRate, mode, options);
+        s = serialUART5(baudRate, mode, options);
 #endif
-#ifdef USE_USART6
+#ifdef USE_UART6
     } else if (USARTx == USART6) {
-        s = serialUSART6(baudRate, mode, options);
+        s = serialUART6(baudRate, mode, options);
 #endif
 
     } else {
diff --git a/src/main/drivers/serial_uart_impl.h b/src/main/drivers/serial_uart_impl.h
index 5b0c2b3e0..a4549de34 100644
--- a/src/main/drivers/serial_uart_impl.h
+++ b/src/main/drivers/serial_uart_impl.h
@@ -23,10 +23,10 @@ extern const struct serialPortVTable uartVTable[];
 
 void uartStartTxDMA(uartPort_t *s);
 
-uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t options);
-uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t options);
-uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t options);
-uartPort_t *serialUSART4(uint32_t baudRate, portMode_t mode, portOptions_t options);
-uartPort_t *serialUSART5(uint32_t baudRate, portMode_t mode, portOptions_t options);
-uartPort_t *serialUSART6(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART1(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART2(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART3(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART4(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART5(uint32_t baudRate, portMode_t mode, portOptions_t options);
+uartPort_t *serialUART6(uint32_t baudRate, portMode_t mode, portOptions_t options);
 
diff --git a/src/main/drivers/serial_uart_stm32f10x.c b/src/main/drivers/serial_uart_stm32f10x.c
index 473689a8b..f804b7dea 100644
--- a/src/main/drivers/serial_uart_stm32f10x.c
+++ b/src/main/drivers/serial_uart_stm32f10x.c
@@ -37,19 +37,19 @@
 #include "serial_uart.h"
 #include "serial_uart_impl.h"
 
-#ifdef USE_USART1
+#ifdef USE_UART1
 static uartPort_t uartPort1;
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 static uartPort_t uartPort2;
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 static uartPort_t uartPort3;
 #endif
 
-void usartIrqCallback(uartPort_t *s)
+void uartIrqCallback(uartPort_t *s)
 {
     uint16_t SR = s->USARTx->SR;
 
@@ -76,9 +76,9 @@ void usartIrqCallback(uartPort_t *s)
     }
 }
 
-#ifdef USE_USART1
+#ifdef USE_UART1
 // USART1 - Telemetry (RX/TX by DMA)
-uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx1Buffer[UART1_RX_BUFFER_SIZE];
@@ -99,7 +99,7 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
     s->USARTx = USART1;
 
 
-#ifdef USE_USART1_RX_DMA
+#ifdef USE_UART1_RX_DMA
     s->rxDMAChannel = DMA1_Channel5;
     s->rxDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->DR;
 #endif
@@ -109,8 +109,8 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
     RCC_ClockCmd(RCC_APB2(USART1), ENABLE);
     RCC_ClockCmd(RCC_AHB(DMA1), ENABLE);
 
-    // USART1_TX    PA9
-    // USART1_RX    PA10
+    // UART1_TX    PA9
+    // UART1_RX    PA10
     if (options & SERIAL_BIDIR) {
         IOInit(IOGetByTag(IO_TAG(PA9)), OWNER_SERIAL_RXTX, RESOURCE_USART);
         IOConfigGPIO(IOGetByTag(IO_TAG(PA9)), IOCFG_AF_OD);
@@ -133,7 +133,7 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);
 
-#ifndef USE_USART1_RX_DMA
+#ifndef USE_UART1_RX_DMA
     // RX/TX Interrupt
     NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART1);
@@ -162,14 +162,14 @@ void DMA1_Channel4_IRQHandler(void)
 void USART1_IRQHandler(void)
 {
     uartPort_t *s = &uartPort1;
-    usartIrqCallback(s);
+    uartIrqCallback(s);
 }
 
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 // USART2 - GPS or Spektrum or ?? (RX + TX by IRQ)
-uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx2Buffer[UART2_RX_BUFFER_SIZE];
@@ -195,8 +195,8 @@ uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t optio
     RCC_ClockCmd(RCC_APB1(USART2), ENABLE);
     RCC_ClockCmd(RCC_AHB(DMA1), ENABLE);
 
-    // USART2_TX    PA2
-    // USART2_RX    PA3
+    // UART2_TX    PA2
+    // UART2_RX    PA3
     if (options & SERIAL_BIDIR) {
         IOInit(IOGetByTag(IO_TAG(PA2)), OWNER_SERIAL_RXTX, RESOURCE_USART);
         IOConfigGPIO(IOGetByTag(IO_TAG(PA2)), IOCFG_AF_OD);
@@ -227,14 +227,14 @@ uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t optio
 void USART2_IRQHandler(void)
 {
     uartPort_t *s = &uartPort2;
-    usartIrqCallback(s);
+    uartIrqCallback(s);
 }
 
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 // USART3
-uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx3Buffer[UART3_RX_BUFFER_SIZE];
@@ -260,17 +260,17 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t optio
     RCC_ClockCmd(RCC_APB1(USART3), ENABLE);
 
     if (options & SERIAL_BIDIR) {
-        IOInit(IOGetByTag(IO_TAG(USART3_TX_PIN)), OWNER_SERIAL_RXTX, RESOURCE_USART);
-        IOConfigGPIO(IOGetByTag(IO_TAG(USART3_TX_PIN)), IOCFG_AF_OD);
+        IOInit(IOGetByTag(IO_TAG(UART3_TX_PIN)), OWNER_SERIAL_RXTX, RESOURCE_USART);
+        IOConfigGPIO(IOGetByTag(IO_TAG(UART3_TX_PIN)), IOCFG_AF_OD);
     } else {
         if (mode & MODE_TX) {
-            IOInit(IOGetByTag(IO_TAG(USART3_TX_PIN)), OWNER_SERIAL_TX, RESOURCE_USART);
-            IOConfigGPIO(IOGetByTag(IO_TAG(USART3_TX_PIN)), IOCFG_AF_PP);
+            IOInit(IOGetByTag(IO_TAG(UART3_TX_PIN)), OWNER_SERIAL_TX, RESOURCE_USART);
+            IOConfigGPIO(IOGetByTag(IO_TAG(UART3_TX_PIN)), IOCFG_AF_PP);
         }
 
         if (mode & MODE_RX) {
-            IOInit(IOGetByTag(IO_TAG(USART3_RX_PIN)), OWNER_SERIAL_RX, RESOURCE_USART);
-            IOConfigGPIO(IOGetByTag(IO_TAG(USART3_RX_PIN)), IOCFG_IPU);
+            IOInit(IOGetByTag(IO_TAG(UART3_RX_PIN)), OWNER_SERIAL_RX, RESOURCE_USART);
+            IOConfigGPIO(IOGetByTag(IO_TAG(UART3_RX_PIN)), IOCFG_IPU);
         }
     }
 
@@ -288,6 +288,6 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t optio
 void USART3_IRQHandler(void)
 {
     uartPort_t *s = &uartPort3;
-    usartIrqCallback(s);
+    uartIrqCallback(s);
 }
 #endif
diff --git a/src/main/drivers/serial_uart_stm32f30x.c b/src/main/drivers/serial_uart_stm32f30x.c
index f8c0c5789..dae0f1655 100644
--- a/src/main/drivers/serial_uart_stm32f30x.c
+++ b/src/main/drivers/serial_uart_stm32f30x.c
@@ -38,7 +38,7 @@
 #include "serial_uart.h"
 #include "serial_uart_impl.h"
 
-#ifdef USE_USART1
+#ifdef USE_UART1
 #ifndef UART1_TX_PIN
 #define UART1_TX_PIN        PA9  // PA9
 #endif
@@ -47,7 +47,7 @@
 #endif
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 #ifndef UART2_TX_PIN
 #define UART2_TX_PIN        PD5 // PD5
 #endif
@@ -56,7 +56,7 @@
 #endif
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 #ifndef UART3_TX_PIN
 #define UART3_TX_PIN        PB10 // PB10 (AF7)
 #endif
@@ -65,7 +65,7 @@
 #endif
 #endif
 
-#ifdef USE_USART4
+#ifdef USE_UART4
 #ifndef UART4_TX_PIN
 #define UART4_TX_PIN        PC10 // PC10 (AF5)
 #endif
@@ -74,7 +74,7 @@
 #endif
 #endif
 
-#ifdef USE_USART5
+#ifdef USE_UART5
 #ifndef UART5_TX_PIN             // The real UART5_RX is on PD2, no board is using.
 #define UART5_TX_PIN        PC12 // PC12 (AF5)
 #endif
@@ -83,19 +83,19 @@
 #endif
 #endif
 
-#ifdef USE_USART1
+#ifdef USE_UART1
 static uartPort_t uartPort1;
 #endif
-#ifdef USE_USART2
+#ifdef USE_UART2
 static uartPort_t uartPort2;
 #endif
-#ifdef USE_USART3
+#ifdef USE_UART3
 static uartPort_t uartPort3;
 #endif
-#ifdef USE_USART4
+#ifdef USE_UART4
 static uartPort_t uartPort4;
 #endif
-#ifdef USE_USART5
+#ifdef USE_UART5
 static uartPort_t uartPort5;
 #endif
 
@@ -126,8 +126,8 @@ void serialUARTInit(IO_t tx, IO_t rx, portMode_t mode, portOptions_t options, ui
     }
 }
 
-#ifdef USE_USART1
-uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART1
+uartPort_t *serialUART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx1Buffer[UART1_RX_BUFFER_SIZE];
@@ -144,7 +144,7 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
     s->port.rxBufferSize = UART1_RX_BUFFER_SIZE;
     s->port.txBufferSize = UART1_TX_BUFFER_SIZE;
     
-#ifdef USE_USART1_RX_DMA
+#ifdef USE_UART1_RX_DMA
     s->rxDMAChannel = DMA1_Channel5;
 #endif
     s->txDMAChannel = DMA1_Channel4;
@@ -166,7 +166,7 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);
 
-#ifndef USE_USART1_RX_DMA
+#ifndef USE_UART1_RX_DMA
     NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART1_RXDMA);
     NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(NVIC_PRIO_SERIALUART1_RXDMA);
@@ -178,8 +178,8 @@ uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t optio
 }
 #endif
 
-#ifdef USE_USART2
-uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART2
+uartPort_t *serialUART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx2Buffer[UART2_RX_BUFFER_SIZE];
@@ -198,24 +198,24 @@ uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t optio
 
     s->USARTx = USART2;
     
-#ifdef USE_USART2_RX_DMA
+#ifdef USE_UART2_RX_DMA
     s->rxDMAChannel = DMA1_Channel6;
     s->rxDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->RDR;
 #endif
-#ifdef USE_USART2_TX_DMA
+#ifdef USE_UART2_TX_DMA
     s->txDMAChannel = DMA1_Channel7;
     s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->TDR;
 #endif
 
     RCC_ClockCmd(RCC_APB1(USART2), ENABLE);
 
-#if defined(USE_USART2_TX_DMA) || defined(USE_USART2_RX_DMA)
+#if defined(USE_UART2_TX_DMA) || defined(USE_UART2_RX_DMA)
     RCC_ClockCmd(RCC_AHB(DMA1), ENABLE);
 #endif
 
     serialUARTInit(IOGetByTag(IO_TAG(UART2_TX_PIN)), IOGetByTag(IO_TAG(UART2_RX_PIN)), mode, options, GPIO_AF_7);
 
-#ifdef USE_USART2_TX_DMA
+#ifdef USE_UART2_TX_DMA
     // DMA TX Interrupt
     NVIC_InitStructure.NVIC_IRQChannel = DMA1_Channel7_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART2_TXDMA);
@@ -224,7 +224,7 @@ uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t optio
     NVIC_Init(&NVIC_InitStructure);
 #endif
 
-#ifndef USE_USART2_RX_DMA
+#ifndef USE_UART2_RX_DMA
     NVIC_InitStructure.NVIC_IRQChannel = USART2_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART2_RXDMA);
     NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(NVIC_PRIO_SERIALUART2_RXDMA);
@@ -236,8 +236,8 @@ uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t optio
 }
 #endif
 
-#ifdef USE_USART3
-uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART3
+uartPort_t *serialUART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx3Buffer[UART3_RX_BUFFER_SIZE];
@@ -256,24 +256,24 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t optio
 
     s->USARTx = USART3;
 
-#ifdef USE_USART3_RX_DMA
+#ifdef USE_UART3_RX_DMA
     s->rxDMAChannel = DMA1_Channel3;
     s->rxDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->RDR;
 #endif
-#ifdef USE_USART3_TX_DMA
+#ifdef USE_UART3_TX_DMA
     s->txDMAChannel = DMA1_Channel2;
     s->txDMAPeripheralBaseAddr = (uint32_t)&s->USARTx->TDR;
 #endif
 
     RCC_ClockCmd(RCC_APB1(USART3), ENABLE);
 
-#if defined(USE_USART3_TX_DMA) || defined(USE_USART3_RX_DMA)
+#if defined(USE_UART3_TX_DMA) || defined(USE_UART3_RX_DMA)
     RCC_AHBClockCmd(RCC_AHB(DMA1), ENABLE);
 #endif
 
     serialUARTInit(IOGetByTag(IO_TAG(UART3_TX_PIN)), IOGetByTag(IO_TAG(UART3_RX_PIN)), mode, options, GPIO_AF_7);
 
-#ifdef USE_USART3_TX_DMA
+#ifdef USE_UART3_TX_DMA
     // DMA TX Interrupt
     NVIC_InitStructure.NVIC_IRQChannel = DMA1_Channel2_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART3_TXDMA);
@@ -282,7 +282,7 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t optio
     NVIC_Init(&NVIC_InitStructure);
 #endif
 
-#ifndef USE_USART3_RX_DMA
+#ifndef USE_UART3_RX_DMA
     NVIC_InitStructure.NVIC_IRQChannel = USART3_IRQn;
     NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(NVIC_PRIO_SERIALUART3_RXDMA);
     NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(NVIC_PRIO_SERIALUART3_RXDMA);
@@ -294,8 +294,8 @@ uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t optio
 }
 #endif
 
-#ifdef USE_USART4
-uartPort_t *serialUSART4(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART4
+uartPort_t *serialUART4(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx4Buffer[UART4_RX_BUFFER_SIZE];
@@ -328,8 +328,8 @@ uartPort_t *serialUSART4(uint32_t baudRate, portMode_t mode, portOptions_t optio
 }
 #endif
 
-#ifdef USE_USART5
-uartPort_t *serialUSART5(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART5
+uartPort_t *serialUART5(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     static volatile uint8_t rx5Buffer[UART5_RX_BUFFER_SIZE];
@@ -381,7 +381,7 @@ void DMA1_Channel4_IRQHandler(void)
     handleUsartTxDma(s);
 }
 
-#ifdef USE_USART2_TX_DMA
+#ifdef USE_UART2_TX_DMA
 // USART2 Tx DMA Handler
 void DMA1_Channel7_IRQHandler(void)
 {
@@ -393,7 +393,7 @@ void DMA1_Channel7_IRQHandler(void)
 #endif
 
 // USART3 Tx DMA Handler
-#ifdef USE_USART3_TX_DMA
+#ifdef USE_UART3_TX_DMA
 void DMA1_Channel2_IRQHandler(void)
 {
     uartPort_t *s = &uartPort3;
@@ -436,7 +436,7 @@ void usartIrqHandler(uartPort_t *s)
     }
 }
 
-#ifdef USE_USART1
+#ifdef USE_UART1
 void USART1_IRQHandler(void)
 {
     uartPort_t *s = &uartPort1;
@@ -445,7 +445,7 @@ void USART1_IRQHandler(void)
 }
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 void USART2_IRQHandler(void)
 {
     uartPort_t *s = &uartPort2;
@@ -454,7 +454,7 @@ void USART2_IRQHandler(void)
 }
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 void USART3_IRQHandler(void)
 {
     uartPort_t *s = &uartPort3;
@@ -463,7 +463,7 @@ void USART3_IRQHandler(void)
 }
 #endif
 
-#ifdef USE_USART4
+#ifdef USE_UART4
 void UART4_IRQHandler(void)
 {
     uartPort_t *s = &uartPort4;
@@ -472,7 +472,7 @@ void UART4_IRQHandler(void)
 }
 #endif
 
-#ifdef USE_USART5
+#ifdef USE_UART5
 void UART5_IRQHandler(void)
 {
     uartPort_t *s = &uartPort5;
diff --git a/src/main/drivers/serial_uart_stm32f4xx.c b/src/main/drivers/serial_uart_stm32f4xx.c
index f5bba8469..9bac1ceee 100644
--- a/src/main/drivers/serial_uart_stm32f4xx.c
+++ b/src/main/drivers/serial_uart_stm32f4xx.c
@@ -30,14 +30,6 @@
 #include "serial_uart.h"
 #include "serial_uart_impl.h"
 
-// Using RX DMA disables the use of receive callbacks
-//#define USE_USART1_RX_DMA
-//#define USE_USART2_RX_DMA
-//#define USE_USART3_RX_DMA
-//#define USE_USART4_RX_DMA
-//#define USE_USART5_RX_DMA
-//#define USE_USART6_RX_DMA
-
 #define UART_RX_BUFFER_SIZE UART1_RX_BUFFER_SIZE
 #define UART_TX_BUFFER_SIZE UART1_TX_BUFFER_SIZE
 
@@ -71,20 +63,20 @@ typedef struct uartDevice_s {
 } uartDevice_t;
 
 //static uartPort_t uartPort[MAX_UARTS];
-#ifdef USE_USART1
+#ifdef USE_UART1
 static uartDevice_t uart1 = 
 { 
     .DMAChannel = DMA_Channel_4,
     .txDMAStream = DMA2_Stream7,
-#ifdef USE_USART1_RX_DMA
+#ifdef USE_UART1_RX_DMA
     .rxDMAStream = DMA2_Stream5,
 #endif
     .dev = USART1, 
-    .rx = IO_TAG(USART1_RX_PIN), 
-    .tx = IO_TAG(USART1_TX_PIN), 
+    .rx = IO_TAG(UART1_RX_PIN), 
+    .tx = IO_TAG(UART1_TX_PIN), 
     .af = GPIO_AF_USART1, 
-#ifdef USART1_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART1_AHB1_PERIPHERALS,
+#ifdef UART1_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART1_AHB1_PERIPHERALS,
 #endif
     .rcc_apb2 = RCC_APB2(USART1),
     .txIrq = DMA2_Stream7_IRQn,
@@ -94,20 +86,20 @@ static uartDevice_t uart1 =
 };
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 static uartDevice_t uart2 = 
 { 
     .DMAChannel = DMA_Channel_4,
-#ifdef USE_USART2_RX_DMA
+#ifdef USE_UART2_RX_DMA
     .rxDMAStream = DMA1_Stream5,
 #endif
     .txDMAStream = DMA1_Stream6,
     .dev = USART2, 
-    .rx = IO_TAG(USART2_RX_PIN), 
-    .tx = IO_TAG(USART2_TX_PIN), 
+    .rx = IO_TAG(UART2_RX_PIN), 
+    .tx = IO_TAG(UART2_TX_PIN), 
     .af = GPIO_AF_USART2, 
-#ifdef USART2_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART2_AHB1_PERIPHERALS,
+#ifdef UART2_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART2_AHB1_PERIPHERALS,
 #endif
     .rcc_apb1 = RCC_APB1(USART2),
     .txIrq = DMA1_Stream6_IRQn,
@@ -117,20 +109,20 @@ static uartDevice_t uart2 =
 };
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 static uartDevice_t uart3 = 
 { 
     .DMAChannel = DMA_Channel_4,
-#ifdef USE_USART3_RX_DMA
+#ifdef USE_UART3_RX_DMA
     .rxDMAStream = DMA1_Stream1,
 #endif
     .txDMAStream = DMA1_Stream3,
     .dev = USART3, 
-    .rx = IO_TAG(USART3_RX_PIN), 
-    .tx = IO_TAG(USART3_TX_PIN), 
+    .rx = IO_TAG(UART3_RX_PIN), 
+    .tx = IO_TAG(UART3_TX_PIN), 
     .af = GPIO_AF_USART3, 
-#ifdef USART3_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART3_AHB1_PERIPHERALS,
+#ifdef UART3_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART3_AHB1_PERIPHERALS,
 #endif
     .rcc_apb1 = RCC_APB1(USART3),
     .txIrq = DMA1_Stream3_IRQn,
@@ -140,20 +132,20 @@ static uartDevice_t uart3 =
 };
 #endif
 
-#ifdef USE_USART4
+#ifdef USE_UART4
 static uartDevice_t uart4 = 
 { 
     .DMAChannel = DMA_Channel_4,
-#ifdef USE_USART1_RX_DMA
+#ifdef USE_UART1_RX_DMA
     .rxDMAStream = DMA1_Stream2,
 #endif
     .txDMAStream = DMA1_Stream4,
     .dev = UART4, 
-    .rx = IO_TAG(USART4_RX_PIN), 
-    .tx = IO_TAG(USART4_TX_PIN), 
+    .rx = IO_TAG(UART4_RX_PIN), 
+    .tx = IO_TAG(UART4_TX_PIN), 
     .af = GPIO_AF_UART4, 
-#ifdef USART4_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART4_AHB1_PERIPHERALS,
+#ifdef UART4_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART4_AHB1_PERIPHERALS,
 #endif
     .rcc_apb1 = RCC_APB1(UART4),
     .txIrq = DMA1_Stream4_IRQn,
@@ -163,20 +155,20 @@ static uartDevice_t uart4 =
 };
 #endif
 
-#ifdef USE_USART5
+#ifdef USE_UART5
 static uartDevice_t uart5 = 
 { 
     .DMAChannel = DMA_Channel_4,
-#ifdef USE_USART1_RX_DMA
+#ifdef USE_UART1_RX_DMA
     .rxDMAStream = DMA1_Stream0,
 #endif
     .txDMAStream = DMA2_Stream7,
     .dev = UART5, 
-    .rx = IO_TAG(USART5_RX_PIN), 
-    .tx = IO_TAG(USART5_TX_PIN), 
+    .rx = IO_TAG(UART5_RX_PIN), 
+    .tx = IO_TAG(UART5_TX_PIN), 
     .af = GPIO_AF_UART5, 
-#ifdef USART5_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART5_AHB1_PERIPHERALS,
+#ifdef UART5_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART5_AHB1_PERIPHERALS,
 #endif
     .rcc_apb1 = RCC_APB1(UART5),
     .txIrq = DMA2_Stream7_IRQn,
@@ -186,20 +178,20 @@ static uartDevice_t uart5 =
 };
 #endif
 
-#ifdef USE_USART6
+#ifdef USE_UART6
 static uartDevice_t uart6 = 
 { 
     .DMAChannel = DMA_Channel_5,
-#ifdef USE_USART6_RX_DMA
+#ifdef USE_UART6_RX_DMA
     .rxDMAStream = DMA2_Stream1,
 #endif
     .txDMAStream = DMA2_Stream6,
     .dev = USART6, 
-    .rx = IO_TAG(USART6_RX_PIN), 
-    .tx = IO_TAG(USART6_TX_PIN), 
+    .rx = IO_TAG(UART6_RX_PIN), 
+    .tx = IO_TAG(UART6_TX_PIN), 
     .af = GPIO_AF_USART6, 
-#ifdef USART6_AHB1_PERIPHERALS
-    .rcc_ahb1 = USART6_AHB1_PERIPHERALS,
+#ifdef UART6_AHB1_PERIPHERALS
+    .rcc_ahb1 = UART6_AHB1_PERIPHERALS,
 #endif
     .rcc_apb2 = RCC_APB2(USART6),
     .txIrq = DMA2_Stream6_IRQn,
@@ -210,39 +202,39 @@ static uartDevice_t uart6 =
 #endif
 
 static uartDevice_t* uartHardwareMap[] = {
-#ifdef USE_USART1
+#ifdef USE_UART1
     &uart1,
 #else
     NULL,
 #endif
-#ifdef USE_USART2
+#ifdef USE_UART2
     &uart2,
 #else
     NULL,
 #endif
-#ifdef USE_USART3
+#ifdef USE_UART3
     &uart3,
 #else
     NULL,
 #endif
-#ifdef USE_USART4
+#ifdef USE_UART4
     &uart4,
 #else
     NULL,
 #endif
-#ifdef USE_USART5
+#ifdef USE_UART5
     &uart5,
 #else
     NULL,
 #endif
-#ifdef USE_USART6
+#ifdef USE_UART6
     &uart6,
 #else
     NULL,
 #endif
     };
 
-void usartIrqHandler(uartPort_t *s)
+void uartIrqHandler(uartPort_t *s)
 {
     if (!s->rxDMAStream && (USART_GetITStatus(s->USARTx, USART_IT_RXNE) == SET)) {
         if (s->port.callback) {
@@ -278,7 +270,7 @@ static void handleUsartTxDma(uartPort_t *s)
         s->txDMAEmpty = true;
 }
 
-uartPort_t *serialUSART(UARTDevice device, uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART(UARTDevice device, uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
     uartPort_t *s;
     NVIC_InitTypeDef NVIC_InitStructure;
@@ -353,10 +345,10 @@ uartPort_t *serialUSART(UARTDevice device, uint32_t baudRate, portMode_t mode, p
     return s;
 }
 
-#ifdef USE_USART1
-uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
+#ifdef USE_UART1
+uartPort_t *serialUART1(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_1, baudRate, mode, options);
+    return serialUART(UARTDEV_1, baudRate, mode, options);
 }
 
 // USART1 Tx DMA Handler
@@ -387,15 +379,15 @@ void DMA2_Stream7_IRQHandler(void)
 void USART1_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_1]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
 
-#ifdef USE_USART2
+#ifdef USE_UART2
 // USART2 - GPS or Spektrum or ?? (RX + TX by IRQ)
-uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART2(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_2, baudRate, mode, options);
+    return serialUART(UARTDEV_2, baudRate, mode, options);
 }
 
 // USART2 Tx DMA Handler
@@ -425,15 +417,15 @@ void DMA1_Stream6_IRQHandler(void)
 void USART2_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_2]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
 
-#ifdef USE_USART3
+#ifdef USE_UART3
 // USART3
-uartPort_t *serialUSART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART3(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_3, baudRate, mode, options);
+    return serialUART(UARTDEV_3, baudRate, mode, options);
 }
 
 // USART3 Tx DMA Handler
@@ -463,15 +455,15 @@ void DMA1_Stream3_IRQHandler(void)
 void USART3_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_3]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
 
-#ifdef USE_USART4
+#ifdef USE_UART4
 // USART4
-uartPort_t *serialUSART4(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART4(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_4, baudRate, mode, options);
+    return serialUART(UARTDEV_4, baudRate, mode, options);
 }
 
 // USART4 Tx DMA Handler
@@ -501,15 +493,15 @@ void DMA1_Stream4_IRQHandler(void)
 void UART4_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_4]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
 
-#ifdef USE_USART5
+#ifdef USE_UART5
 // USART5
-uartPort_t *serialUSART5(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART5(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_5, baudRate, mode, options);
+    return serialUART(UARTDEV_5, baudRate, mode, options);
 }
 
 // USART5 Tx DMA Handler
@@ -539,15 +531,15 @@ void DMA1_Stream7_IRQHandler(void)
 void UART5_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_5]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
 
-#ifdef USE_USART6
+#ifdef USE_UART6
 // USART6
-uartPort_t *serialUSART6(uint32_t baudRate, portMode_t mode, portOptions_t options)
+uartPort_t *serialUART6(uint32_t baudRate, portMode_t mode, portOptions_t options)
 {
-    return serialUSART(UARTDEV_6, baudRate, mode, options);
+    return serialUART(UARTDEV_6, baudRate, mode, options);
 }
 
 // USART6 Tx DMA Handler
@@ -577,6 +569,6 @@ void DMA2_Stream6_IRQHandler(void)
 void USART6_IRQHandler(void)
 {
     uartPort_t *s = &(uartHardwareMap[UARTDEV_6]->port);
-    usartIrqHandler(s);
+    uartIrqHandler(s);
 }
 #endif
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 6fbdad7c0..be6372b47 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -32,7 +32,7 @@
 #include "drivers/serial_softserial.h"
 #endif
 
-#if defined(USE_USART1) || defined(USE_USART2) || defined(USE_USART3) || defined(USE_USART4) || defined(USE_USART5) || defined(USE_USART6)
+#if defined(USE_UART1) || defined(USE_UART2) || defined(USE_UART3) || defined(USE_UART4) || defined(USE_UART5) || defined(USE_UART6)
 #include "drivers/serial_uart.h"
 #endif
 
@@ -60,22 +60,22 @@ const serialPortIdentifier_e serialPortIdentifiers[SERIAL_PORT_COUNT] = {
 #ifdef USE_VCP
     SERIAL_PORT_USB_VCP,
 #endif
-#ifdef USE_USART1
+#ifdef USE_UART1
     SERIAL_PORT_USART1,
 #endif
-#ifdef USE_USART2
+#ifdef USE_UART2
     SERIAL_PORT_USART2,
 #endif
-#ifdef USE_USART3
+#ifdef USE_UART3
     SERIAL_PORT_USART3,
 #endif
-#ifdef USE_USART4
+#ifdef USE_UART4
     SERIAL_PORT_USART4,
 #endif
-#ifdef USE_USART5
+#ifdef USE_UART5
     SERIAL_PORT_USART5,
 #endif
-#ifdef USE_USART6
+#ifdef USE_UART6
     SERIAL_PORT_USART6,
 #endif
 #ifdef USE_SOFTSERIAL1
@@ -273,7 +273,7 @@ serialPort_t *openSerialPort(
     portMode_t mode,
     portOptions_t options)
 {
-#if (!defined(USE_VCP) && !defined(USE_USART1) && !defined(USE_USART2) && !defined(USE_USART3) && !defined(USE_SOFTSERIAL1) && !defined(USE_SOFTSERIAL1))
+#if (!defined(USE_VCP) && !defined(USE_UART1) && !defined(USE_UART2) && !defined(USE_UART3) && !defined(USE_SOFTSERIAL1) && !defined(USE_SOFTSERIAL1))
     UNUSED(callback);
     UNUSED(baudRate);
     UNUSED(mode);
@@ -294,32 +294,32 @@ serialPort_t *openSerialPort(
             serialPort = usbVcpOpen();
             break;
 #endif
-#ifdef USE_USART1
+#ifdef USE_UART1
         case SERIAL_PORT_USART1:
             serialPort = uartOpen(USART1, callback, baudRate, mode, options);
             break;
 #endif
-#ifdef USE_USART2
+#ifdef USE_UART2
         case SERIAL_PORT_USART2:
             serialPort = uartOpen(USART2, callback, baudRate, mode, options);
             break;
 #endif
-#ifdef USE_USART3
+#ifdef USE_UART3
         case SERIAL_PORT_USART3:
             serialPort = uartOpen(USART3, callback, baudRate, mode, options);
             break;
 #endif
-#ifdef USE_USART4
+#ifdef USE_UART4
     case SERIAL_PORT_USART4:
         serialPort = uartOpen(UART4, callback, baudRate, mode, options);
         break;
 #endif
-#ifdef USE_USART5
+#ifdef USE_UART5
     case SERIAL_PORT_USART5:
         serialPort = uartOpen(UART5, callback, baudRate, mode, options);
         break;
 #endif
-#ifdef USE_USART6
+#ifdef USE_UART6
     case SERIAL_PORT_USART6:
         serialPort = uartOpen(USART6, callback, baudRate, mode, options);
         break;
diff --git a/src/main/main.c b/src/main/main.c
index 1d94e9657..455d4b260 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -275,16 +275,16 @@ void init(void)
         pwm_params.airplane = true;
     else
         pwm_params.airplane = false;
-#if defined(USE_USART2) && defined(STM32F10X)
+#if defined(USE_UART2) && defined(STM32F10X)
     pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2);
 #endif
 #ifdef STM32F303xC
     pwm_params.useUART3 = doesConfigurationUsePort(SERIAL_PORT_USART3);
 #endif
-#if defined(USE_USART2) && defined(STM32F40_41xxx)
+#if defined(USE_UART2) && defined(STM32F40_41xxx)
     pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2);
 #endif
-#if defined(USE_USART6) && defined(STM32F40_41xxx)
+#if defined(USE_UART6) && defined(STM32F40_41xxx)
     pwm_params.useUART6 = doesConfigurationUsePort(SERIAL_PORT_USART6);
 #endif    
     pwm_params.useVbat = feature(FEATURE_VBAT);
diff --git a/src/main/target/ALIENFLIGHTF3/target.c b/src/main/target/ALIENFLIGHTF3/target.c
index 57fc41763..2ced9687a 100644
--- a/src/main/target/ALIENFLIGHTF3/target.c
+++ b/src/main/target/ALIENFLIGHTF3/target.c
@@ -84,7 +84,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
 
     // USART3 RX/TX
     // RX conflicts with PPM port
-    //{ TIM2,  GPIOB, Pin_11, TIM_Channel_4, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_PinSource11,  GPIO_AF_1 } // RX    - PB11 - *TIM2_CH4, USART3_RX (AF7) - PWM11
-    //{ TIM2,  GPIOB, Pin_10, TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_PinSource10,  GPIO_AF_1 } // TX    - PB10 - *TIM2_CH3, USART3_TX (AF7) - PWM12
+    //{ TIM2,  GPIOB, Pin_11, TIM_Channel_4, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_PinSource11,  GPIO_AF_1 } // RX    - PB11 - *TIM2_CH4, UART3_RX (AF7) - PWM11
+    //{ TIM2,  GPIOB, Pin_10, TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_PinSource10,  GPIO_AF_1 } // TX    - PB10 - *TIM2_CH3, UART3_TX (AF7) - PWM12
 };
 
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index 286cfe9a4..b05cdb33a 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -69,9 +69,9 @@
 #define MAG_AK8963_ALIGN CW0_DEG_FLIP
 
 #define USE_VCP
-#define USE_USART1 // Not connected - TX (PB6) RX PB7 (AF7)
-#define USE_USART2 // Receiver - RX (PA3)
-#define USE_USART3 // Not connected - 10/RX (PB11) 11/TX (PB10)
+#define USE_UART1 // Not connected - TX (PB6) RX PB7 (AF7)
+#define USE_UART2 // Receiver - RX (PA3)
+#define USE_UART3 // Not connected - 10/RX (PB11) 11/TX (PB10)
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PB6 // PB6
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 54983b3d2..909026c02 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -97,26 +97,26 @@
 
 #define USE_VCP
 
-#define USE_USART1
-#define USART1_RX_PIN        PA10
-#define USART1_TX_PIN        PA9
-#define USART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
+#define USE_UART1
+#define UART1_RX_PIN        PA10
+#define UART1_TX_PIN        PA9
+#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
 
-#define USE_USART2
-#define USART2_RX_PIN        PA3
-#define USART2_TX_PIN        PA2 //inverter
+#define USE_UART2
+#define UART2_RX_PIN        PA3
+#define UART2_TX_PIN        PA2 //inverter
 
-//#define USE_USART3
-//#define USART3_RX_PIN        PB11
-//#define USART3_TX_PIN        PB10
+//#define USE_UART3
+//#define UART3_RX_PIN        PB11
+//#define UART3_TX_PIN        PB10
 
-#define USE_USART4
-#define USART4_RX_PIN        PC10
-#define USART4_TX_PIN        PC11
+#define USE_UART4
+#define UART4_RX_PIN        PC10
+#define UART4_TX_PIN        PC11
 
-//#define USE_USART5
-//#define USART5_RX_PIN        PD2
-//#define USART5_TX_PIN        PC12
+//#define USE_UART5
+//#define UART5_RX_PIN        PD2
+//#define UART5_TX_PIN        PC12
 
 #define SERIAL_PORT_COUNT    4
 
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 8d9d1c633..4c53e1599 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -95,18 +95,18 @@
 //#define VBUS_SENSING_PIN PA8
 //#define VBUS_SENSING_ENABLED
     
-#define USE_USART1
-#define USART1_RX_PIN PA10
-#define USART1_TX_PIN PA9
-#define USART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
+#define USE_UART1
+#define UART1_RX_PIN PA10
+#define UART1_TX_PIN PA9
+#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
 
-#define USE_USART3
-#define USART3_RX_PIN PB11
-#define USART3_TX_PIN PB10
+#define USE_UART3
+#define UART3_RX_PIN PB11
+#define UART3_TX_PIN PB10
 
-#define USE_USART6
-#define USART6_RX_PIN PC7
-#define USART6_TX_PIN PC6 
+#define USE_UART6
+#define UART6_RX_PIN PC7
+#define UART6_TX_PIN PC6 
 
 #define SERIAL_PORT_COUNT 4
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 4ca63a6b5..a1425bc53 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -69,8 +69,8 @@
 #define USE_MAG_HMC5883
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART3
+#define USE_UART1
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define SERIAL_PORT_COUNT 4
 
@@ -82,8 +82,8 @@
 #define SOFTSERIAL_1_TIMER_TX_HARDWARE 1 // PWM 2
 #define SOFTSERIAL_1_TIMER_RX_HARDWARE 2 // PWM 3
 
-#define USART3_RX_PIN       PB11
-#define USART3_TX_PIN       PB10
+#define UART3_RX_PIN       PB11
+#define UART3_TX_PIN       PB10
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index f3fdecfee..52bea95ba 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -55,7 +55,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
@@ -93,8 +93,8 @@
 #define MAG_AK8975_ALIGN CW90_DEG_FLIP
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 #define SERIAL_PORT_COUNT 3
 
 #define USE_I2C
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index d92a591ab..d84e98eae 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -35,8 +35,8 @@
 
 #define BRUSHED_MOTORS
 
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 
 #define SERIAL_PORT_COUNT 2
 
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index e0d102913..65ab62d5d 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -77,9 +77,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PC4
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index c3be09e18..e4c2f76ba 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -95,9 +95,9 @@
 
 #define USB_IO
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PB6
diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h
index 0869dd46b..ee893670d 100644
--- a/src/main/target/EUSTM32F103RC/target.h
+++ b/src/main/target/EUSTM32F103RC/target.h
@@ -76,8 +76,8 @@
 
 #define DISPLAY
 
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 4
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 4c9e1f44e..e67a920cc 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -95,7 +95,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
@@ -107,9 +107,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define SERIAL_PORT_COUNT 5
 
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 2559e2d27..b9631d612 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -106,18 +106,18 @@
 #define VBUS_SENSING_PIN PC5
 #define VBUS_SENSING_ENABLED
 
-#define USE_USART1
-#define USART1_RX_PIN PA10
-#define USART1_TX_PIN PA9
-#define USART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
+#define USE_UART1
+#define UART1_RX_PIN PA10
+#define UART1_TX_PIN PA9
+#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
 
-#define USE_USART3
-#define USART3_RX_PIN PB11
-#define USART3_TX_PIN PB10
+#define USE_UART3
+#define UART3_RX_PIN PB11
+#define UART3_TX_PIN PB10
 
-#define USE_USART6
-#define USART6_RX_PIN PC7
-#define USART6_TX_PIN PC6
+#define USE_UART6
+#define UART6_RX_PIN PC7
+#define UART6_TX_PIN PC6
 
 #define SERIAL_PORT_COUNT 4 //VCP, USART1, USART3, USART6
 
diff --git a/src/main/target/IRCFUSIONF3/target.c b/src/main/target/IRCFUSIONF3/target.c
index e31aa3a7b..dd87a8641 100644
--- a/src/main/target/IRCFUSIONF3/target.c
+++ b/src/main/target/IRCFUSIONF3/target.c
@@ -99,8 +99,8 @@ const uint16_t airPWM[] = {
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH1 - PA0  - *TIM2_CH1
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH2 - PA1  - *TIM2_CH2, TIM15_CH1N
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
     { TIM3,  IO_TAG(PB4),  TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH5 - PB4  - *TIM3_CH1
     { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH6 - PB5  - *TIM3_CH2
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH7 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index 4ff16f5ff..8e41030ed 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -44,9 +44,9 @@
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 3
 
 #define UART1_TX_PIN        PA9  // PA9
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index 31bcb82f7..de059f7b4 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -44,9 +44,9 @@
 
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index 4001b733b..ac7d2c06d 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -57,9 +57,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PC4
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index e6ea276d6..8adefc20c 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -63,9 +63,9 @@
 //#define USE_MAG_HMC5883
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PB6 // PB6
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index f8c8b6642..adca1659a 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -119,9 +119,9 @@
 
 #define DISPLAY
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 5
@@ -134,8 +134,8 @@
 #define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
 
 // USART3 only on NAZE32_SP - Flex Port
-#define USART3_RX_PIN PB11
-#define USART3_TX_PIN PB10
+#define UART3_RX_PIN PB11
+#define UART3_TX_PIN PB10
 
 #define USE_I2C
 #define I2C_DEVICE (I2CDEV_2)
diff --git a/src/main/target/OLIMEXINO/target.h b/src/main/target/OLIMEXINO/target.h
index 3ff23fd8d..c52631033 100644
--- a/src/main/target/OLIMEXINO/target.h
+++ b/src/main/target/OLIMEXINO/target.h
@@ -28,7 +28,7 @@
 
 #ifdef OLIMEXINO_UNCUT_LED2_E_JUMPER
 // "LED2" is using one of the PWM pins (CH2/PWM2), so we must not use PWM2 unless the jumper is cut.  @See pwmInit()
-#define LED1    PA1 // D3, PA1/USART2_RTS/ADC1/TIM2_CH3 - "LED2" on silkscreen, Yellow
+#define LED1    PA1 // D3, PA1/UART2_RTS/ADC1/TIM2_CH3 - "LED2" on silkscreen, Yellow
 #endif
 
 #define GYRO
@@ -62,8 +62,8 @@
 #define SONAR_ECHO_PIN      PB1
 #define SONAR_TRIGGER_PIN   PB0
 
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 4
diff --git a/src/main/target/OMNIBUS/target.c b/src/main/target/OMNIBUS/target.c
index d895b571c..a41891d69 100644
--- a/src/main/target/OMNIBUS/target.c
+++ b/src/main/target/OMNIBUS/target.c
@@ -97,8 +97,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 },  // PWM8 - PA1
 
     // UART3 RX/TX
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM9  - PB10 - TIM2_CH3 / USART3_TX (AF7)
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM10 - PB11 - TIM2_CH4 / USART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM9  - PB10 - TIM2_CH3 / UART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM10 - PB11 - TIM2_CH4 / UART3_RX (AF7)
 
     // LED Strip Pad
     { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM1_CC_IRQn,            1, IOCFG_AF_PP, GPIO_AF_6 },  // GPIO_TIMER / LED_STRIP
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 4512142c2..dedb5de7e 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -70,9 +70,9 @@
 #define USB_DETECT_PIN                   PB5
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define SERIAL_PORT_COUNT 5
 
@@ -134,7 +134,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
diff --git a/src/main/target/PIKOBLX/target.h b/src/main/target/PIKOBLX/target.h
index e9eaf65df..938af8f98 100644
--- a/src/main/target/PIKOBLX/target.h
+++ b/src/main/target/PIKOBLX/target.h
@@ -49,9 +49,9 @@
 #define MPU6000_SPI_INSTANCE SPI2
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PB6 // PB6
diff --git a/src/main/target/PORT103R/target.h b/src/main/target/PORT103R/target.h
index d5d0850d9..417f889c9 100644
--- a/src/main/target/PORT103R/target.h
+++ b/src/main/target/PORT103R/target.h
@@ -89,8 +89,8 @@
 
 #define DISPLAY
 
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 4
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 2532d4387..05c58aa97 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -74,18 +74,18 @@
 #define USE_VCP
 #define VBUS_SENSING_PIN PC5
 
-#define USE_USART1
-#define USART1_RX_PIN PA10
-#define USART1_TX_PIN PA9
-#define USART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
+#define USE_UART1
+#define UART1_RX_PIN PA10
+#define UART1_TX_PIN PA9
+#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
 
-#define USE_USART3
-#define USART3_RX_PIN PB11
-#define USART3_TX_PIN PB10
+#define USE_UART3
+#define UART3_RX_PIN PB11
+#define UART3_TX_PIN PB10
 
-#define USE_USART6
-#define USART6_RX_PIN PC7
-#define USART6_TX_PIN PC6
+#define USE_UART6
+#define UART6_RX_PIN PC7
+#define UART6_TX_PIN PC6
 
 #define SERIAL_PORT_COUNT 4 //VCP, USART1, USART3, USART6
 
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 14912fffc..6e461c5eb 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -62,13 +62,13 @@
 #define USE_VCP
 #define VBUS_SENSING_PIN PA9
 
-#define USE_USART1
-#define USART1_RX_PIN PB7
-#define USART1_TX_PIN PB6
+#define USE_UART1
+#define UART1_RX_PIN PB7
+#define UART1_TX_PIN PB6
 
-#define USE_USART2
-#define USART2_RX_PIN PA3
-#define USART2_TX_PIN PA2
+#define USE_UART2
+#define UART2_RX_PIN PA3
+#define UART2_TX_PIN PA2
 
 #define SERIAL_PORT_COUNT 3 //VCP, USART1, USART2
 
diff --git a/src/main/target/RMDO/target.c b/src/main/target/RMDO/target.c
index 1bea16f50..ee96272c1 100644
--- a/src/main/target/RMDO/target.c
+++ b/src/main/target/RMDO/target.c
@@ -99,8 +99,8 @@ const uint16_t airPWM[] = {
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH1 - PA0  - *TIM2_CH1
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH2 - PA1  - *TIM2_CH2, TIM15_CH1N
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 },  // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
     { TIM3,  IO_TAG(PB4),  TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 },  // RC_CH5 - PB4  - *TIM3_CH1
     { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 },  // RC_CH6 - PB5  - *TIM3_CH2
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 },  // RC_CH7 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
diff --git a/src/main/target/RMDO/target.h b/src/main/target/RMDO/target.h
index db24488cb..14fd760c8 100644
--- a/src/main/target/RMDO/target.h
+++ b/src/main/target/RMDO/target.h
@@ -55,9 +55,9 @@
 #define SONAR_ECHO_PIN      PB1
 #define SONAR_TRIGGER_PIN   PB0
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 5
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index 8de22972a..06e9f3cfe 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -43,9 +43,9 @@
 #define USE_FLASH_M25P16
 
 #define USE_VCP
-#define USE_USART1          // JST-SH Serial - TX (PA9) RX (PA10)
-#define USE_USART2          // Input - TX (NC) RX (PA15)
-#define USE_USART3          // Solder Pads - TX (PB10) RX (PB11)
+#define USE_UART1          // JST-SH Serial - TX (PA9) RX (PA10)
+#define USE_UART2          // Input - TX (NC) RX (PA15)
+#define USE_UART3          // Solder Pads - TX (PB10) RX (PB11)
 #define USE_SOFTSERIAL1     // Telemetry
 #define SERIAL_PORT_COUNT 5
 
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index c504b5871..d48e37363 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -56,9 +56,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PA9  // PA9
@@ -113,7 +113,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index 15f7d013c..f82be0768 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -56,9 +56,9 @@
 #define MAG_AK8975_ALIGN CW180_DEG_FLIP
 
 #define USE_VCP
-#define USE_USART1 // Conn 1 - TX (PB6) RX PB7 (AF7)
-#define USE_USART2 // Input - RX (PA3)
-#define USE_USART3 // Servo out - 10/RX (PB11) 11/TX (PB10)
+#define USE_UART1 // Conn 1 - TX (PB6) RX PB7 (AF7)
+#define USE_UART2 // Input - RX (PA3)
+#define USE_UART3 // Servo out - 10/RX (PB11) 11/TX (PB10)
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PB6 // PB6
diff --git a/src/main/target/SPRACINGF3/target.c b/src/main/target/SPRACINGF3/target.c
index bf2a06da4..ec9176a27 100644
--- a/src/main/target/SPRACINGF3/target.c
+++ b/src/main/target/SPRACINGF3/target.c
@@ -100,8 +100,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH1 - PA0  - *TIM2_CH1
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH2 - PA1  - *TIM2_CH2, TIM15_CH1N
     // Production boards swapped RC_CH3/4 swapped to make it easier to use SerialRX using supplied cables - compared to first prototype.
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
     { TIM3,  IO_TAG(PB4),  TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH5 - PB4  - *TIM3_CH1
     { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH6 - PB5  - *TIM3_CH2
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH7 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 6cf238c0c..2380fd100 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -65,9 +65,9 @@
 #define SONAR_ECHO_PIN      PB1
 #define SONAR_TRIGGER_PIN   PB0
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 5
diff --git a/src/main/target/SPRACINGF3EVO/target.c b/src/main/target/SPRACINGF3EVO/target.c
index 171f6be27..843ad3d9a 100644
--- a/src/main/target/SPRACINGF3EVO/target.c
+++ b/src/main/target/SPRACINGF3EVO/target.c
@@ -91,8 +91,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM3,  IO_TAG(PA7),  TIM_Channel_2, TIM3_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_2 },  // PWM6
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_2 },  // PWM7
     { TIM3,  IO_TAG(PB1),  TIM_Channel_4, TIM3_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_2 },  // PWM8
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP,    GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
     { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM1_CC_IRQn,            1, IOCFG_AF_PP,    GPIO_AF_6 },  // GPIO_TIMER / LED_STRIP
 };
 
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index d30b46f29..0bae98425 100755
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -65,9 +65,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        PA9  // PA9
@@ -110,7 +110,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
diff --git a/src/main/target/SPRACINGF3MINI/target.c b/src/main/target/SPRACINGF3MINI/target.c
index 214dab656..d1e3a0d8b 100644
--- a/src/main/target/SPRACINGF3MINI/target.c
+++ b/src/main/target/SPRACINGF3MINI/target.c
@@ -100,8 +100,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 },  // PWM8 - PA1
 
     // UART3 RX/TX
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM9  - PB10 - TIM2_CH3 / USART3_TX (AF7)
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM10 - PB11 - TIM2_CH4 / USART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM9  - PB10 - TIM2_CH3 / UART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               1, IOCFG_AF_PP, GPIO_AF_1 }, // PWM10 - PB11 - TIM2_CH4 / UART3_RX (AF7)
 
     // LED Strip Pad
     { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM1_CC_IRQn,            1, IOCFG_AF_PP, GPIO_AF_6 },  // GPIO_TIMER / LED_STRIP
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index a1e609d4a..d76558a9c 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -73,9 +73,9 @@
 #define USB_DETECT_PIN      PB5
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define SERIAL_PORT_COUNT 5
 
@@ -117,7 +117,7 @@
 // Divide to under 25MHz for normal operation:
 #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
 
-// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 #define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index 7664b47e0..8ac7eca05 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -112,7 +112,7 @@
 //// Divide to under 25MHz for normal operation:
 //#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2
 //
-//// Note, this is the same DMA channel as USART1_RX. Luckily we don't use DMA for USART Rx.
+//// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
 //#define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
 //#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
 
@@ -123,8 +123,8 @@
 #define USE_MAG_HMC5883
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
+#define USE_UART1
+#define USE_UART2
 #define SERIAL_PORT_COUNT 3
 
 // uart2 gpio for shared serial rx/ppm
diff --git a/src/main/target/X_RACERSPI/target.c b/src/main/target/X_RACERSPI/target.c
index f2ad959f8..85db79093 100644
--- a/src/main/target/X_RACERSPI/target.c
+++ b/src/main/target/X_RACERSPI/target.c
@@ -84,8 +84,8 @@ const uint16_t airPWM[] = {
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH1 - PA0  - *TIM2_CH1
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH2 - PA1  - *TIM2_CH2, TIM15_CH1N
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
     { TIM3,  IO_TAG(PB4),  TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH5 - PB4  - *TIM3_CH1
     { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH6 - PB5  - *TIM3_CH2
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH7 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index 187ab6911..4a38e233f 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -55,9 +55,9 @@
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define USE_SOFTSERIAL2
 #define SERIAL_PORT_COUNT 5
diff --git a/src/main/target/ZCOREF3/target.c b/src/main/target/ZCOREF3/target.c
index a3cfdc733..b72400e6f 100644
--- a/src/main/target/ZCOREF3/target.c
+++ b/src/main/target/ZCOREF3/target.c
@@ -83,8 +83,8 @@ const uint16_t airPWM[] = {
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH1 - PA0  - *TIM2_CH1
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH2 - PA1  - *TIM2_CH2, TIM15_CH1N
-    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)
-    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, USART3_TX (AF7)
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7)
+    { TIM2,  IO_TAG(PB10), TIM_Channel_3, TIM2_IRQn,               0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7)
     { TIM3,  IO_TAG(PB4),  TIM_Channel_1, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH5 - PB4  - *TIM3_CH1
     { TIM3,  IO_TAG(PB5),  TIM_Channel_2, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH6 - PB5  - *TIM3_CH2
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               0, IOCFG_AF_PP, GPIO_AF_2 }, // RC_CH7 - PB0  - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N
diff --git a/src/main/target/ZCOREF3/target.h b/src/main/target/ZCOREF3/target.h
index d15f1b299..dc9f80cb2 100644
--- a/src/main/target/ZCOREF3/target.h
+++ b/src/main/target/ZCOREF3/target.h
@@ -51,9 +51,9 @@
 #define BARO
 #define USE_BARO_BMP280
 
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 3