diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h
index 8faed3c4cf..9c7779e79d 100644
--- a/src/main/drivers/timer.h
+++ b/src/main/drivers/timer.h
@@ -96,7 +96,7 @@ typedef struct timerHardware_s {
 #if defined(STM32F3) || defined(STM32F4) || defined(STM32F7)
     uint8_t alternateFunction;
 #endif
-#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(TRANSPONDER)
+#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER)
 #if defined(STM32F4) || defined(STM32F7)
     DMA_Stream_TypeDef *dmaRef;
     uint32_t dmaChannel;
diff --git a/src/main/drivers/timer_def.h b/src/main/drivers/timer_def.h
index c07590b6c3..300f4488ee 100644
--- a/src/main/drivers/timer_def.h
+++ b/src/main/drivers/timer_def.h
@@ -22,7 +22,7 @@
 #include "common/utils.h"
 
 // allow conditional definition of DMA related members
-#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(TRANSPONDER)
+#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER)
 # define DEF_TIM_DMA_COND(...) __VA_ARGS__
 #else
 # define DEF_TIM_DMA_COND(...)
diff --git a/src/main/drivers/transponder_ir.c b/src/main/drivers/transponder_ir.c
index d0d81e075b..4df103e02f 100644
--- a/src/main/drivers/transponder_ir.c
+++ b/src/main/drivers/transponder_ir.c
@@ -21,7 +21,7 @@
 
 #include <platform.h>
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
 
 #include "dma.h"
 #include "drivers/nvic.h"
diff --git a/src/main/drivers/transponder_ir_arcitimer.c b/src/main/drivers/transponder_ir_arcitimer.c
index e8b9a7e22a..984e678828 100644
--- a/src/main/drivers/transponder_ir_arcitimer.c
+++ b/src/main/drivers/transponder_ir_arcitimer.c
@@ -18,6 +18,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <platform.h>
+
+#ifdef USE_TRANSPONDER
+
 #include "drivers/transponder_ir.h"
 #include "drivers/transponder_ir_arcitimer.h"
 
@@ -64,3 +67,4 @@ const struct transponderVTable arcitimerTansponderVTable = {
 };
 
 #endif
+#endif
diff --git a/src/main/drivers/transponder_ir_erlt.c b/src/main/drivers/transponder_ir_erlt.c
index fe63e2d86b..15b5aa6e6c 100644
--- a/src/main/drivers/transponder_ir_erlt.c
+++ b/src/main/drivers/transponder_ir_erlt.c
@@ -18,6 +18,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <platform.h>
+
+#ifdef USE_TRANSPONDER
+
 #include "drivers/transponder_ir.h"
 #include "drivers/transponder_ir_erlt.h"
 
@@ -77,3 +80,4 @@ const struct transponderVTable erltTansponderVTable = {
 };
 
 #endif
+#endif
diff --git a/src/main/drivers/transponder_ir_ilap.c b/src/main/drivers/transponder_ir_ilap.c
index fc2b0e09b4..22004a2403 100644
--- a/src/main/drivers/transponder_ir_ilap.c
+++ b/src/main/drivers/transponder_ir_ilap.c
@@ -18,6 +18,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <platform.h>
+
+#ifdef USE_TRANSPONDER
+
 #include "drivers/transponder_ir.h"
 #include "drivers/transponder_ir_ilap.h"
 
@@ -79,3 +82,4 @@ const struct transponderVTable ilapTansponderVTable = {
 };
 
 #endif
+#endif
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 7bb5fc289c..d00b515d3a 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -467,7 +467,7 @@ static void validateAndFixConfig(void)
     featureClear(FEATURE_SERVO_TILT | FEATURE_CHANNEL_FORWARDING);
 #endif
 
-#ifndef TRANSPONDER
+#ifndef USE_TRANSPONDER
     featureClear(FEATURE_TRANSPONDER);
 #endif
 
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index be8fef1825..fe74a83ff6 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -673,7 +673,7 @@ static void subTaskMainSubprocesses(timeUs_t currentTimeUs)
     UNUSED(currentTimeUs);
 #endif
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     transponderUpdate(currentTimeUs);
 #endif
     DEBUG_SET(DEBUG_PIDLOOP, 3, micros() - startTime);
diff --git a/src/main/fc/fc_hardfaults.c b/src/main/fc/fc_hardfaults.c
index cf9c50bb22..4cba6500d3 100644
--- a/src/main/fc/fc_hardfaults.c
+++ b/src/main/fc/fc_hardfaults.c
@@ -101,7 +101,7 @@ void HardFault_Handler(void)
     }
 #endif
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     // prevent IR LEDs from burning out.
     uint8_t requiredStateForTransponder = SYSTEM_STATE_CONFIG_LOADED | SYSTEM_STATE_TRANSPONDER_ENABLED;
     if ((systemState & requiredStateForTransponder) == requiredStateForTransponder) {
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 73b30f1462..3faee7e2d2 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -624,7 +624,7 @@ void init(void)
     usbCableDetectInit();
 #endif
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     if (feature(FEATURE_TRANSPONDER)) {
         transponderInit();
         transponderStartRepeating();
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 22d3af5fa2..94b2a2bcfc 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -250,7 +250,7 @@ void fcTasksInit(void)
 #endif
     setTaskEnabled(TASK_BATTERY_ALERTS, (useBatteryVoltage || useBatteryCurrent) && useBatteryAlerts);
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER));
 #endif
 
