diff --git a/src/main/cms/cms_menu_builtin.c b/src/main/cms/cms_menu_builtin.c
index 40984cb551..6e6ee3df1d 100644
--- a/src/main/cms/cms_menu_builtin.c
+++ b/src/main/cms/cms_menu_builtin.c
@@ -101,14 +101,14 @@ static OSD_Entry menuFeaturesEntries[] =
 #if defined(USE_BLACKBOX)
     {"BLACKBOX", OME_Submenu, cmsMenuChange, &cmsx_menuBlackbox, 0},
 #endif
-#if defined(VTX_CONTROL)
-#if defined(VTX_RTC6705)
+#if defined(USE_VTX_CONTROL)
+#if defined(USE_VTX_RTC6705)
     {"VTX", OME_Submenu, cmsMenuChange, &cmsx_menuVtxRTC6705, 0},
 #endif // VTX_RTC6705
-#if defined(VTX_SMARTAUDIO)
+#if defined(USE_VTX_SMARTAUDIO)
     {"VTX SA", OME_Submenu, cmsMenuChange, &cmsx_menuVtxSmartAudio, 0},
 #endif
-#if defined(VTX_TRAMP)
+#if defined(USE_VTX_TRAMP)
     {"VTX TR", OME_Submenu, cmsMenuChange, &cmsx_menuVtxTramp, 0},
 #endif
 #endif // VTX_CONTROL
diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c
index 2a70662b36..22f27c84c7 100644
--- a/src/main/cms/cms_menu_osd.c
+++ b/src/main/cms/cms_menu_osd.c
@@ -72,7 +72,7 @@ OSD_Entry menuOsdActiveElemsEntries[] =
     {"FLY MODE",           OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_FLYMODE], 0},
     {"NAME",               OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CRAFT_NAME], 0},
     {"THROTTLE",           OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_THROTTLE_POS], 0},
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     {"VTX CHAN",           OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_VTX_CHANNEL], 0},
 #endif // VTX
     {"CURRENT (A)",        OME_VISIBLE, NULL, &osdConfig_item_pos[OSD_CURRENT_DRAW], 0},
diff --git a/src/main/cms/cms_menu_vtx_rtc6705.c b/src/main/cms/cms_menu_vtx_rtc6705.c
index dd5ca4ae16..2ec3f190a6 100644
--- a/src/main/cms/cms_menu_vtx_rtc6705.c
+++ b/src/main/cms/cms_menu_vtx_rtc6705.c
@@ -21,7 +21,7 @@
 
 #include "platform.h"
 
-#if defined(USE_CMS) && defined(VTX_RTC6705)
+#if defined(USE_CMS) && defined(USE_VTX_RTC6705)
 
 #include "common/printf.h"
 #include "common/utils.h"
diff --git a/src/main/cms/cms_menu_vtx_smartaudio.c b/src/main/cms/cms_menu_vtx_smartaudio.c
index 9adb2865fe..27dda719d7 100644
--- a/src/main/cms/cms_menu_vtx_smartaudio.c
+++ b/src/main/cms/cms_menu_vtx_smartaudio.c
@@ -22,7 +22,7 @@
 
 #include "platform.h"
 
-#if defined(USE_CMS) && defined(VTX_SMARTAUDIO)
+#if defined(USE_CMS) && defined(USE_VTX_SMARTAUDIO)
 
 #include "common/printf.h"
 #include "common/utils.h"
diff --git a/src/main/cms/cms_menu_vtx_tramp.c b/src/main/cms/cms_menu_vtx_tramp.c
index 8b644abab6..99431882d5 100644
--- a/src/main/cms/cms_menu_vtx_tramp.c
+++ b/src/main/cms/cms_menu_vtx_tramp.c
@@ -21,7 +21,7 @@
 
 #include "platform.h"
 
