diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 5fb9bf9d37..0835c6f3a5 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -882,9 +882,9 @@ MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMe
   _prefs.gps_enabled = 0;       // GPS disabled by default
   _prefs.gps_interval = 0;      // No automatic GPS updates by default
   //_prefs.rx_delay_base = 10.0f;  enable once new algo fixed
-#if defined(USE_SX1262) || defined(USE_SX1268)
-#ifdef SX126X_RX_BOOSTED_GAIN
-  _prefs.rx_boosted_gain = SX126X_RX_BOOSTED_GAIN;
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
+#ifdef RX_BOOSTED_GAIN
+  _prefs.rx_boosted_gain = RX_BOOSTED_GAIN;
 #else
   _prefs.rx_boosted_gain = 1; // enabled by default
 #endif
diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index ca4cfad27d..bf60fe1bf0 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -911,11 +911,11 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
 
   _prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
 
-#if defined(USE_SX1262) || defined(USE_SX1268)
-#ifdef SX126X_RX_BOOSTED_GAIN
-  _prefs.rx_boosted_gain = SX126X_RX_BOOSTED_GAIN;
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
+#ifdef RX_BOOSTED_GAIN
+  _prefs.rx_boosted_gain = RX_BOOSTED_GAIN;
 #else
-  _prefs.rx_boosted_gain = 1; // enabled by default;
+  _prefs.rx_boosted_gain = 1; // enabled by default
 #endif
 #endif
   _prefs.radio_fem_rxgain = 1;
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
index c95e3e34b0..92beaccd18 100644
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -573,9 +573,9 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     strcpy(reply, _prefs->disable_fwd ? "OK - repeat is now OFF" : "OK - repeat is now ON");
   } else if (memcmp(config, "radio.rxgain ", 13) == 0) {
     bool enabled = memcmp(&config[13], "on", 2) == 0;
-    _prefs->rx_boosted_gain = enabled;
-    savePrefs();
     if (_callbacks->setRxBoostedGain(enabled)) {
+      _prefs->rx_boosted_gain = enabled;
+      savePrefs();
       strcpy(reply, "OK");
     } else {
       strcpy(reply, "Error: unsupported");
diff --git a/src/helpers/esp32/ESPNOWRadio.h b/src/helpers/esp32/ESPNOWRadio.h
index f474215a15..bda44a7ebb 100644
--- a/src/helpers/esp32/ESPNOWRadio.h
+++ b/src/helpers/esp32/ESPNOWRadio.h
@@ -38,7 +38,7 @@ class ESPNOWRadio : public mesh::Radio {
    * These two functions do nothing for ESP-NOW, but are needed for the
    * Radio interface.
    */
-  virtual bool setRxBoostedGainMode(bool) { }
+  virtual bool setRxBoostedGainMode(bool) { return false; }
   virtual bool getRxBoostedGainMode() const { return false; }
 
   uint32_t intID();
diff --git a/src/helpers/esp32/TBeamBoard.cpp b/src/helpers/esp32/TBeamBoard.cpp
index 5f708d71d9..de82df89ba 100644
--- a/src/helpers/esp32/TBeamBoard.cpp
+++ b/src/helpers/esp32/TBeamBoard.cpp
@@ -312,7 +312,7 @@ bool TBeamBoard::power_init()
 //           P_LORA_BUSY = 32;
 //           RADIO_CLASS = CustomSX1262;
 //           WRAPPER_CLASS = CustomSX1262Wrapper;
-//           SX126X_RX_BOOSTED_GAIN = true;
+//           RX_BOOSTED_GAIN = true;
 //           SX126X_CURRENT_LIMIT = 140;
 //           //delete radio;
 //           radio = NULL;
diff --git a/src/helpers/radiolib/CustomLLCC68.h b/src/helpers/radiolib/CustomLLCC68.h
index 82f886c324..5d8b62fc7c 100644
--- a/src/helpers/radiolib/CustomLLCC68.h
+++ b/src/helpers/radiolib/CustomLLCC68.h
@@ -62,8 +62,8 @@ class CustomLLCC68 : public LLCC68 {
   #ifdef SX126X_DIO2_AS_RF_SWITCH
       setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
   #endif
-  #ifdef SX126X_RX_BOOSTED_GAIN
-      setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+  #ifdef RX_BOOSTED_GAIN
+      setRxBoostedGainMode(RX_BOOSTED_GAIN);
   #endif
   #if defined(SX126X_RXEN) || defined(SX126X_TXEN)
     #ifndef SX1262X_RXEN
diff --git a/src/helpers/radiolib/CustomSX1262.h b/src/helpers/radiolib/CustomSX1262.h
index ad20122902..ae7a61900d 100644
--- a/src/helpers/radiolib/CustomSX1262.h
+++ b/src/helpers/radiolib/CustomSX1262.h
@@ -62,8 +62,8 @@ class CustomSX1262 : public SX1262 {
   #ifdef SX126X_DIO2_AS_RF_SWITCH
       setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
   #endif
-  #ifdef SX126X_RX_BOOSTED_GAIN
-      setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+  #ifdef RX_BOOSTED_GAIN
+      setRxBoostedGainMode(RX_BOOSTED_GAIN);
   #endif
   #if defined(SX126X_RXEN) || defined(SX126X_TXEN)
     #ifndef SX126X_RXEN
diff --git a/src/helpers/radiolib/CustomSX1268.h b/src/helpers/radiolib/CustomSX1268.h
index cc541e49f3..8beb3bea74 100644
--- a/src/helpers/radiolib/CustomSX1268.h
+++ b/src/helpers/radiolib/CustomSX1268.h
@@ -62,8 +62,8 @@ class CustomSX1268 : public SX1268 {
   #ifdef SX126X_DIO2_AS_RF_SWITCH
       setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
   #endif
-  #ifdef SX126X_RX_BOOSTED_GAIN
-      setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+  #ifdef RX_BOOSTED_GAIN
+      setRxBoostedGainMode(RX_BOOSTED_GAIN);
   #endif
   #if defined(SX126X_RXEN) || defined(SX126X_TXEN)
     #ifndef SX1262X_RXEN
diff --git a/src/helpers/radiolib/SX126xReset.h b/src/helpers/radiolib/SX126xReset.h
index 39ddb73eed..c794fccabc 100644
--- a/src/helpers/radiolib/SX126xReset.h
+++ b/src/helpers/radiolib/SX126xReset.h
@@ -25,8 +25,8 @@ inline void sx126xResetAGC(SX126x* radio) {
 #ifdef SX126X_DIO2_AS_RF_SWITCH
   radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-  radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#ifdef RX_BOOSTED_GAIN
+  radio->setRxBoostedGainMode(RX_BOOSTED_GAIN);
 #endif
 #ifdef SX126X_REGISTER_PATCH
   uint8_t r_data = 0;
diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini
index 15fe761ba5..34609e13d3 100644
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/ebyte_eora_s3>
 lib_deps =
diff --git a/variants/ebyte_eora_s3/target.cpp b/variants/ebyte_eora_s3/target.cpp
index 91d851ff3e..7fec9e5fb7 100644
--- a/variants/ebyte_eora_s3/target.cpp
+++ b/variants/ebyte_eora_s3/target.cpp
@@ -57,8 +57,8 @@ bool radio_init() {
 #ifdef SX126X_DIO2_AS_RF_SWITCH
   radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
-#ifdef SX126X_RX_BOOSTED_GAIN
-  radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#ifdef RX_BOOSTED_GAIN
+  radio.setRxBoostedGainMode(RX_BOOSTED_GAIN);
 #endif
 
   return true;  // success
diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini
index 2baac2561b..e4adf58744 100644
--- a/variants/gat562_30s_mesh_kit/platformio.ini
+++ b/variants/gat562_30s_mesh_kit/platformio.ini
@@ -17,7 +17,7 @@ build_flags = ${nrf52_base.build_flags}
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D PIN_BUZZER=33
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D SX126X_DIO2_AS_RF_SWITCH=true
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/gat562_30s_mesh_kit>
diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini
index b3e894174a..0eec966dd8 100644
--- a/variants/gat562_mesh_evb_pro/platformio.ini
+++ b/variants/gat562_mesh_evb_pro/platformio.ini
@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/gat562_mesh_evb_pro>
   +<helpers/ui/MomentaryButton.cpp>
diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini
index af153b8fc2..740153505a 100644
--- a/variants/gat562_mesh_tracker_pro/platformio.ini
+++ b/variants/gat562_mesh_tracker_pro/platformio.ini
@@ -14,7 +14,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/gat562_mesh_tracker_pro>
   +<helpers/ui/SSD1306Display.cpp>
diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini
index f3510b74aa..9b5f02d4b9 100644
--- a/variants/gat562_mesh_watch13/platformio.ini
+++ b/variants/gat562_mesh_watch13/platformio.ini
@@ -16,7 +16,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=19
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D QSPIFLASH=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/gat562_mesh_watch13>
diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini
index 0179d9658c..979dec847d 100644
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@@ -27,7 +27,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/heltec_ct62>
 
diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini
index 123edd91c4..a6d5ec09b6 100644
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BOARD_SDA=39
   -D PIN_BOARD_SCL=38
   -D DISP_CS=5
diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini
index c7cd5f21ea..9e740c21a0 100644
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BOARD_SDA=39
   -D PIN_BOARD_SCL=38
 build_src_filter = ${esp32_base.build_src_filter}
diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini
index bd0423228e..ecddd616e7 100644
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@@ -12,7 +12,7 @@ build_flags =  ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<../variants/heltec_mesh_solar>
diff --git a/variants/heltec_t096/platformio.ini b/variants/heltec_t096/platformio.ini
index e820bf58d3..80750d1404 100644
--- a/variants/heltec_t096/platformio.ini
+++ b/variants/heltec_t096/platformio.ini
@@ -28,7 +28,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_VEXT_EN=26   ; Vext is connected to VDD which is also connected to TFT & GPS
   -D PIN_VEXT_EN_ACTIVE=HIGH
   -D PIN_GPS_RX=25
diff --git a/variants/heltec_t1/variant.h b/variants/heltec_t1/variant.h
index 7ee2181615..db519ddc13 100644
--- a/variants/heltec_t1/variant.h
+++ b/variants/heltec_t1/variant.h
@@ -92,7 +92,7 @@
 #define SX126X_DIO2_AS_RF_SWITCH true
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 #define SX126X_CURRENT_LIMIT    140
-#define SX126X_RX_BOOSTED_GAIN  1
+#define RX_BOOSTED_GAIN  1
 
 #define P_LORA_DIO_1            SX126X_DIO1
 #define P_LORA_NSS              LORA_CS
diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini
index 135babb1a2..1fe63b1b1f 100644
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -28,7 +28,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_GPS_RX=39
   -D PIN_GPS_TX=37
   -D PIN_GPS_EN=21
diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini
index 411fee8518..64da3309b3 100644
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -25,7 +25,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BOARD_SDA=2
   -D PIN_BOARD_SCL=1
   -D PIN_TFT_SCL=38
diff --git a/variants/heltec_tower_v2/platformio.ini b/variants/heltec_tower_v2/platformio.ini
index f029b7d41f..313bb24342 100644
--- a/variants/heltec_tower_v2/platformio.ini
+++ b/variants/heltec_tower_v2/platformio.ini
@@ -14,7 +14,7 @@ build_flags = ${nrf52_base.build_flags}
   -D LORA_TX_POWER=12
   -D MAX_LORA_TX_POWER=22 ; Max SX1262 output -> ~29dBm at antenna
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/sensors>
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
index 69293d7070..5a1ae2c1f9 100644
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -41,7 +41,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/heltec_tracker>
 lib_deps =
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index d57c2113f0..8e32c8b3aa 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D SX126X_REGISTER_PATCH=1
   -D PIN_BOARD_SDA=6
   -D PIN_BOARD_SCL=17
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index a70a93a508..6245830299 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_GPS_RX=47
   -D PIN_GPS_TX=48
   -D PIN_GPS_EN=26
diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini
index fabf38272d..abfe5cca34 100644
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -32,7 +32,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true ; GC1109 CTX is controlled by SX1262 DIO2
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1      ; In some cases, commenting this out will improve RX
+  -D RX_BOOSTED_GAIN=1      ; In some cases, commenting this out will improve RX
   -D PIN_GPS_RX=38
   -D PIN_GPS_TX=39
   -D PIN_GPS_RESET=42
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index 48723d169a..2695f017fe 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -28,7 +28,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D DISP_CS=4
   -D DISP_BUSY=7
   -D DISP_DC=5
diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini
index 51b602e403..ed655d7a63 100644
--- a/variants/ikoka_handheld_nrf/platformio.ini
+++ b/variants/ikoka_handheld_nrf/platformio.ini
@@ -22,7 +22,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/ikoka_handheld_nrf>
   +<helpers/sensors>
diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini
index e72f83ce0d..700aa55810 100644
--- a/variants/ikoka_nano_nrf/platformio.ini
+++ b/variants/ikoka_nano_nrf/platformio.ini
@@ -23,7 +23,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_WIRE_SCL=5
   -D PIN_WIRE_SDA=4
   -UENV_INCLUDE_GPS
diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini
index 06e39e84c3..8f01933efe 100644
--- a/variants/ikoka_stick_nrf/platformio.ini
+++ b/variants/ikoka_stick_nrf/platformio.ini
@@ -24,7 +24,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_USER_BTN=0
   -D PIN_WIRE_SCL=7
   -D PIN_WIRE_SDA=6
diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini
index 27cf809e08..6280dd5853 100644
--- a/variants/keepteen_lt1/platformio.ini
+++ b/variants/keepteen_lt1/platformio.ini
@@ -9,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BOARD_SDA=34
   -D PIN_BOARD_SCL=36
   -D ENV_INCLUDE_GPS=1
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
index 54990117cc..da76b5d6d5 100644
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_t3s3>
 lib_deps =
diff --git a/variants/lilygo_t_impulse_plus/platformio.ini b/variants/lilygo_t_impulse_plus/platformio.ini
index 0ed5b9a42f..5e8c4a9637 100644
--- a/variants/lilygo_t_impulse_plus/platformio.ini
+++ b/variants/lilygo_t_impulse_plus/platformio.ini
@@ -10,7 +10,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_USER_BTN=-1
   ; -D PIN_USER_BTN=TTP223_KEY ; leave button disabled until screen implemented
   ; -D USER_BTN_PRESSED=HIGH
diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini
index c7a595520e..4858b0ddde 100644
--- a/variants/lilygo_tbeam_1w/platformio.ini
+++ b/variants/lilygo_tbeam_1w/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D SX126X_RXEN=21
   -D SX126X_DIO3_TCXO_VOLTAGE=3.0
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 
   ; TX power: 22dBm to SX1262, PA module adds ~10dB for 32dBm total
   -D LORA_TX_POWER=22
diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini
index 62ac09f875..b5ba7fe6b3 100644
--- a/variants/lilygo_tbeam_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_SX1262/platformio.ini
@@ -15,7 +15,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
index 0294615651..97c614873a 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -13,7 +13,7 @@ build_flags =
   -D P_LORA_MISO=19
   -D P_LORA_MOSI=27
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini
index 745d8ff53d..875bd713a5 100644
--- a/variants/lilygo_tdeck/platformio.ini
+++ b/variants/lilygo_tdeck/platformio.ini
@@ -17,7 +17,7 @@ build_flags =
   -D LORA_TX_POWER=22
   -D SX126X_DIO2_AS_RF_SWITCH=false
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8f
   -D P_LORA_DIO_1=45 ; LORA IRQ pin
   -D ENV_INCLUDE_GPS=1
diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini
index 5df77f95cb..3fb99a30d0 100644
--- a/variants/lilygo_techo/platformio.ini
+++ b/variants/lilygo_techo/platformio.ini
@@ -22,7 +22,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN
   -D DISABLE_DIAGNOSTIC_OUTPUT
   -D ENV_INCLUDE_GPS=1
diff --git a/variants/lilygo_techo_card/platformio.ini b/variants/lilygo_techo_card/platformio.ini
index 07bcebfe41..296c122f30 100644
--- a/variants/lilygo_techo_card/platformio.ini
+++ b/variants/lilygo_techo_card/platformio.ini
@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D HAS_NEOPIXEL=1
   -D HAS_TORCH=1
   -D DISABLE_DIAGNOSTIC_OUTPUT
diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini
index 4b5edf6918..49c39bb981 100644
--- a/variants/lilygo_techo_lite/platformio.ini
+++ b/variants/lilygo_techo_lite/platformio.ini
@@ -14,7 +14,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_POWER_EN=30
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN
   -D DISABLE_DIAGNOSTIC_OUTPUT
   -D ENV_INCLUDE_GPS=1
@@ -118,7 +118,7 @@ build_flags =
   -D SX126X_POWER_EN=30
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN
   -D DISABLE_DIAGNOSTIC_OUTPUT
   -D ENV_INCLUDE_GPS=1
@@ -162,7 +162,7 @@ build_flags =
   -D LORA_TX_POWER=22
   -D SX126X_POWER_EN=30
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN
   -D DISABLE_DIAGNOSTIC_OUTPUT
   -D ENV_INCLUDE_GPS=1
diff --git a/variants/lilygo_teth_elite/platformio.ini b/variants/lilygo_teth_elite/platformio.ini
index 97728f8b4c..192ba32215 100644
--- a/variants/lilygo_teth_elite/platformio.ini
+++ b/variants/lilygo_teth_elite/platformio.ini
@@ -25,7 +25,7 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=8
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_teth_elite>
 lib_deps =
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
index 3acfa7615d..8c81305c06 100644
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -22,7 +22,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
diff --git a/variants/m5stack_unit_c6l/platformio.ini b/variants/m5stack_unit_c6l/platformio.ini
index 94083eb486..9df1f76e1f 100644
--- a/variants/m5stack_unit_c6l/platformio.ini
+++ b/variants/m5stack_unit_c6l/platformio.ini
@@ -21,7 +21,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini
index 0d2a74adf5..ce351e8cfe 100644
--- a/variants/mesh_pocket/platformio.ini
+++ b/variants/mesh_pocket/platformio.ini
@@ -12,7 +12,7 @@ build_flags =  ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_SCALE_X=1.953125f
   -D EINK_SCALE_Y=1.28f
diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini
index f85be23885..03a0cd057c 100644
--- a/variants/meshadventurer/platformio.ini
+++ b/variants/meshadventurer/platformio.ini
@@ -22,7 +22,7 @@ build_flags =
   -D PIN_BOARD_SCL=22
   -D SX126X_DIO2_AS_RF_SWITCH=false
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_GPS_RX=12
   -D PIN_GPS_TX=15
   -D DISPLAY_CLASS=SSD1306Display
diff --git a/variants/meshtiny/platformio.ini b/variants/meshtiny/platformio.ini
index c5439c88f4..8cfb46a951 100644
--- a/variants/meshtiny/platformio.ini
+++ b/variants/meshtiny/platformio.ini
@@ -11,7 +11,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_3V3_EN=34
   -D MESHTINY
   -D UI_HAS_JOYSTICK
diff --git a/variants/muziworks_r1_neo/platformio.ini b/variants/muziworks_r1_neo/platformio.ini
index 3dbecf1e84..2e3d16f7d0 100644
--- a/variants/muziworks_r1_neo/platformio.ini
+++ b/variants/muziworks_r1_neo/platformio.ini
@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BUZZER=3
   -D PIN_USER_BTN=26
   -D USER_BTN_PRESSED=HIGH
diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini
index 3cdc29ffb1..55c2629b5f 100644
--- a/variants/nano_g2_ultra/platformio.ini
+++ b/variants/nano_g2_ultra/platformio.ini
@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_USER_BTN=38
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini
index 20f7dc2438..934ee31d4b 100644
--- a/variants/nibble_screen_connect/platformio.ini
+++ b/variants/nibble_screen_connect/platformio.ini
@@ -26,7 +26,7 @@ build_flags =
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/nibble_screen_connect>
 lib_deps =
diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index 5415e15861..596abda99f 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -9,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BOARD_SCL=7
   -D PIN_BOARD_SDA=8
   -D PIN_OLED_RESET=-1
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index ab820cf6a2..dd27514cfe 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -23,7 +23,7 @@ build_flags = ${rp2040_base.build_flags}
   -D P_LORA_TX_LED=24 ; green led = 23, blue led = 24
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
 ; Debug options
   ; -D DEBUG_RP2040_WIRE=1
diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini
index 9cd32c4b4d..7f1ea1263b 100644
--- a/variants/rak3112/platformio.ini
+++ b/variants/rak3112/platformio.ini
@@ -27,7 +27,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_GPS_RX=43
   -D PIN_GPS_TX=44
 ;  -D PIN_GPS_EN=26
diff --git a/variants/rak3401/platformio.ini b/variants/rak3401/platformio.ini
index 20a8a548b9..8c5488e9cf 100644
--- a/variants/rak3401/platformio.ini
+++ b/variants/rak3401/platformio.ini
@@ -11,7 +11,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D SX126X_REGISTER_PATCH=1       ; Patch register 0x8B5 for improved RX with SKY66122 FEM
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak3401>
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 2bbba31463..4291065cbd 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -21,7 +21,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D ENV_INCLUDE_RAK12035=1
   -UENV_INCLUDE_BME680
   -D ENV_INCLUDE_BME680_BSEC=1
diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini
index e9cddb74dd..a460b0afb0 100644
--- a/variants/rak_wismesh_tag/platformio.ini
+++ b/variants/rak_wismesh_tag/platformio.ini
@@ -21,7 +21,7 @@ build_flags = ${nrf52_base.build_flags}
   -D DISPLAY_CLASS=NullDisplayDriver
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_BUZZER=21
   -D PIN_BOARD_SDA=PIN_WIRE_SDA
   -D PIN_BOARD_SCL=PIN_WIRE_SCL
diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini
index 66c7b9f890..116e162c1e 100644
--- a/variants/rpi_picow/platformio.ini
+++ b/variants/rpi_picow/platformio.ini
@@ -17,7 +17,7 @@ build_flags = ${rp2040_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=130
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini
index effef38ccd..41e6ca5046 100644
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@@ -25,7 +25,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D ENV_INCLUDE_GPS=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 6432b52386..8c4455812a 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -28,7 +28,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=0 ; Default value when 'radio.rxgain' has not been set. Must be OFF for the Station G2, see:
+  -D RX_BOOSTED_GAIN=0 ; Default value when 'radio.rxgain' has not been set. Must be OFF for the Station G2, see:
 ;  https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance
   -D DISPLAY_CLASS=SH1106Display
 build_src_filter = ${esp32_base.build_src_filter}
@@ -111,7 +111,7 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
   -D MESH_PACKET_LOGGING=1
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 ;  https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
@@ -130,7 +130,7 @@ lib_deps =
 ;   -D ADMIN_PASSWORD='"password"'
 ;   -D MAX_NEIGHBOURS=50
 ;   -D MESH_PACKET_LOGGING=1
-;   -D SX126X_RX_BOOSTED_GAIN=1
+;   -D RX_BOOSTED_GAIN=1
 ;   -D WITH_RS232_BRIDGE=Serial2
 ;   -D WITH_RS232_BRIDGE_RX=5
 ;   -D WITH_RS232_BRIDGE_TX=6
@@ -153,7 +153,7 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
   -D MESH_PACKET_LOGGING=1
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D WITH_ESPNOW_BRIDGE=1
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_DEBUG=1
diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini
index b29388ef7e..d641804e44 100644
--- a/variants/station_g3_esp32/platformio.ini
+++ b/variants/station_g3_esp32/platformio.ini
@@ -32,7 +32,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=0
+  -D RX_BOOSTED_GAIN=0
   -D DISPLAY_CLASS=SH1106Display
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/station_g3_esp32>
diff --git a/variants/tenstar_c3/platformio.ini b/variants/tenstar_c3/platformio.ini
index e798882366..d49b873173 100644
--- a/variants/tenstar_c3/platformio.ini
+++ b/variants/tenstar_c3/platformio.ini
@@ -31,7 +31,7 @@ build_flags =
   ${Tenstar_esp32_C3.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D ADVERT_NAME='"Tenstar C3 Repeater"'
   -D ADVERT_LAT=0.0
@@ -53,7 +53,7 @@ lib_deps =
 ;   ${Tenstar_esp32_C3.build_flags}
 ;   -D RADIO_CLASS=CustomSX1262
 ;   -D WRAPPER_CLASS=CustomSX1262Wrapper
-;   -D SX126X_RX_BOOSTED_GAIN=1
+;   -D RX_BOOSTED_GAIN=1
 ;   -D LORA_TX_POWER=22
 ;   -D ADVERT_NAME='"RS232 Bridge"'
 ;   -D ADVERT_LAT=0.0
@@ -79,7 +79,7 @@ build_flags =
   ${Tenstar_esp32_C3.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D ADVERT_NAME='"ESPNow Bridge"'
   -D ADVERT_LAT=0.0
diff --git a/variants/thinknode_m1/platformio.ini b/variants/thinknode_m1/platformio.ini
index 356edfee69..7d2bfdae4e 100644
--- a/variants/thinknode_m1/platformio.ini
+++ b/variants/thinknode_m1/platformio.ini
@@ -21,7 +21,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D P_LORA_TX_LED=13
 build_src_filter = ${nrf52_base.build_src_filter}
diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini
index aae83324e3..940d5a00c3 100644
--- a/variants/thinknode_m2/platformio.ini
+++ b/variants/thinknode_m2/platformio.ini
@@ -29,7 +29,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D MESH_DEBUG=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/ui/SH1106Display.cpp>
diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini
index 8572d1ebe0..75e40374fb 100644
--- a/variants/thinknode_m5/platformio.ini
+++ b/variants/thinknode_m5/platformio.ini
@@ -36,7 +36,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D MESH_DEBUG=1
   -D ENV_INCLUDE_GPS=1
   -D PERSISTANT_GPS=1
diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini
index 6fe9043668..5e8c761a8a 100644
--- a/variants/thinknode_m6/platformio.ini
+++ b/variants/thinknode_m6/platformio.ini
@@ -22,7 +22,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=3.3
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D P_LORA_TX_LED=PIN_LED_BLUE
 ;  -D PERSISTANT_GPS=1
diff --git a/variants/waveshare_rp2040_lora/platformio.ini b/variants/waveshare_rp2040_lora/platformio.ini
index 7dfe14012d..4d7273ef68 100644
--- a/variants/waveshare_rp2040_lora/platformio.ini
+++ b/variants/waveshare_rp2040_lora/platformio.ini
@@ -22,7 +22,7 @@ build_flags = ${rp2040_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_RXEN=17
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
 ; Debug options
   ; -D DEBUG_RP2040_WIRE=1
diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini
index 2c74baded3..4c9fa50b1f 100644
--- a/variants/wio-tracker-l1-eink/platformio.ini
+++ b/variants/wio-tracker-l1-eink/platformio.ini
@@ -14,7 +14,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_OLED_RESET=-1
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_SCALE_X=1.953125f
diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini
index 7bb175bb9a..512643b9ff 100644
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@@ -13,7 +13,7 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_OLED_RESET=-1
   -D GPS_BAUD_RATE=9600
 build_src_filter = ${nrf52_base.build_src_filter}
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index c0e8458d0e..7bd3685817 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -15,7 +15,7 @@ build_flags =
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D SX126X_RXEN=D5
   -D SX126X_DIO2_AS_RF_SWITCH=true
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index 9f504b8ed0..e9ed50f013 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -21,7 +21,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
@@ -88,7 +88,7 @@ build_flags =
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D USE_XIAO_ESP32C6_EXTERNAL_ANTENNA=1
 
 [env:Meshimi_repeater_]
diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini
index a085433688..fd4ede3879 100644
--- a/variants/xiao_nrf52/platformio.ini
+++ b/variants/xiao_nrf52/platformio.ini
@@ -25,7 +25,7 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO2_AS_RF_SWITCH=1
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D PIN_WIRE_SCL=D6
   -D PIN_WIRE_SDA=D7
   -D PIN_USER_BTN=PIN_BUTTON1
diff --git a/variants/xiao_rp2040/platformio.ini b/variants/xiao_rp2040/platformio.ini
index ca00e38b57..32bc782d29 100644
--- a/variants/xiao_rp2040/platformio.ini
+++ b/variants/xiao_rp2040/platformio.ini
@@ -17,7 +17,7 @@ build_flags = ${rp2040_base.build_flags}
   -D SX126X_TXEN=RADIOLIB_NC
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
 ; Debug options
   ; -D DEBUG_RP2040_WIRE=1
diff --git a/variants/xiao_s3/platformio.ini b/variants/xiao_s3/platformio.ini
index 22464e7d80..4c50a1feb0 100644
--- a/variants/xiao_s3/platformio.ini
+++ b/variants/xiao_s3/platformio.ini
@@ -28,7 +28,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/xiao_s3>
   +<helpers/sensors>
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index db8c5a9486..51b1a1e2b7 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -28,7 +28,7 @@ build_flags = ${esp32_base.build_flags}
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
+  -D RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/xiao_s3_wio>
   +<helpers/sensors>