diff --git a/src/main/drivers/vtx_rtc6705_soft_spi.c b/src/main/drivers/vtx_rtc6705_soft_spi.c
index 222e6704b..3cd03adad 100644
--- a/src/main/drivers/vtx_rtc6705_soft_spi.c
+++ b/src/main/drivers/vtx_rtc6705_soft_spi.c
@@ -61,9 +61,9 @@ static IO_t rtc6705ClkPin = IO_NONE;
 
 void rtc6705IOInit(void)
 {
-    rtc6705DataPin = IOGetByTag(IO_TAG(RTC6705_SPIDATA_PIN));
-    rtc6705CsnPin   = IOGetByTag(IO_TAG(RTC6705_SPILE_PIN));
+    rtc6705DataPin = IOGetByTag(IO_TAG(RTC6705_SPI_MOSI_PIN));
     rtc6705ClkPin  = IOGetByTag(IO_TAG(RTC6705_SPICLK_PIN));
+    rtc6705CsnPin   = IOGetByTag(IO_TAG(RTC6705_CS_PIN));
 
     IOInit(rtc6705CsnPin, OWNER_SPI_CS, RESOURCE_SOFT_OFFSET);
     IOConfigGPIO(rtc6705CsnPin, IOCFG_OUT_PP);
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index f8ff7b18b..359edc319 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -235,7 +235,7 @@ void spiPreInit(void)
 #ifdef USE_MAG_SPI_AK8963
     spiPreInitCs(IO_TAG(AK8963_CS_PIN));
 #endif
-#ifdef RTC6705_CS_PIN // XXX VTX_RTC6705? Should use USE_ format.
+#if defined(USE_VTX_RTC6705)
     spiPreInitCs(IO_TAG(RTC6705_CS_PIN));
 #endif
 #ifdef USE_FLASH_M25P16
diff --git a/src/main/target/BEEBRAIN_V2F/target.h b/src/main/target/BEEBRAIN_V2F/target.h
index ebd26d34a..12ca43809 100644
--- a/src/main/target/BEEBRAIN_V2F/target.h
+++ b/src/main/target/BEEBRAIN_V2F/target.h
@@ -84,9 +84,9 @@
 #define USE_VTX_RTC6705
 #define USE_VTX_RTC6705_SOFTSPI
 #define USE_VTX_CONTROL
-#define RTC6705_SPIDATA_PIN     PC15
-#define RTC6705_SPILE_PIN       PB12
+#define RTC6705_SPI_MOSI_PIN    PC15
 #define RTC6705_SPICLK_PIN      PC13
+#define RTC6705_CS_PIN          PB12
 
 #define USE_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index c23e7053c..c79403b3c 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -118,9 +118,9 @@
 // *************** RTC6705 *************************
 #define USE_VTX_RTC6705
 #define USE_VTX_RTC6705_SOFTSPI
-#define RTC6705_SPILE_PIN       PB3
 #define RTC6705_SPICLK_PIN      PB4
-#define RTC6705_SPIDATA_PIN     PB5
+#define RTC6705_SPI_MOSI_PIN    PB5
+#define RTC6705_CS_PIN          PB3
 
 // *************** ADC *****************************
 #define USE_ADC
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 5c1550db9..40b29b16c 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -99,9 +99,9 @@
 #define SERIAL_PORT_COUNT       5 //VCP, USART1, USART2, UART4, UART5
 #define USE_VTX_RTC6705
 #define USE_VTX_RTC6705_SOFTSPI
-#define RTC6705_SPIDATA_PIN     PC6
-#define RTC6705_SPILE_PIN       PC7
+#define RTC6705_SPI_MOSI_PIN    PC6
 #define RTC6705_SPICLK_PIN      PC2
+#define RTC6705_CS_PIN          PC7
 #endif
 
 #define USE_SPI
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 899831ba7..b47f66601 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -111,9 +111,9 @@
 #define USE_VTX_RTC6705
 #define USE_VTX_RTC6705_SOFTSPI
 
-#define RTC6705_SPIDATA_PIN     PC15
-#define RTC6705_SPILE_PIN       PC14
+#define RTC6705_SPI_MOSI_PIN    PC15
 #define RTC6705_SPICLK_PIN      PC13
+#define RTC6705_CS_PIN          PC14
 
 #define USE_SDCARD