-#if defined(USE_CMS) && defined(VTX_TRAMP)
+#if defined(USE_CMS) && defined(USE_VTX_TRAMP)
 
 #include "common/printf.h"
 #include "common/utils.h"
diff --git a/src/main/drivers/vtx_common.c b/src/main/drivers/vtx_common.c
index 1f628c323f..d04c80d342 100644
--- a/src/main/drivers/vtx_common.c
+++ b/src/main/drivers/vtx_common.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
 
 #include "common/time.h"
 #include "drivers/vtx_common.h"
diff --git a/src/main/drivers/vtx_common.h b/src/main/drivers/vtx_common.h
index 7d5a75a472..60acbca724 100644
--- a/src/main/drivers/vtx_common.h
+++ b/src/main/drivers/vtx_common.h
@@ -41,13 +41,13 @@
 
 #define VTX_SETTINGS_MAX_FREQUENCY_MHZ 5999          //max freq (in MHz) for 'vtx_freq' setting
 
-#if defined(VTX_RTC6705)
+#if defined(USE_VTX_RTC6705)
 
 #include "drivers/vtx_rtc6705.h"
 
 #endif
 
-#if defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
+#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
 
 #define VTX_SETTINGS_POWER_COUNT        5
 #define VTX_SETTINGS_DEFAULT_POWER      1
@@ -56,7 +56,7 @@
 #define VTX_SETTINGS_MAX_USER_FREQ      5999
 #define VTX_SETTINGS_FREQCMD
 
-#elif defined(VTX_RTC6705)
+#elif defined(USE_VTX_RTC6705)
 
 #define VTX_SETTINGS_POWER_COUNT    VTX_RTC6705_POWER_COUNT
 #define VTX_SETTINGS_DEFAULT_POWER  VTX_RTC6705_DEFAULT_POWER
diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c
index e9ebf6af15..9a4445fa1f 100644
--- a/src/main/drivers/vtx_rtc6705.c
+++ b/src/main/drivers/vtx_rtc6705.c
@@ -27,7 +27,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_RTC6705) && !defined(VTX_RTC6705SOFTSPI)
+#if defined(USE_VTX_RTC6705) && !defined(USE_VTX_RTC6705_SOFTSPI)
 
 #include "common/maths.h"
 
diff --git a/src/main/drivers/vtx_rtc6705_soft_spi.c b/src/main/drivers/vtx_rtc6705_soft_spi.c
index d9dc92d1eb..222e6704b3 100644
--- a/src/main/drivers/vtx_rtc6705_soft_spi.c
+++ b/src/main/drivers/vtx_rtc6705_soft_spi.c
@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_RTC6705) && defined(VTX_RTC6705SOFTSPI)
+#if defined(USE_VTX_RTC6705) && defined(USE_VTX_RTC6705_SOFTSPI)
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index 7591f98898..a5ad57103c 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -379,10 +379,10 @@ void updateMagHold(void)
 }
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
 static bool canUpdateVTX(void)
 {
-#ifdef VTX_RTC6705
+#ifdef USE_VTX_RTC6705
     return vtxRTC6705CanUpdate();
 #endif
     return true;
@@ -591,7 +591,7 @@ void processRx(timeUs_t currentTimeUs)
     }
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     vtxUpdateActivatedChannel();
 
     if (canUpdateVTX()) {
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 511853f426..f8ff7b18bf 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -476,7 +476,7 @@ void init(void)
     updateHardwareRevision();
 #endif
 
-#ifdef VTX_RTC6705
+#ifdef USE_VTX_RTC6705
     rtc6705IOInit();
 #endif
 
@@ -682,23 +682,23 @@ void init(void)
     baroSetCalibrationCycles(CALIBRATING_BARO_CYCLES);
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     vtxControlInit();
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
     vtxCommonInit();
     vtxInit();
 #endif
 
-#ifdef VTX_SMARTAUDIO
+#ifdef USE_VTX_SMARTAUDIO
     vtxSmartAudioInit();
 #endif
 
-#ifdef VTX_TRAMP
+#ifdef USE_VTX_TRAMP
     vtxTrampInit();
 #endif
 
-#ifdef VTX_RTC6705
+#ifdef USE_VTX_RTC6705
 #ifdef VTX_RTC6705_OPTIONAL
     if (!vtxCommonDeviceRegistered()) // external VTX takes precedence when configured.
 #endif
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index f6a8f4406a..2033c556b7 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -205,14 +205,14 @@ static void taskTelemetry(timeUs_t currentTimeUs)
 }
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
 // Everything that listens to VTX devices
 void taskVtxControl(timeUs_t currentTime)
 {
     if (cliMode)
         return;
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     vtxProcessSchedule(currentTime);
 #endif
 }
