diff --git a/src/main/drivers/serial_softserial.h b/src/main/drivers/serial_softserial.h
index f831682b14..42c8bcbf09 100644
--- a/src/main/drivers/serial_softserial.h
+++ b/src/main/drivers/serial_softserial.h
@@ -24,7 +24,7 @@ typedef enum {
     SOFTSERIAL2
 } softSerialPortIndex_e;
 
-serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallbackPtr callback, uint32_t baud, portOptions_t options);
+serialPort_t *openSoftSerial(softSerialPortIndex_e portIndex, serialReceiveCallbackPtr rxCallback, uint32_t baud, portOptions_t options);
 
 // serialPort API
 void softSerialWriteByte(serialPort_t *instance, uint8_t ch);
diff --git a/src/main/drivers/serial_uart.h b/src/main/drivers/serial_uart.h
index f54310d75a..5697fcc9f3 100644
--- a/src/main/drivers/serial_uart.h
+++ b/src/main/drivers/serial_uart.h
@@ -61,7 +61,7 @@ typedef struct {
     USART_TypeDef *USARTx;
 } uartPort_t;
 
-serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, portOptions_t options);
+serialPort_t *uartOpen(USART_TypeDef *USARTx, serialReceiveCallbackPtr rxCallback, uint32_t baudRate, portMode_t mode, portOptions_t options);
 
 // serialPort API
 void uartWrite(serialPort_t *instance, uint8_t ch);
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 8330243599..daf526c7c3 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -264,13 +264,13 @@ bool doesConfigurationUsePort(serialPortIdentifier_e identifier)
 serialPort_t *openSerialPort(
     serialPortIdentifier_e identifier,
     serialPortFunction_e function,
-    serialReceiveCallbackPtr callback,
+    serialReceiveCallbackPtr rxCallback,
     uint32_t baudRate,
     portMode_t mode,
     portOptions_t options)
 {
 #if (!defined(USE_UART1) && !defined(USE_UART2) && !defined(USE_UART3) && !defined(USE_UART4) && !defined(USE_UART5) && !defined(USE_UART6) && !defined(USE_SOFTSERIAL1) && !defined(USE_SOFTSERIAL2))
-    UNUSED(callback);
+    UNUSED(rxCallback);
     UNUSED(baudRate);
     UNUSED(mode);
     UNUSED(options);
@@ -292,43 +292,43 @@ serialPort_t *openSerialPort(
 #endif
 #ifdef USE_UART1
         case SERIAL_PORT_USART1:
-            serialPort = uartOpen(USART1, callback, baudRate, mode, options);
+            serialPort = uartOpen(USART1, rxCallback, baudRate, mode, options);
             break;
 #endif
 #ifdef USE_UART2
         case SERIAL_PORT_USART2:
-            serialPort = uartOpen(USART2, callback, baudRate, mode, options);
+            serialPort = uartOpen(USART2, rxCallback, baudRate, mode, options);
             break;
 #endif
 #ifdef USE_UART3
         case SERIAL_PORT_USART3:
-            serialPort = uartOpen(USART3, callback, baudRate, mode, options);
+            serialPort = uartOpen(USART3, rxCallback, baudRate, mode, options);
             break;
 #endif
 #ifdef USE_UART4
     case SERIAL_PORT_USART4:
-        serialPort = uartOpen(UART4, callback, baudRate, mode, options);
+        serialPort = uartOpen(UART4, rxCallback, baudRate, mode, options);
         break;
 #endif
 #ifdef USE_UART5
     case SERIAL_PORT_USART5:
-        serialPort = uartOpen(UART5, callback, baudRate, mode, options);
+        serialPort = uartOpen(UART5, rxCallback, baudRate, mode, options);
         break;
 #endif
 #ifdef USE_UART6
     case SERIAL_PORT_USART6:
-        serialPort = uartOpen(USART6, callback, baudRate, mode, options);
+        serialPort = uartOpen(USART6, rxCallback, baudRate, mode, options);
         break;
 #endif
 #ifdef USE_SOFTSERIAL1
         case SERIAL_PORT_SOFTSERIAL1:
-            serialPort = openSoftSerial(SOFTSERIAL1, callback, baudRate, options);
+            serialPort = openSoftSerial(SOFTSERIAL1, rxCallback, baudRate, options);
             serialSetMode(serialPort, mode);
             break;
 #endif
 #ifdef USE_SOFTSERIAL2
         case SERIAL_PORT_SOFTSERIAL2:
-            serialPort = openSoftSerial(SOFTSERIAL2, callback, baudRate, options);
+            serialPort = openSoftSerial(SOFTSERIAL2, rxCallback, baudRate, options);
             serialSetMode(serialPort, mode);
             break;
 #endif
@@ -348,7 +348,8 @@ serialPort_t *openSerialPort(
     return serialPort;
 }
 
-void closeSerialPort(serialPort_t *serialPort) {
+void closeSerialPort(serialPort_t *serialPort)
+{
     serialPortUsage_t *serialPortUsage = findSerialPortUsageByPort(serialPort);
     if (!serialPortUsage) {
         // already closed
diff --git a/src/main/io/serial.h b/src/main/io/serial.h
index 38d6851d28..85adb265af 100644
--- a/src/main/io/serial.h
+++ b/src/main/io/serial.h
@@ -126,7 +126,7 @@ serialPortUsage_t *findSerialPortUsageByIdentifier(serialPortIdentifier_e identi
 serialPort_t *openSerialPort(
     serialPortIdentifier_e identifier,
     serialPortFunction_e function,
-    serialReceiveCallbackPtr callback,
+    serialReceiveCallbackPtr rxCallback,
     uint32_t baudrate,
     portMode_t mode,
     portOptions_t options