@@ -316,7 +316,7 @@ void fcTasksInit(void)
 #ifdef USE_LED_STRIP
     setTaskEnabled(TASK_LEDSTRIP, feature(FEATURE_LED_STRIP));
 #endif
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER));
 #endif
 #ifdef USE_OSD
@@ -390,7 +390,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
         .staticPriority = TASK_PRIORITY_MEDIUM,
     },
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     [TASK_TRANSPONDER] = {
         .taskName = "TRANSPONDER",
         .taskFunc = transponderUpdate,
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index aba38767ec..9caca64345 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -3165,7 +3165,7 @@ const cliResourceValue_t resourceTable[] = {
     { OWNER_RX_BIND,       PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_pin_override_ioTag), 0 },
     { OWNER_RX_BIND_PLUG,  PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_plug_ioTag), 0 },
 #endif
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     { OWNER_TRANSPONDER,   PG_TRANSPONDER_CONFIG, offsetof(transponderConfig_t, ioTag), 0 },
 #endif
 #ifdef USE_SPI
diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 10a40ab180..e6606a7b64 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -589,7 +589,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
         break;
 
     case MSP_TRANSPONDER_CONFIG: {
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
         // Backward compatibility to BFC 3.1.1 is lost for this message type
         sbufWriteU8(dst, TRANSPONDER_PROVIDER_COUNT);
         for (unsigned int i = 0; i < TRANSPONDER_PROVIDER_COUNT; i++) {
@@ -2011,7 +2011,7 @@ static mspResult_e mspCommonProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
     UNUSED(dataSize); // maybe unused due to compiler options
 
     switch (cmdMSP) {
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     case MSP_SET_TRANSPONDER_CONFIG: {
         // Backward compatibility to BFC 3.1.1 is lost for this message type
 
diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c
index 0559dbf75d..d1612e5b2b 100644
--- a/src/main/io/transponder_ir.c
+++ b/src/main/io/transponder_ir.c
@@ -23,7 +23,7 @@
 
 #include <platform.h>
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
 #include "build/build_config.h"
 
 #include "config/config_reset.h"
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index f58a928f68..af432c83ae 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -273,7 +273,7 @@ void init(void)
     usbCableDetectInit();
 #endif
 
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     if (feature(FEATURE_TRANSPONDER)) {
         transponderInit();
         transponderStartRepeating();
diff --git a/src/main/scheduler/scheduler.h b/src/main/scheduler/scheduler.h
index af37de3060..7e2fd2a80e 100644
--- a/src/main/scheduler/scheduler.h
+++ b/src/main/scheduler/scheduler.h
@@ -86,7 +86,7 @@ typedef enum {
 #ifdef USE_LED_STRIP
     TASK_LEDSTRIP,
 #endif
-#ifdef TRANSPONDER
+#ifdef USE_TRANSPONDER
     TASK_TRANSPONDER,
 #endif
 #ifdef STACK_CHECK
diff --git a/src/main/target/BEEBRAIN_V2F/target.h b/src/main/target/BEEBRAIN_V2F/target.h
index 1f9c7783f4..eb0e18bffa 100644
--- a/src/main/target/BEEBRAIN_V2F/target.h
+++ b/src/main/target/BEEBRAIN_V2F/target.h
@@ -94,7 +94,7 @@
 #define ADC_INSTANCE            ADC3
 #define VBAT_ADC_PIN            PB13
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_UART           SERIAL_PORT_USART2
 #define RX_CHANNELS_TAER
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index 354367626e..caf3903c44 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -141,7 +141,7 @@
 
 #define USE_LED_STRIP
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define DEFAULT_FEATURES        ( FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE )
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index b1a8cdaf39..c0f90df308 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -135,7 +135,7 @@
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define DEFAULT_RX_FEATURE          FEATURE_RX_SERIAL
 #define DEFAULT_FEATURES            ( FEATURE_OSD  )
diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h
index ca2549cf3b..74f93769d4 100644
--- a/src/main/target/FF_PIKOBLX/target.h
+++ b/src/main/target/FF_PIKOBLX/target.h
@@ -98,7 +98,7 @@
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
 #define SERIALRX_UART           SERIAL_PORT_USART3
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 // IO - stm32f303cc in 48pin package
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index 9035a69766..56b5c2bdd4 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -125,7 +125,7 @@
 #define ADC_INSTANCE                ADC2
 #define ADC24_DMA_REMAP
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index 98df59e2ed..48a1ed056e 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -102,7 +102,7 @@
 
 #define SERIALRX_UART           SERIAL_PORT_USART2
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index c6c2b82c89..618f0b733b 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -157,7 +157,7 @@
 //#define RSSI_ADC_PIN                PB1
 //#define ADC_INSTANCE                ADC3
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index c61dd38076..99a9e0a543 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -225,7 +225,7 @@
 #define RSSI_ADC_PIN            PA0  // Direct from RSSI pad
 #endif
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define USE_SONAR
 
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 28ab4c0a5d..1020d5333f 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -253,7 +253,7 @@
 #define RSSI_ADC_PIN            PA0
 #endif
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #if defined(PODIUMF4)
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index 7400d6cdd4..c79ac3ef99 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -122,7 +122,7 @@
 #define CURRENT_METER_ADC_PIN    PA5
 #define VBAT_SCALE_DEFAULT       119
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define TRANSPONDER_GPIO                     GPIOA
 #define TRANSPONDER_GPIO_AHB_PERIPHERAL      RCC_AHBPeriph_GPIOA
 #define TRANSPONDER_GPIO_AF                  GPIO_AF_1
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index 75586105dd..11d1f9e805 100644
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -169,7 +169,7 @@
 #define USE_OSD_OVER_MSP_DISPLAYPORT
 #define USE_MSP_CURRENT_METER
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index 1a9b33d426..38bbec8ed7 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -178,7 +178,7 @@
 #define CURRENT_METER_ADC_PIN       PA5
 #define RSSI_ADC_PIN                PB2
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
 
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 6cbacd9841..50cb120deb 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -156,7 +156,7 @@
 #define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH2_HANDLER
 #define WS2811_TIMER_GPIO_AF            GPIO_AF_6
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/SPRACINGF3OSD/target.h b/src/main/target/SPRACINGF3OSD/target.h
index 5798b11916..10958314ac 100644
--- a/src/main/target/SPRACINGF3OSD/target.h
+++ b/src/main/target/SPRACINGF3OSD/target.h
@@ -86,7 +86,7 @@
 #define VOLTAGE_12V_ADC_PIN     PA0
 #define VOLTAGE_5V_ADC_PIN      PA1
 
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define DEFAULT_FEATURES        (FEATURE_TRANSPONDER)
 
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index 91aaded432..32c7758c1a 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -162,7 +162,7 @@
 #define USE_MSP_CURRENT_METER
 
 #define USE_LED_STRIP
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index 29c2adc82f..5d464910ac 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -189,7 +189,7 @@
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 
 #define USE_LED_STRIP
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/test/unit/platform.h b/src/test/unit/platform.h
index d748e22bad..6c643621f6 100644
--- a/src/test/unit/platform.h
+++ b/src/test/unit/platform.h
@@ -33,7 +33,7 @@
 #define USE_TELEMETRY
 #define USE_LED_STRIP
 #define USE_SERVOS
-#define TRANSPONDER
+#define USE_TRANSPONDER
 
 typedef enum
 {
diff --git a/src/test/unit/target.h b/src/test/unit/target.h
index 591aa7ec43..bd88b51ef8 100644
--- a/src/test/unit/target.h
+++ b/src/test/unit/target.h
@@ -50,7 +50,7 @@
 #define USE_TELEMETRY_SMARTPORT
 #define USE_LED_STRIP
 #define USE_SERVOS
-#define TRANSPONDER
+#define USE_TRANSPONDER
 #define USE_VCP
 #define USE_UART1
 #define USE_UART2