@@ -331,8 +331,8 @@ void fcTasksInit(void)
     setTaskEnabled(TASK_CMS, feature(FEATURE_OSD) || feature(FEATURE_DASHBOARD));
 #endif
 #endif
-#ifdef VTX_CONTROL
-#if defined(VTX_RTC6705) || defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
+#ifdef USE_VTX_CONTROL
+#if defined(USE_VTX_RTC6705) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
     setTaskEnabled(TASK_VTXCTRL, true);
 #endif
 #endif
@@ -569,7 +569,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
     },
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     [TASK_VTXCTRL] = {
         .taskName = "VTXCTRL",
         .taskFunc = taskVtxControl,
diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c
index c5f988c5d5..38c1e93444 100644
--- a/src/main/fc/rc_controls.c
+++ b/src/main/fc/rc_controls.c
@@ -326,7 +326,7 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
     }
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     if (rcSticks ==  THR_HI + YAW_LO + PIT_CE + ROL_HI) {
         vtxIncrementBand();
     }
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 4287a2a361..ad3dcd2eb1 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -1858,7 +1858,7 @@ static void cliFlashRead(char *cmdline)
 #endif
 #endif
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
 static void printVtx(uint8_t dumpMask, const vtxConfig_t *vtxConfig, const vtxConfig_t *vtxConfigDefault)
 {
     // print out vtx channel settings
@@ -3560,7 +3560,7 @@ static void printConfig(char *cmdline, bool doDiff)
         cliPrintHashLine("rxrange");
         printRxRange(dumpMask, rxChannelRangeConfigs_CopyArray, rxChannelRangeConfigs(0));
 
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
         cliPrintHashLine("vtx");
         printVtx(dumpMask, &vtxConfig_Copy, vtxConfig());
 #endif
@@ -3734,7 +3734,7 @@ const clicmd_t cmdTable[] = {
     CLI_COMMAND_DEF("tasks", "show task stats", NULL, cliTasks),
 #endif
     CLI_COMMAND_DEF("version", "show version", NULL, cliVersion),
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     CLI_COMMAND_DEF("vtx", "vtx channels on switch", NULL, cliVtx),
 #endif
 };
diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index e064a166c4..ae31c38d36 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -1206,7 +1206,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
         sbufWriteU8(dst, compassConfig()->mag_hardware);
         break;
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
     case MSP_VTX_CONFIG:
         {
             uint8_t deviceType = vtxCommonGetDeviceType();
@@ -1702,7 +1702,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
         break;
 #endif
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     case MSP_SET_VTX_CONFIG:
         {
             if (vtxCommonDeviceRegistered()) {
diff --git a/src/main/interface/msp_box.c b/src/main/interface/msp_box.c
index d6fe8755c4..516f029695 100644
--- a/src/main/interface/msp_box.c
+++ b/src/main/interface/msp_box.c
@@ -256,7 +256,7 @@ void initActiveBoxIds(void)
     BME(BOXCAMERA3);
 #endif
 
-#if defined(VTX_SMARTAUDIO) || defined(VTX_TRAMP)
+#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
     BME(BOXVTXPITMODE);
 #endif
 
diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index bdeef04f81..fafdf997d9 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -793,7 +793,7 @@ const clivalue_t valueTable[] = {
     { "pwr_on_arm_grace",           VAR_UINT8  | MASTER_VALUE, .config.minmax = { 0, 30 }, PG_SYSTEM_CONFIG, offsetof(systemConfig_t, powerOnArmingGraceTime) },
 
 // PG_VTX_CONFIG
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     { "vtx_band",                   VAR_UINT8  | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_BAND, VTX_SETTINGS_MAX_BAND }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, band) },
     { "vtx_channel",                VAR_UINT8  | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_CHANNEL, VTX_SETTINGS_MAX_CHANNEL }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, channel) },
     { "vtx_power",                  VAR_UINT8  | MASTER_VALUE, .config.minmax = { VTX_SETTINGS_MIN_POWER, VTX_SETTINGS_POWER_COUNT-1 }, PG_VTX_SETTINGS_CONFIG, offsetof(vtxSettingsConfig_t, power) },
@@ -805,7 +805,7 @@ const clivalue_t valueTable[] = {
 #endif
 
 // PG_VTX_CONFIG
-#if defined(VTX_CONTROL) && defined(VTX_COMMON)
+#if defined(USE_VTX_CONTROL) && defined(USE_VTX_COMMON)
     { "vtx_halfduplex",             VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_VTX_CONFIG, offsetof(vtxConfig_t, halfDuplex) },
 #endif
 
diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c
index 0457558009..437d676672 100644
--- a/src/main/io/ledstrip.c
+++ b/src/main/io/ledstrip.c
@@ -578,7 +578,7 @@ static void applyLedWarningLayer(bool updateNow, timeUs_t *timer)
     }
 }
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 static void applyLedVtxLayer(bool updateNow, timeUs_t *timer)
 {
     static uint16_t frequency = 0;
@@ -1000,7 +1000,7 @@ typedef enum {
     timGps,
 #endif
     timWarning,
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     timVtx,
 #endif
     timIndicator,
@@ -1029,7 +1029,7 @@ static applyLayerFn_timed* layerTable[] = {
     [timGps] = &applyLedGpsLayer,
 #endif
     [timWarning] = &applyLedWarningLayer,
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     [timVtx] = &applyLedVtxLayer,
 #endif
     [timIndicator] = &applyLedIndicatorLayer,
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index 8b277e3e3f..9cc9ab6c62 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -506,7 +506,7 @@ static void osdDrawSingleElement(uint8_t item)
         tfp_sprintf(buff + 2, "%d", (constrain(rcData[THROTTLE], PWM_RANGE_MIN, PWM_RANGE_MAX) - PWM_RANGE_MIN) * 100 / (PWM_RANGE_MAX - PWM_RANGE_MIN));
         break;
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
     case OSD_VTX_CHANNEL:
         {
             const char vtxBandLetter = vtx58BandLetter[vtxSettingsConfig()->band];
diff --git a/src/main/io/spektrum_vtx_control.c b/src/main/io/spektrum_vtx_control.c
index 94b53b7b66..67043ecfe4 100644
--- a/src/main/io/spektrum_vtx_control.c
+++ b/src/main/io/spektrum_vtx_control.c
@@ -17,7 +17,7 @@
 
 
 #include "platform.h"
-#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(VTX_COMMON)
+#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(USE_VTX_COMMON)
 
 #include <string.h>
 
diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c
index 430f88c980..de6807c5ff 100644
--- a/src/main/io/vtx.c
+++ b/src/main/io/vtx.c
@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
 
 #include "common/time.h"
 #include "common/maths.h"
diff --git a/src/main/io/vtx_control.c b/src/main/io/vtx_control.c
index bd9d2789e0..5871cfdbb7 100644
--- a/src/main/io/vtx_control.c
+++ b/src/main/io/vtx_control.c
@@ -21,7 +21,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_CONTROL) && defined(VTX_COMMON)
+#if defined(USE_VTX_CONTROL) && defined(USE_VTX_COMMON)
 
 #include "common/maths.h"
 
@@ -184,7 +184,7 @@ void vtxCyclePower(const uint8_t powerStep)
  */
 void handleVTXControlButton(void)
 {
-#if defined(VTX_RTC6705) && defined(BUTTON_A_PIN)
+#if defined(USE_VTX_RTC6705) && defined(BUTTON_A_PIN)
     bool buttonWasPressed = false;
     uint32_t start = millis();
     uint32_t ledToggleAt = start;
diff --git a/src/main/io/vtx_rtc6705.c b/src/main/io/vtx_rtc6705.c
index a755df1fc5..289d163d0d 100644
--- a/src/main/io/vtx_rtc6705.c
+++ b/src/main/io/vtx_rtc6705.c
@@ -22,7 +22,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_RTC6705) && defined(VTX_CONTROL)
+#if defined(USE_VTX_RTC6705) && defined(USE_VTX_CONTROL)
 
 #include "build/build_config.h"
 #include "build/debug.h"
@@ -51,13 +51,13 @@
 #include "io/vtx_rtc6705.h"
 #include "io/vtx_string.h"
 
-#if defined(USE_CMS) || defined(VTX_COMMON)
+#if defined(USE_CMS) || defined(USE_VTX_COMMON)
 const char * const rtc6705PowerNames[] = {
     "OFF", "MIN", "MAX"
 };
 #endif
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 static vtxVTable_t rtc6705VTable;    // Forward
 static vtxDevice_t vtxRTC6705 = {
     .vTable = &rtc6705VTable,
@@ -111,7 +111,7 @@ void vtxRTC6705Process(timeUs_t now)
     UNUSED(now);
 }
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 // Interface to common VTX API
 
 vtxDevType_e vtxRTC6705GetDeviceType(void)
diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c
index ff770b377f..c5cab52364 100644
--- a/src/main/io/vtx_smartaudio.c
+++ b/src/main/io/vtx_smartaudio.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_SMARTAUDIO) && defined(VTX_CONTROL)
+#if defined(USE_VTX_SMARTAUDIO) && defined(USE_VTX_CONTROL)
 
 #include "build/build_config.h"
 #include "build/debug.h"
@@ -70,13 +70,13 @@ serialPort_t *debugSerialPort = NULL;
 
 static serialPort_t *smartAudioSerialPort = NULL;
 
-#if defined(USE_CMS) || defined(VTX_COMMON)
+#if defined(USE_CMS) || defined(USE_VTX_COMMON)
 const char * const saPowerNames[VTX_SMARTAUDIO_POWER_COUNT+1] = {
     "---", "25 ", "200", "500", "800",
 };
 #endif
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 static const vtxVTable_t saVTable;    // Forward
 static vtxDevice_t vtxSmartAudio = {
     .vTable = &saVTable,
@@ -349,7 +349,7 @@ static void saProcessResponse(uint8_t *buf, int len)
     }
     saDevicePrev = saDevice;
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
     // Todo: Update states in saVtxDevice?
 #endif
 
@@ -680,7 +680,7 @@ bool vtxSmartAudioInit(void)
     serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_VTX_SMARTAUDIO);
     if (portConfig) {
         portOptions_e portOptions = SERIAL_STOPBITS_2;
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
         portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR | SERIAL_BIDIR_PP : SERIAL_UNIDIR);
 #else
         portOptions = SERIAL_BIDIR;
@@ -774,7 +774,7 @@ void vtxSAProcess(timeUs_t currentTimeUs)
     }
 }
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 // Interface to common VTX API
 
 vtxDevType_e vtxSAGetDeviceType(void)
