diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 06c81fa77d..8e00ff76d8 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -40,7 +40,7 @@ loadDmaBufferFn *loadDmaBuffer;
 static pwmOutputPort_t servos[MAX_SUPPORTED_SERVOS];
 #endif
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 static pwmOutputPort_t beeperPwm;
 static uint16_t freqBeep = 0;
 #endif
@@ -460,7 +460,7 @@ void servoDevInit(const servoDevConfig_t *servoConfig)
 
 #endif
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 void pwmWriteBeeper(bool onoffBeep)
 {
         if (!beeperPwm.io)
diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h
index d6d3cca14d..654fc27b09 100644
--- a/src/main/drivers/pwm_output.h
+++ b/src/main/drivers/pwm_output.h
@@ -206,7 +206,7 @@ void pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
 void pwmCompleteDshotMotorUpdate(uint8_t motorCount);
 #endif
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 void pwmWriteBeeper(bool onoffBeep);
 void pwmToggleBeeper(void);
 void beeperPwmInit(const ioTag_t tag, uint16_t frequency);
diff --git a/src/main/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c
index de976fa500..52e563c07e 100644
--- a/src/main/drivers/sound_beeper.c
+++ b/src/main/drivers/sound_beeper.c
@@ -27,7 +27,7 @@
 
 #include "sound_beeper.h"
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 static IO_t beeperIO = DEFIO_IO(NONE);
 static bool beeperInverted = false;
 static uint16_t beeperFrequency = 0;
@@ -35,7 +35,7 @@ static uint16_t beeperFrequency = 0;
 
 void systemBeep(bool onoff)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     if (beeperFrequency == 0) {
         IOWrite(beeperIO, beeperInverted ? onoff : !onoff);
     } else {
@@ -48,7 +48,7 @@ void systemBeep(bool onoff)
 
 void systemBeepToggle(void)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     if (beeperFrequency == 0) {
         IOToggle(beeperIO);
     } else {
@@ -59,7 +59,7 @@ void systemBeepToggle(void)
 
 void beeperInit(const beeperDevConfig_t *config)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperFrequency = config->frequency;
     if (beeperFrequency == 0) {
         beeperIO = IOGetByTag(config->ioTag);
diff --git a/src/main/drivers/sound_beeper.h b/src/main/drivers/sound_beeper.h
index 12ba74017e..b7e8396296 100644
--- a/src/main/drivers/sound_beeper.h
+++ b/src/main/drivers/sound_beeper.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 #define BEEP_TOGGLE              systemBeepToggle()
 #define BEEP_OFF                 systemBeep(false)
 #define BEEP_ON                  systemBeep(true)
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 8975fdd111..3ec77252c1 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -500,7 +500,7 @@ void changePidProfile(uint8_t pidProfileIndex)
 
 void beeperOffSet(uint32_t mask)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->beeper_off_flags |= mask;
 #else
     UNUSED(mask);
@@ -509,7 +509,7 @@ void beeperOffSet(uint32_t mask)
 
 void beeperOffSetAll(uint8_t beeperCount)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->beeper_off_flags = (1 << beeperCount) -1;
 #else
     UNUSED(beeperCount);
@@ -518,7 +518,7 @@ void beeperOffSetAll(uint8_t beeperCount)
 
 void beeperOffClear(uint32_t mask)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->beeper_off_flags &= ~(mask);
 #else
     UNUSED(mask);
@@ -527,14 +527,14 @@ void beeperOffClear(uint32_t mask)
 
 void beeperOffClearAll(void)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->beeper_off_flags = 0;
 #endif
 }
 
 uint32_t getBeeperOffMask(void)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     return beeperConfig()->beeper_off_flags;
 #else
     return 0;
@@ -543,7 +543,7 @@ uint32_t getBeeperOffMask(void)
 
 void setBeeperOffMask(uint32_t mask)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->beeper_off_flags = mask;
 #else
     UNUSED(mask);
@@ -552,7 +552,7 @@ void setBeeperOffMask(uint32_t mask)
 
 uint32_t getPreferredBeeperOffMask(void)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     return beeperConfig()->preferred_beeper_off_flags;
 #else
     return 0;
@@ -561,7 +561,7 @@ uint32_t getPreferredBeeperOffMask(void)
 
 void setPreferredBeeperOffMask(uint32_t mask)
 {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperConfigMutable()->preferred_beeper_off_flags = mask;
 #else
     UNUSED(mask);
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index ae78127915..8c9a1197b1 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -411,7 +411,7 @@ void init(void)
     }
 #endif
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperInit(beeperDevConfig());
 #endif
 /* temp until PGs are implemented. */
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 339b272bf2..369c607083 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -255,7 +255,7 @@ void fcTasksInit(void)
 
     setTaskEnabled(TASK_DISPATCH, dispatchIsEnabled());
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     setTaskEnabled(TASK_BEEPER, true);
 #endif
 #ifdef USE_GPS
@@ -437,7 +437,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
         .staticPriority = TASK_PRIORITY_HIGH,
     },
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     [TASK_BEEPER] = {
         .taskName = "BEEPER",
         .taskFunc = beeperUpdate,
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index c38010e42b..4969fe146c 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -2057,7 +2057,7 @@ static void cliFeature(char *cmdline)
     }
 }
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 static void printBeeper(uint8_t dumpMask, const beeperConfig_t *beeperConfig, const beeperConfig_t *beeperConfigDefault)
 {
     const uint8_t beeperCount = beeperTableEntryCount();
@@ -3162,7 +3162,7 @@ typedef struct {
 } cliResourceValue_t;
 
 const cliResourceValue_t resourceTable[] = {
-#ifdef BEEPER
+#ifdef USE_BEEPER
     { OWNER_BEEPER,        PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, ioTag), 0 },
 #endif
     { OWNER_MOTOR,         PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.ioTags[0]), MAX_SUPPORTED_MOTORS },
@@ -3557,7 +3557,7 @@ static void printConfig(char *cmdline, bool doDiff)
         cliPrintHashLine("feature");
         printFeature(dumpMask, &featureConfig_Copy, featureConfig());
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
         cliPrintHashLine("beeper");
         printBeeper(dumpMask, &beeperConfig_Copy, beeperConfig());
 #endif
@@ -3677,7 +3677,7 @@ static void cliHelp(char *cmdline);
 const clicmd_t cmdTable[] = {
     CLI_COMMAND_DEF("adjrange", "configure adjustment ranges", NULL, cliAdjustmentRange),
     CLI_COMMAND_DEF("aux", "configure modes", "<index> <mode> <aux> <start> <end> <logic>", cliAux),
-#ifdef BEEPER
+#ifdef USE_BEEPER
     CLI_COMMAND_DEF("beeper", "turn on/off beeper", "list\r\n"
         "\t<+|->[name]", cliBeeper),
 #endif
diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 0b2b20a0cc..8621c9e63b 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -471,7 +471,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
         sbufWriteU32(dst, featureMask());
         break;
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     case MSP_BEEPER_CONFIG:
         sbufWriteU32(dst, getBeeperOffMask());
         sbufWriteU8(dst, beeperConfig()->dshotBeaconTone);
@@ -1846,7 +1846,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
         featureSet(sbufReadU32(src)); // features bitmap
         break;
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     case MSP_SET_BEEPER_CONFIG:
         beeperOffClearAll();
         setBeeperOffMask(sbufReadU32(src));
diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index 18548c4a58..ff7d95fef6 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -524,7 +524,7 @@ const clivalue_t valueTable[] = {
     { "ibatv_offset",               VAR_INT16  | MASTER_VALUE, .config.minmax = { -16000, 16000 }, PG_CURRENT_SENSOR_VIRTUAL_CONFIG, offsetof(currentSensorVirtualConfig_t, offset) },
 #endif
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 // PG_BEEPER_DEV_CONFIG
     { "beeper_inversion",           VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, isInverted) },
     { "beeper_od",                  VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, isOpenDrain) },
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index ee2f10cc0f..f9cdbf17d9 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -57,8 +57,7 @@
 #define IS_INVERTED     false
 #endif
 
-#ifdef BEEPER
-#define BEEPER_PIN      BEEPER
+#ifdef USE_BEEPER
 #ifndef BEEPER_PWM_HZ
 #define BEEPER_PWM_HZ   0
 #endif
@@ -76,7 +75,7 @@
 #define BEEPER_COMMAND_REPEAT 0xFE
 #define BEEPER_COMMAND_STOP   0xFF
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 /* Beeper Sound Sequences: (Square wave generation)
  * Sequence must end with 0xFF or 0xFE. 0xFE repeats the sequence from
  * start when 0xFF stops the sound when it's completed.
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index 2ae60bd75f..77eebc2f79 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -425,11 +425,11 @@ void esc4wayProcess(serialPort_t *mspPort)
     port = mspPort;
 
     // Start here  with UART Main loop
-    #ifdef BEEPER
+#ifdef USE_BEEPER
     // fix for buzzer often starts beeping continuously when the ESCs are read
     // switch beeper silent here
     beeperSilence();
-    #endif
+#endif
     bool isExitScheduled = false;
 
     while (1) {
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index 0c2ad8735e..df3234abe0 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -173,7 +173,7 @@ void init(void)
 
     serialInit(false, SERIAL_PORT_NONE);
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
     beeperInit(beeperDevConfig());
 #endif
 /* temp until PGs are implemented. */
diff --git a/src/main/pg/beeper.c b/src/main/pg/beeper.c
index b02689fcd5..de5bd1e15f 100644
--- a/src/main/pg/beeper.c
+++ b/src/main/pg/beeper.c
@@ -17,7 +17,7 @@
 
 #include <platform.h>
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
diff --git a/src/main/pg/beeper_dev.c b/src/main/pg/beeper_dev.c
index ccccab5df3..3f7dc2ffae 100644
--- a/src/main/pg/beeper_dev.c
+++ b/src/main/pg/beeper_dev.c
@@ -17,7 +17,7 @@
 
 #include "platform.h"
 
-#ifdef BEEPER
+#ifdef USE_BEEPER
 
 #include "drivers/io.h"
 #include "pg/pg.h"
@@ -35,14 +35,12 @@ PG_REGISTER_WITH_RESET_TEMPLATE(beeperDevConfig_t, beeperDevConfig, PG_BEEPER_DE
 #define IS_INVERTED     false
 #endif
 
-#ifdef BEEPER
-#define BEEPER_PIN      BEEPER
 #ifndef BEEPER_PWM_HZ
 #define BEEPER_PWM_HZ   0
 #endif
-#else
+
+#ifndef BEEPER_PIN
 #define BEEPER_PIN      NONE
-#define BEEPER_PWM_HZ   0
 #endif
 
 PG_RESET_TEMPLATE(beeperDevConfig_t, beeperDevConfig,
diff --git a/src/main/scheduler/scheduler.h b/src/main/scheduler/scheduler.h
index b6f24a8dbb..b2bf59d56f 100644
--- a/src/main/scheduler/scheduler.h
+++ b/src/main/scheduler/scheduler.h
@@ -64,7 +64,7 @@ typedef enum {
     TASK_BATTERY_VOLTAGE,
     TASK_BATTERY_CURRENT,
     TASK_BATTERY_ALERTS,
-#ifdef BEEPER
+#ifdef USE_BEEPER
     TASK_BEEPER,
 #endif
 #ifdef USE_GPS
diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h
index 6af85e3e7f..3676d35adc 100644
--- a/src/main/target/AIR32/target.h
+++ b/src/main/target/AIR32/target.h
@@ -23,7 +23,8 @@
 
 #define LED0_PIN                PB5 // Blue LED - PB5
 
-#define BEEPER                  PA0
+#define USE_BEEPER
+#define BEEPER_PIN              PA0
 
 // MPU6050 interrupts
 #define USE_EXTI
diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h
index ed77d40798..45a91aa1e7 100644
--- a/src/main/target/AIRHEROF3/target.h
+++ b/src/main/target/AIRHEROF3/target.h
@@ -25,7 +25,8 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define BEEPER                  PA12
+#define USE_BEEPER
+#define BEEPER_PIN              PA12
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index ee79f66019..52d4d7ead5 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -25,7 +25,8 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define BEEPER                  PA12
+#define USE_BEEPER
+#define BEEPER_PIN              PA12
 
 #define USE_EXTI
 #define MAG_INT_EXTI            PC14
diff --git a/src/main/target/ALIENFLIGHTF3/hardware_revision.c b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
index 89dc02c8c8..33b467dc3c 100644
--- a/src/main/target/ALIENFLIGHTF3/hardware_revision.c
+++ b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
@@ -40,7 +40,7 @@ void detectHardwareRevision(void)
     IOInit(HWDetectPin, OWNER_SYSTEM, 0);
     IOConfigGPIO(HWDetectPin, IOCFG_IPU);
 
-    RXDetectPin = IOGetByTag(IO_TAG(BEEPER));
+    RXDetectPin = IOGetByTag(IO_TAG(BEEPER_PIN));
     IOInit(RXDetectPin, OWNER_SYSTEM, 0);
     IOConfigGPIO(RXDetectPin, IOCFG_IPU);
 
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index f61a54bdd3..676e25147a 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -36,7 +36,8 @@
 #define LED0_A                  PB8
 #define LED1_A                  PB9
 
-#define BEEPER                  PA5
+#define USE_BEEPER
+#define BEEPER_PIN              PA5
 
 #define USE_EXTI
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 94485a7111..1f2a15b645 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -28,7 +28,8 @@
 #define LED0_PIN                PC12
 #define LED1_PIN                PD2
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART2      PC15
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index a0637dee0e..d45fd3f403 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -28,7 +28,8 @@
 #define LED0_PIN                PC12
 #define LED1_PIN                PD2
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 // MPU interrupt
diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index cd0c7c3b25..361609dab7 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -57,7 +57,8 @@
 
 /* Lost Quad Mode and Alerts - RCX03-787 Low Voltage Active Buzzer
  */
-#define BEEPER                 PA2
+#define USE_BEEPER
+#define BEEPER_PIN             PA2
 #define BEEPER_INVERTED
 
 /* Serial Peripheral Interface (SPI) - Up to 50 Mbit/s on F7
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index 2e98e28b3e..7ad5dfba6b 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN   PB7
 #define LED1_PIN   PB6
 
-#define BEEPER   PB2 // Unused pin, can be mapped to elsewhere
+#define USE_BEEPER
+#define BEEPER_PIN PB2 // Unused pin, can be mapped to elsewhere
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN        PA4
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index 9478b34b67..0290e711de 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -26,7 +26,8 @@
 #define LED0_PIN   PB6  //red
 #define LED1_PIN   PB9  //blue
 
-#define BEEPER   PB2 // Unused pin, can be mapped to elsewhere
+#define USE_BEEPER
+#define BEEPER_PIN PB2 // Unused pin, can be mapped to elsewhere
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN        PA4
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index c1a887f59a..ad504de302 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -22,7 +22,8 @@
 
 #define LED0_PIN                PB4
 
-#define BEEPER                  PB3
+#define USE_BEEPER
+#define BEEPER_PIN              PB3
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h
index 7096ddfe52..bb139974be 100644
--- a/src/main/target/BETAFLIGHTF3/target.h
+++ b/src/main/target/BETAFLIGHTF3/target.h
@@ -23,7 +23,8 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 9e6312fca6..524d8ad4d9 100644
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -24,7 +24,8 @@
 
 #define LED0_PIN                PB5
 
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 
 // PC13 used as inverter select GPIO for UART2
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 98d0acba70..5e68018ab9 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -32,7 +32,8 @@
 #define LED1_PIN                PB5
 #define LED2_PIN                PB4
 
-#define BEEPER                  PC1
+#define USE_BEEPER
+#define BEEPER_PIN              PC1
 #define BEEPER_OPT              PB7
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 8f36a8e85e..399fdd8bd8 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -23,7 +23,8 @@
 
 #define INVERTER_PIN_UART1      PB2 // PB2 (BOOT1) used as inverter select GPIO
 
-#define BEEPER                  PA15
+#define USE_BEEPER
+#define BEEPER_PIN              PA15
 #define BEEPER_OPT              PA2
 
 #define USE_EXTI
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index 53112786f6..5f265b030d 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -29,7 +29,8 @@
 #define LED1_PIN                PE10  // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
-#define BEEPER                  PE9 // Red LEDs - PE9/PE13
+#define USE_BEEPER
+#define BEEPER_PIN              PE9 // Red LEDs - PE9/PE13
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index 4e9b7b7cd2..5c41e47b83 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -25,7 +25,7 @@
 #define LED1_PIN                PC13
 #define LED2_PIN                PC15
 
-#undef BEEPER
+#undef USE_BEEPER
 
 #define USE_GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 5717374ce7..d853b57273 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -24,7 +24,8 @@
 #endif
 
 #define LED0_PIN                  PB5
-#define BEEPER                    PB4
+#define USE_BEEPER
+#define BEEPER_PIN                PB4
 #define BEEPER_INVERTED
 #define BEEPER_PWM_HZ             3800 // Beeper PWM frequency in Hz
 
diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h
index 199506ff0d..21c9ce2d0f 100644
--- a/src/main/target/CLRACINGF7/target.h
+++ b/src/main/target/CLRACINGF7/target.h
@@ -21,7 +21,8 @@
 #define USBD_PRODUCT_STRING "CLRACINGF7"
 
 #define LED0_PIN                PB0
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 
 //define camera control
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index 95cbecfbf9..e675231f49 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -29,7 +29,8 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PC13
 
-#define BEEPER                  PC5
+#define USE_BEEPER
+#define BEEPER_PIN              PC5
 
 #define INVERTER_PIN_UART2      PB2 // PB2 used as inverter select GPIO
 
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index 9000ecbb76..c1466b9415 100644
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -28,7 +28,8 @@
 #define LED1_PIN                PC14
 #define LED2_PIN                PC13
 
-#define BEEPER                  PB13
+#define USE_BEEPER
+#define BEEPER_PIN              PB13
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/CRAZYFLIE2/target.h b/src/main/target/CRAZYFLIE2/target.h
index 6fac2460f5..1ebc537e83 100644
--- a/src/main/target/CRAZYFLIE2/target.h
+++ b/src/main/target/CRAZYFLIE2/target.h
@@ -113,7 +113,8 @@
 #if defined(CRAZYFLIE2BQ)
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define BEEPER                  PC12
+#define USE_BEEPER
+#define BEEPER_PIN              PC12
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index cf66a8901b..613c519a53 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -26,7 +26,8 @@
 //LED & BEE------------------------------- 
 #define LED0_PIN                PC14
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 //define camera control
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index 16fd7ff9a3..e3b70a01ef 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -28,7 +28,8 @@
 // tqfp48 pin 38
 #define LED2_PIN                PA15
 
-#define BEEPER                  PB2
+#define USE_BEEPER
+#define BEEPER_PIN              PB2
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/EACHIF3/target.h b/src/main/target/EACHIF3/target.h
index d370cc9e1c..0161577620 100644
--- a/src/main/target/EACHIF3/target.h
+++ b/src/main/target/EACHIF3/target.h
@@ -96,7 +96,7 @@
 
 
 #undef USE_SERVOS
-#undef BEEPER
+#undef USE_BEEPER
 
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 372f2edac2..0e673cb7b9 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -24,7 +24,8 @@
 #define LED1_PIN                PE2 // Red LED
 #define LED2_PIN                PE1 // Blue LED
 
-#define BEEPER                  PE5
+#define USE_BEEPER
+#define BEEPER_PIN              PE5
 
 #define INVERTER_PIN_UART6      PD3
 
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index fadf4ed651..88c76be58b 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -27,7 +27,8 @@
 /*---------------------------------*/
 
 /*------------BEEPER---------------*/
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 /*---------------------------------*/
 
diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h
index 374af873e7..b6ac849d50 100644
--- a/src/main/target/FF_PIKOBLX/target.h
+++ b/src/main/target/FF_PIKOBLX/target.h
@@ -38,7 +38,8 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PB5
 
-#define BEEPER                  PA0
+#define USE_BEEPER
+#define BEEPER_PIN              PA0
 #define BEEPER_INVERTED
 
 // MPU6000 interrupts
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index d24e2594df..3153cccb5c 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -35,7 +35,8 @@
 /*---------------------------------*/
 
 /*------------BEEPER---------------*/
-#define BEEPER                  PA14
+#define USE_BEEPER
+#define BEEPER_PIN              PA14
 #define BEEPER_INVERTED
 /*---------------------------------*/
 
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index eba5ab691e..b05179cf61 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN                PC13
 #define LED1_PIN                PC14
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC8
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index 417c0af2b8..ef5974150b 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -22,7 +22,8 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
 #define LED0_PIN                PB3
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index 2f70f89033..b03cd0edcc 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -20,7 +20,8 @@
 #define USE_TARGET_CONFIG
 
 #define LED0_PIN                PB5
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC8
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index c0fc7ae247..87ed2bf7b1 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -31,7 +31,8 @@
 
 #define LED0_PIN                PC14
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index a36e63e150..af43731fde 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -28,7 +28,8 @@
 #define LED0_PIN                PB5
 #define LED1_PIN                PB4
 
-#define BEEPER                  PA8
+#define USE_BEEPER
+#define BEEPER_PIN              PA8
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index 7965191edf..3da7203f4c 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN                PB5
 #define LED1_PIN                PB4
 
-#define BEEPER                  PD10
+#define USE_BEEPER
+#define BEEPER_PIN              PD10
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h
index fbeb28a193..7128acdbae 100644
--- a/src/main/target/IMPULSERCF3/target.h
+++ b/src/main/target/IMPULSERCF3/target.h
@@ -25,7 +25,8 @@
 
 #define LED0_PIN                PB7
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index 941a5d34a6..49b5d1f201 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -23,7 +23,8 @@
 
 #define LED0_PIN    PB3
 
-#define BEEPER      PC15
+#define USE_BEEPER
+#define BEEPER_PIN  PC15
 #define BEEPER_INVERTED
 
 
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 67a349abea..45a5b33f1f 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -30,7 +30,8 @@
 #define LED1_PIN                PB4
 #define LED2_PIN                PB6
 
-#define BEEPER                  PC9
+#define USE_BEEPER
+#define BEEPER_PIN              PC9
 #define BEEPER_INVERTED
 #define INVERTER_PIN_UART3      PB15
 
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index 078d5a374b..5ff7eab9a4 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -22,7 +22,8 @@
 
 #define LED0_PIN                PA2
 
-#define BEEPER                  PD15
+#define USE_BEEPER
+#define BEEPER_PIN              PD15
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index 6a01913a20..4c010a06eb 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -31,7 +31,8 @@
 
 #define LED0_PIN                PB1
 
-#define BEEPER                  PB13
+#define USE_BEEPER
+#define BEEPER_PIN              PB13
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/KISSFCV2F7/target.h b/src/main/target/KISSFCV2F7/target.h
index 98572eb862..3de1e024e2 100644
--- a/src/main/target/KISSFCV2F7/target.h
+++ b/src/main/target/KISSFCV2F7/target.h
@@ -29,7 +29,8 @@
 #define LED1   PC8 // blingbling
 #define LED1_INVERTED
 
-#define BEEPER   PC9
+#define USE_BEEPER
+#define BEEPER_PIN              PC9
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN          PB12
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index b8d25ae35d..8ba0cf4fc7 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -39,7 +39,8 @@
 #define LED1_PIN                PB4
 #endif
 
-#define BEEPER                  PA8
+#define USE_BEEPER
+#define BEEPER_PIN              PA8
 
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h
index 808bcd5348..cdafbde766 100644
--- a/src/main/target/KROOZX/target.h
+++ b/src/main/target/KROOZX/target.h
@@ -30,7 +30,8 @@
 #define LED0_PIN                PA14 // Red LED
 #define LED1_PIN                PA13 // Green LED
 
-#define BEEPER                  PC1
+#define USE_BEEPER
+#define BEEPER_PIN              PC1
 
 #define INVERTER_PIN_UART1      PB13
 #define INVERTER_PIN_UART6      PB12
diff --git a/src/main/target/LUMBAF3/target.h b/src/main/target/LUMBAF3/target.h
index 47b1b1f29c..ef84a7b977 100644
--- a/src/main/target/LUMBAF3/target.h
+++ b/src/main/target/LUMBAF3/target.h
@@ -20,7 +20,8 @@
 #define TARGET_BOARD_IDENTIFIER "MCF3" // LumbaF3 Flight Controller by mC
 
 #define LED0_PIN                PB3
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PA3
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index 9f31b3e206..e6f6756141 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -33,9 +33,11 @@
 #endif
 
 #ifdef LUXV2_RACE
-#define BEEPER                  PB9
+#define USE_BEEPER
+#define BEEPER_PIN              PB9
 #else
-#define BEEPER                  PB13
+#define USE_BEEPER
+#define BEEPER_PIN              PB13
 #endif
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index 8f83bde574..be38908f81 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -23,7 +23,8 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PA14
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h
index 5e4af36882..c4aeef1f49 100644
--- a/src/main/target/MATEKF411/target.h
+++ b/src/main/target/MATEKF411/target.h
@@ -23,7 +23,8 @@
 #define LED0_PIN                PC13
 #define LED1_PIN                PC14
 
-#define BEEPER                  PB2
+#define USE_BEEPER
+#define BEEPER_PIN              PB2
 #define BEEPER_INVERTED
 
 // *************** Gyro & ACC **********************
diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h
index 8efd0d0be9..7ea5c8f88c 100644
--- a/src/main/target/MATEKF411RX/target.h
+++ b/src/main/target/MATEKF411RX/target.h
@@ -22,7 +22,8 @@
 
 #define LED0_PIN                PC13
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h
index 5e2aa10269..0a6ab8eac3 100644
--- a/src/main/target/MATEKF722/target.h
+++ b/src/main/target/MATEKF722/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PA14
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 // *************** Gyro & ACC **********************
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 2e16f01373..6cc27d6ce9 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -22,7 +22,8 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define BEEPER                  PA12
+#define USE_BEEPER
+#define BEEPER_PIN              PA12
 
 #define BARO_XCLR_PIN           PC13
 #define BARO_EOC_PIN            PC14
diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h
index f5bcc72942..4db60465e5 100644
--- a/src/main/target/MIDELICF3/target.h
+++ b/src/main/target/MIDELICF3/target.h
@@ -21,7 +21,8 @@
 
 #define LED0_PIN                PB5
 
-#define BEEPER                  PC14
+#define USE_BEEPER
+#define BEEPER_PIN              PC14
 
 #define USE_GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index 7f9da25419..9173bb09f9 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -25,7 +25,8 @@
 #define LED0_PIN                PB5 // Blue LEDs - PB5
 //#define LED1_PIN                PB9 // Green LEDs - PB9
 
-#define BEEPER                  PA0
+#define USE_BEEPER
+#define BEEPER_PIN              PA0
 #define BEEPER_INVERTED
 
 // MPU6050 interrupts
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 2e87a354b0..0e6f6706dc 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -31,7 +31,8 @@
 #define LED0_PIN                PC3
 //#define LED1                    PC4
 
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN          PA4
diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h
index 48c0293dd2..5ed3e51f58 100644
--- a/src/main/target/MULTIFLITEPICO/target.h
+++ b/src/main/target/MULTIFLITEPICO/target.h
@@ -24,7 +24,8 @@
 
 #define LED0_PIN                PB3
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 467e904bd6..2762719239 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -29,7 +29,8 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define BEEPER                  PA12
+#define USE_BEEPER
+#define BEEPER_PIN              PA12
 
 #if defined(AFROMINI)
 #define BEEPER_INVERTED
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index ab39faa42d..79ccff945e 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -28,7 +28,8 @@
 #define LED1_PIN                PB5
 #define LED2_PIN                PB4
 
-#define BEEPER                  PC1
+#define USE_BEEPER
+#define BEEPER_PIN              PC1
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index e4484a11bc..75f30ba425 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -22,7 +22,8 @@
 
 #define LED0_PIN                PA4
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
 #define USE_DSHOT_DMAR
diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h
index 70cc6c2cfb..828b045fd7 100644
--- a/src/main/target/NUCLEOF446RE/target.h
+++ b/src/main/target/NUCLEOF446RE/target.h
@@ -22,7 +22,8 @@
 
 #define LED0_PIN                PA5  // Onboard LED
 
-//#define BEEPER                  PD12
+//#define USE_BEEPER
+//#define BEEPER_PIN                PD12
 
 #define USE_EXTI
 
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index bcdf35b8a8..8bb4f0663f 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN   PB7
 #define LED1_PIN   PB14
 
-#define BEEPER   PA0
+#define USE_BEEPER
+#define BEEPER_PIN PA0
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h
index 1eb0880813..647fa500f2 100644
--- a/src/main/target/NUCLEOF722/target.h
+++ b/src/main/target/NUCLEOF722/target.h
@@ -26,7 +26,8 @@
 #define LED0_PIN   PB7  // blue
 #define LED1_PIN   PB14 // red
 
-#define BEEPER   PA0
+#define USE_BEEPER
+#define BEEPER_PIN PA0
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index eb147051d7..012c656559 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -37,7 +37,8 @@
 
 #define LED0_PIN                PB3
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index a64e67562e..77aabc22bf 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -50,7 +50,8 @@
 
 #define LED0_PIN                PB5
 //#define LED1_PIN                PB4 // Remove this at the next major release
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 
 #if defined(OMNIBUSF4SD) || defined(DYSF4PRO)
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index eb653dcc6d..7e432cf74c 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -30,7 +30,9 @@
 
 //LED & BEEPER------------------------------
 #define LED0_PIN                PE0
-#define BEEPER                  PD15
+
+#define USE_BEEPER
+#define BEEPER_PIN              PD15
 #define BEEPER_INVERTED
 
 //CAMERA CONTROL----------------------------
diff --git a/src/main/target/PYRODRONEF4/target.h b/src/main/target/PYRODRONEF4/target.h
index 93e9904d5f..a211bc3a5f 100644
--- a/src/main/target/PYRODRONEF4/target.h
+++ b/src/main/target/PYRODRONEF4/target.h
@@ -18,7 +18,8 @@
 #define USBD_PRODUCT_STRING "PYRODRONEF4"
 
 #define LED0_PIN                  PB4
-#define BEEPER                    PB5
+#define USE_BEEPER
+#define BEEPER_PIN                PB5
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART1        PC3       // PC3 used as sBUS inverter select GPIO
diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h
index f2048915f7..f5c3093070 100644
--- a/src/main/target/RACEBASE/target.h
+++ b/src/main/target/RACEBASE/target.h
@@ -27,7 +27,8 @@
 #define LED1_PIN                PB4
 #define LED1_INVERTED
 
-#define BEEPER                  PA12
+#define USE_BEEPER
+#define BEEPER_PIN              PA12
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h
index ec1a06c605..ec8326aa2d 100644
--- a/src/main/target/RCEXPLORERF3/target.h
+++ b/src/main/target/RCEXPLORERF3/target.h
@@ -30,7 +30,8 @@
 #define LED0_PIN    PB4
 #define LED1_PIN    PB5
 
-#define BEEPER      PA0
+#define USE_BEEPER
+#define BEEPER_PIN  PA0
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 908221bddd..9a295bd55e 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -56,17 +56,21 @@
 
 // Disable LED1, conflicts with AirbotF4/Flip32F4/Revolt beeper
 #if defined(AIRBOTF4) || defined(AIRBOTF4SD)
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #define BEEPER_INVERTED
 #elif defined(REVOLT)
-#define BEEPER                  PB4
+#define USE_BEEPER
+#define BEEPER_PIN              PB4
 #elif defined(SOULF4)
-#define BEEPER                  PB6
+#define USE_BEEPER
+#define BEEPER_PIN              PB6
 #define BEEPER_INVERTED
 #else
 #define LED1_PIN                PB4
 // Leave beeper here but with none as io - so disabled unless mapped.
-#define BEEPER                  NONE
+#define USE_BEEPER
+#define BEEPER_PIN              NONE
 #endif
 
 #if defined(REVOLT)
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 1ad62c3532..2d98edafd1 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -26,7 +26,8 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PC13
 
-#define BEEPER                  PC13
+#define USE_BEEPER
+#define BEEPER_PIN              PC13
 
 #define MPU6500_CS_PIN          PB12
 #define MPU6500_SPI_INSTANCE    SPI2
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index b4db6cd6cf..21c0783819 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -22,7 +22,8 @@
 #define LED0_PIN                 PC1
 #define LED1_PIN                 PC0
 
-#define BEEPER                   PA8
+#define USE_BEEPER
+#define BEEPER_PIN               PA8
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN           PB2
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index c7f10d4612..6b5b308679 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -23,7 +23,8 @@
 
 #define LED0_PIN                PB3
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index d8cecfd725..00f4acb040 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -20,7 +20,8 @@
 #define TARGET_BOARD_IDENTIFIER "SIRF"
 
 #define LED0_PIN                PB2
-#define BEEPER                  PA1
+#define USE_BEEPER
+#define BEEPER_PIN              PA1
 
 
 #define USE_EXTI
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index e72e8a8596..e2edb881b6 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -24,7 +24,8 @@
 #define LED0_PIN                PB4  // Blue (Rev 1 & 2) - PB4
 #define LED1_PIN                PB5  // Green (Rev 1) / Red (Rev 2) - PB5
 
-#define BEEPER                  PA1
+#define USE_BEEPER
+#define BEEPER_PIN              PA1
 #define BEEPER_INVERTED
 
 // MPU6050 interrupts
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index f741205d47..da2b6b2326 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -27,7 +27,8 @@
 #define LED1_PIN                PB4
 #define LED2_PIN                PB6
 
-#define BEEPER                  PC9
+#define USE_BEEPER
+#define BEEPER_PIN              PC9
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC6
diff --git a/src/main/target/SPEKTRUMF400/target.h b/src/main/target/SPEKTRUMF400/target.h
index 0f5c2172a0..14942b15d5 100644
--- a/src/main/target/SPEKTRUMF400/target.h
+++ b/src/main/target/SPEKTRUMF400/target.h
@@ -22,7 +22,8 @@
 #define LED0_PIN                PA15
 #define LED1_PIN                PC8
 
-#define BEEPER                  PC2
+#define USE_BEEPER
+#define BEEPER_PIN              PC2
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index d173d6e9cb..8e1f74b574 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -37,7 +37,8 @@
 #define LED0_PIN                PB3
 #endif
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index b07209e34d..6a0672e037 100644
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -51,7 +51,8 @@
 
 #define LED0_PIN                PB8
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index 8f8d7b4027..c3eb727559 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -36,7 +36,8 @@
 #define LED0_PIN                PB3
 #endif
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index d44a505f5b..0246720e15 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -33,7 +33,8 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PB2
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index e62cc3a8be..6208a51457 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -28,7 +28,8 @@
 
 #define LED0_PIN                PA0
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART2      PB2
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index 9f3df4bed8..d390432993 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -39,7 +39,8 @@
     #define LED1_PIN                        PB2
 #endif
 
-#define BEEPER                              PC15
+#define USE_BEEPER
+#define BEEPER_PIN                          PC15
 #define BEEPER_INVERTED
 
 #if (SPRACINGF4NEO_REV >= 2)
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index 7670c647dd..d61a2e5402 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -40,7 +40,8 @@
 #define LED1_PIN                PE10 // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
-#define BEEPER                  PD12
+#define USE_BEEPER
+#define BEEPER_PIN              PD12
 #define BEEPER_PWM_HZ           2000  // Beeper PWM frequency in Hz
 
 #define USE_SPI
diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h
index 007fb20dd2..792d637373 100644
--- a/src/main/target/TINYFISH/target.h
+++ b/src/main/target/TINYFISH/target.h
@@ -25,7 +25,8 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PA13
 
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 2e20ee35ce..3bd1aa8863 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -23,7 +23,8 @@
 
 #define LED0_PIN PD14
 #define LED1_PIN PD15
-#define BEEPER PA0
+#define USE_BEEPER
+#define BEEPER_PIN PA0
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6 PD7
diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h
index 50586f2677..6639f9fb17 100644
--- a/src/main/target/WORMFC/target.h
+++ b/src/main/target/WORMFC/target.h
@@ -25,7 +25,8 @@
 #define LED1_PIN                PC14
 
 //BEEPER
-#define BEEPER                  PB14
+#define USE_BEEPER
+#define BEEPER_PIN              PB14
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index 2492c54dcc..c1b535a1a2 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -23,7 +23,8 @@
 
 
 #define LED0_PIN                PC14
-#define BEEPER                  PC15
+#define USE_BEEPER
+#define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
 #define USE_MAG_DATA_READY_SIGNAL
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 78121f5eb5..a07af040ce 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -30,7 +30,8 @@
 //define camera control
 #define CAMERA_CONTROL_PIN      PB7 // Camera control
 
-#define BEEPER                  PC9
+#define USE_BEEPER
+#define BEEPER_PIN              PC9
 #define BEEPER_OPT              PB14
 #define BEEPER_PWM_HZ           3150 // Beeper PWM frequency in Hz
 
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index 4169a06661..38ac0e8188 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -25,7 +25,8 @@
 //define camera control
 #define CAMERA_CONTROL_PIN      PB7
 
-#define BEEPER                  PB14
+#define USE_BEEPER
+#define BEEPER_PIN              PB14
 #define BEEPER_PWM_HZ           3150 // Beeper PWM frequency in Hz
 
 // Gyro interrupt
diff --git a/src/test/unit/target.h b/src/test/unit/target.h
index 5e1507664c..18209cb638 100644
--- a/src/test/unit/target.h
+++ b/src/test/unit/target.h
@@ -23,7 +23,7 @@
 #define USE_CMS
 #define CMS_MAX_DEVICE 4
 #define USE_FAKE_GYRO
-#define BEEPER
+#define USE_BEEPER
 #define USE_BLACKBOX
 #define USE_MAG
 #define USE_BARO