diff --git a/src/main/io/vtx_string.c b/src/main/io/vtx_string.c
index e28655db29..164b12ee45 100644
--- a/src/main/io/vtx_string.c
+++ b/src/main/io/vtx_string.c
@@ -24,7 +24,7 @@
 
 #include "build/debug.h"
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
 
 #define VTX_STRING_BAND_COUNT 5
 #define VTX_STRING_CHAN_COUNT 8
diff --git a/src/main/io/vtx_tramp.c b/src/main/io/vtx_tramp.c
index 20f2240cd3..c759c7ef3c 100644
--- a/src/main/io/vtx_tramp.c
+++ b/src/main/io/vtx_tramp.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#if defined(VTX_TRAMP) && defined(VTX_CONTROL)
+#if defined(USE_VTX_TRAMP) && defined(USE_VTX_CONTROL)
 
 #include "build/debug.h"
 
@@ -41,7 +41,7 @@
 #include "io/vtx.h"
 #include "io/vtx_string.h"
 
-#if defined(USE_CMS) || defined(VTX_COMMON)
+#if defined(USE_CMS) || defined(USE_VTX_COMMON)
 const uint16_t trampPowerTable[VTX_TRAMP_POWER_COUNT] = {
     25, 100, 200, 400, 600
 };
@@ -51,7 +51,7 @@ const char * const trampPowerNames[VTX_TRAMP_POWER_COUNT+1] = {
 };
 #endif
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
 static const vtxVTable_t trampVTable; // forward
 static vtxDevice_t vtxTramp = {
     .vTable = &trampVTable,
@@ -485,7 +485,7 @@ void vtxTrampProcess(timeUs_t currentTimeUs)
 }
 
 
-#ifdef VTX_COMMON
+#ifdef USE_VTX_COMMON
 
 // Interface to common VTX API
 
@@ -597,7 +597,7 @@ bool vtxTrampInit(void)
 
     if (portConfig) {
         portOptions_e portOptions = 0;
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
         portOptions = portOptions | (vtxConfig()->halfDuplex ? SERIAL_BIDIR : SERIAL_UNIDIR);
 #else
         portOptions = SERIAL_BIDIR;
@@ -610,7 +610,7 @@ bool vtxTrampInit(void)
         return false;
     }
 
-#if defined(VTX_COMMON)
+#if defined(USE_VTX_COMMON)
     vtxCommonRegisterDevice(&vtxTramp);
 #endif
 
diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c
index 03f0983857..dcdbaff517 100644
--- a/src/main/rx/spektrum.c
+++ b/src/main/rx/spektrum.c
@@ -120,7 +120,7 @@ static uint8_t spektrumFrameStatus(rxRuntimeConfig_t *rxRuntimeConfig)
         }
     }
 
-#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(VTX_COMMON)
+#if defined(USE_SPEKTRUM_VTX_CONTROL) && defined(USE_VTX_COMMON)
 
     // Get the VTX control bytes in a frame
     uint32_t vtxControl = ((spekFrame[SPEKTRUM_VTX_CONTROL_1] << 24) |
diff --git a/src/main/scheduler/scheduler.h b/src/main/scheduler/scheduler.h
index 9d3947cae9..5045a5c552 100644
--- a/src/main/scheduler/scheduler.h
+++ b/src/main/scheduler/scheduler.h
@@ -107,7 +107,7 @@ typedef enum {
 #ifdef USE_CMS
     TASK_CMS,
 #endif
-#ifdef VTX_CONTROL
+#ifdef USE_VTX_CONTROL
     TASK_VTXCTRL,
 #endif
 #ifdef USE_CAMERA_CONTROL
diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index 06665f0d58..1283ea5436 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -198,10 +198,10 @@
 #endif
 
 /* OSD currently dependent upon CMS, SMARTAUDIO, TRAMP
-#undef VTX_COMMON
-#undef VTX_CONTROL
-#undef VTX_SMARTAUDIO
-#undef VTX_TRAMP
+#undef USE_VTX_COMMON
+#undef USE_VTX_CONTROL
+#undef USE_VTX_SMARTAUDIO
+#undef USE_VTX_TRAMP
 */
 
 /* OLED Support
diff --git a/src/main/target/BEEBRAIN_V2F/target.h b/src/main/target/BEEBRAIN_V2F/target.h
index eb0e18bffa..ebd26d34aa 100644
--- a/src/main/target/BEEBRAIN_V2F/target.h
+++ b/src/main/target/BEEBRAIN_V2F/target.h
@@ -81,9 +81,9 @@
 #define MAX7456_SPI_INSTANCE    SPI1
 #define MAX7456_SPI_CS_PIN      PA4
 
-#define VTX_RTC6705
-#define VTX_RTC6705SOFTSPI
-#define VTX_CONTROL
+#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_SPICLK_PIN      PC13
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index e8bca28d98..c23e7053c6 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -116,8 +116,8 @@
 #define SDCARD_DMA_CHANNEL                  DMA_Channel_0
 
 // *************** RTC6705 *************************
-#define VTX_RTC6705
-#define VTX_RTC6705SOFTSPI
+#define USE_VTX_RTC6705
+#define USE_VTX_RTC6705_SOFTSPI
 #define RTC6705_SPILE_PIN       PB3
 #define RTC6705_SPICLK_PIN      PB4
 #define RTC6705_SPIDATA_PIN     PB5
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 5de856289b..5c1550db96 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -97,8 +97,8 @@
 #define SERIAL_PORT_COUNT       6 //VCP, USART1, USART2, UART4, UART5, USART6
 #else
 #define SERIAL_PORT_COUNT       5 //VCP, USART1, USART2, UART4, UART5
-#define VTX_RTC6705
-#define VTX_RTC6705SOFTSPI
+#define USE_VTX_RTC6705
+#define USE_VTX_RTC6705_SOFTSPI
 #define RTC6705_SPIDATA_PIN     PC6
 #define RTC6705_SPILE_PIN       PC7
 #define RTC6705_SPICLK_PIN      PC2
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index 1e0da97daf..c7f10d4612 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -72,7 +72,7 @@
 #define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
-#define VTX_RTC6705
+#define USE_VTX_RTC6705
 
 #define RTC6705_CS_PIN          PA4
 #define RTC6705_SPI_INSTANCE    SPI1
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 1e804a25cd..899831ba70 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -108,8 +108,8 @@
 #define MAX7456_DMA_CHANNEL_RX              DMA2_Channel1
 #define MAX7456_DMA_IRQ_HANDLER_ID          DMA2_CH1_HANDLER
 
-#define VTX_RTC6705
-#define VTX_RTC6705SOFTSPI
+#define USE_VTX_RTC6705
+#define USE_VTX_RTC6705_SOFTSPI
 
 #define RTC6705_SPIDATA_PIN     PC15
 #define RTC6705_SPILE_PIN       PC14
diff --git a/src/main/target/SITL/target.h b/src/main/target/SITL/target.h
index c5b16c3f33..8c1f1e3024 100644
--- a/src/main/target/SITL/target.h
+++ b/src/main/target/SITL/target.h
@@ -115,10 +115,10 @@
 #undef USE_TELEMETRY_JETIEXBUS
 #undef USE_TELEMETRY_SRXL
 #undef USE_SERIALRX_JETIEXBUS
-#undef VTX_COMMON
-#undef VTX_CONTROL
-#undef VTX_SMARTAUDIO
-#undef VTX_TRAMP
+#undef USE_VTX_COMMON
+#undef USE_VTX_CONTROL
+#undef USE_VTX_SMARTAUDIO
+#undef USE_VTX_TRAMP
 #undef USE_CAMERA_CONTROL
 
 #undef USE_I2C
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 50cb120deb..65bf379495 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -92,12 +92,12 @@
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
 
-#define VTX_RTC6705
+#define USE_VTX_RTC6705
 #define VTX_RTC6705_OPTIONAL    // VTX/OSD board is OPTIONAL
 
 // Disabled due to flash size
-#undef VTX_SMARTAUDIO
-#undef VTX_TRAMP
+#undef USE_VTX_SMARTAUDIO
+#undef USE_VTX_TRAMP
 
 #define RTC6705_CS_PIN          PF4
 #define RTC6705_SPI_INSTANCE    SPI3
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index cd65687b70..890c7a554a 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -116,7 +116,7 @@
 #define SPI3_MISO_PIN           PB4  // NC
 #define SPI3_MOSI_PIN           PB5  // NC
 
-#define VTX_RTC6705
+#define USE_VTX_RTC6705
 #define VTX_RTC6705_OPTIONAL    // SPI3 on an F4 EVO may be used for RTC6705 VTX control.
 
 #define RTC6705_CS_PIN          SPI3_NSS_PIN
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index 2be3bd326a..64e9706066 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -133,7 +133,7 @@
 #define SPI3_MOSI_PIN                       PB5
 
 // Bus Switched Device, Device B.
-#define VTX_RTC6705
+#define USE_VTX_RTC6705
 #define VTX_RTC6705_OPTIONAL    // VTX/OSD board is OPTIONAL
 
 #define RTC6705_CS_PIN                      PC4
@@ -214,8 +214,8 @@
 //#define BINDPLUG_PIN                        BUTTON_A_PIN
 
 // Temporarily disable SMARTAUDIO and TRAMP VTX support due to flash size issues.
-#undef VTX_SMARTAUDIO
-#undef VTX_TRAMP
+#undef USE_VTX_SMARTAUDIO
+#undef USE_VTX_TRAMP
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/common_fc_post.h b/src/main/target/common_fc_post.h
index cc3912c753..02de4b4a77 100644
--- a/src/main/target/common_fc_post.h
+++ b/src/main/target/common_fc_post.h
@@ -22,9 +22,9 @@
 #include "build/version.h"
 
 // Targets with built-in vtx do not need external vtx
-#if defined(VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
-#undef VTX_SMARTAUDIO
-#undef VTX_TRAMP
+#if defined(USE_VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
+#undef USE_VTX_SMARTAUDIO
+#undef USE_VTX_TRAMP
 #endif
 
 #if defined(USE_QUAD_MIXER_ONLY) && defined(USE_SERVOS)
@@ -69,11 +69,11 @@
 #endif
 
 /* If either VTX_CONTROL or VTX_COMMON is undefined then remove common code and device drivers */
-#if !defined(VTX_COMMON) || !defined(VTX_CONTROL)
-#undef VTX_COMMON
-#undef VTX_CONTROL
-#undef VTX_TRAMP
-#undef VTX_SMARTAUDIO
+#if !defined(USE_VTX_COMMON) || !defined(USE_VTX_CONTROL)
+#undef USE_VTX_COMMON
+#undef USE_VTX_CONTROL
+#undef USE_VTX_TRAMP
+#undef USE_VTX_SMARTAUDIO
 #endif
 
 #if defined(USE_RX_FRSKY_SPI_D) || defined(USE_RX_FRSKY_SPI_X)
diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h
index 0ea37b3720..8a1e021292 100644
--- a/src/main/target/common_fc_pre.h
+++ b/src/main/target/common_fc_pre.h
@@ -138,10 +138,10 @@
 #define USE_SENSOR_NAMES
 #define USE_SERIALRX_FPORT      // FrSky FPort
 #define USE_VIRTUAL_CURRENT_METER
-#define VTX_COMMON
-#define VTX_CONTROL
-#define VTX_SMARTAUDIO
-#define VTX_TRAMP
+#define USE_VTX_COMMON
+#define USE_VTX_CONTROL
+#define USE_VTX_SMARTAUDIO
+#define USE_VTX_TRAMP
 #define USE_CAMERA_CONTROL
 #define USE_GYRO_OVERFLOW_CHECK
 #define USE_HUFFMAN