diff --git a/Makefile b/Makefile
index bac23fd..c5b755f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ENABLE_FEAT_F4HWN_SLEEP         ?= 1
 ENABLE_FEAT_F4HWN_RESTORE_SCAN  ?= 1
 ENABLE_FEAT_F4HWN_NARROWER      ?= 1
 ENABLE_FEAT_F4HWN_CONTRAST      ?= 1
-ENABLE_FEAT_F4HWN_MENU_LOCK     ?= 0
+ENABLE_FEAT_F4HWN_RESCUE_OPS    ?= 0
 ENABLE_FEAT_F4HWN_VOL           ?= 0
 ENABLE_FEAT_F4HWN_RESET_CHANNEL ?= 0
 ENABLE_FEAT_F4HWN_PMR           ?= 0
@@ -443,8 +443,8 @@ endif
 ifeq ($(ENABLE_FEAT_F4HWN_CONTRAST),1)
 	CFLAGS  += -DENABLE_FEAT_F4HWN_CONTRAST
 endif
-ifneq ($(filter $(ENABLE_FEAT_F4HWN_MENU_LOCK),1 2),)
-	CFLAGS  += -DENABLE_FEAT_F4HWN_MENU_LOCK=$(ENABLE_FEAT_F4HWN_MENU_LOCK)
+ifneq ($(filter $(ENABLE_FEAT_F4HWN_RESCUE_OPS),1 2),)
+	CFLAGS  += -DENABLE_FEAT_F4HWN_RESCUE_OPS=$(ENABLE_FEAT_F4HWN_RESCUE_OPS)
 endif
 ifeq ($(ENABLE_FEAT_F4HWN_VOL),1)
 	CFLAGS  += -DENABLE_FEAT_F4HWN_VOL
diff --git a/app/action.c b/app/action.c
index 222fbcd..c2593b0 100644
--- a/app/action.c
+++ b/app/action.c
@@ -110,7 +110,7 @@ void (*action_opt_table[])(void) = {
     [ACTION_OPT_MAINONLY] = &ACTION_MainOnly,
     [ACTION_OPT_PTT] = &ACTION_Ptt,
     [ACTION_OPT_WN] = &ACTION_Wn,
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         [ACTION_OPT_POWER_HIGH] = &ACTION_Power_High,
     #endif
     [ACTION_OPT_BACKLIGHT] = &ACTION_BackLight,
@@ -617,7 +617,7 @@ void ACTION_BackLightOnDemand(void)
     BACKLIGHT_TurnOn();
 }
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     void ACTION_Power_High(void)
     {
         if(gEeprom.MENU_LOCK == true) // RO is active
diff --git a/app/action.h b/app/action.h
index 7131c17..2d3689d 100644
--- a/app/action.h
+++ b/app/action.h
@@ -42,7 +42,7 @@ void ACTION_SwitchDemodul(void);
     void ACTION_Wn(void);
     void ACTION_BackLightOnDemand(void);
     void ACTION_BackLight(void);
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         void ACTION_Power_High(void);
     #endif
 #endif
diff --git a/app/app.c b/app/app.c
index 4031202..1307dc2 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1398,7 +1398,7 @@ void APP_TimeSlice10ms(void)
         return;
 #endif
 
-#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK)
+#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
     #ifdef ENABLE_FLASHLIGHT
         FlashlightTimeSlice();
     #endif
diff --git a/app/flashlight.c b/app/flashlight.c
index fad618b..30b8881 100644
--- a/app/flashlight.c
+++ b/app/flashlight.c
@@ -5,7 +5,7 @@
 
 #include "flashlight.h"
 
-#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK)
+#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
     enum FlashlightMode_t  gFlashLightState;
 
     void FlashlightTimeSlice()
diff --git a/app/flashlight.h b/app/flashlight.h
index feca80a..79fe986 100644
--- a/app/flashlight.h
+++ b/app/flashlight.h
@@ -5,7 +5,7 @@
 
 #include <stdint.h>
 
-#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_MENU_LOCK)
+#if !defined(ENABLE_FEAT_F4HWN) || defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
     enum FlashlightMode_t {
         FLASHLIGHT_OFF = 0,
         FLASHLIGHT_ON,
diff --git a/app/main.c b/app/main.c
index 9fcce58..2c1f7e0 100644
--- a/app/main.c
+++ b/app/main.c
@@ -84,7 +84,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 {
     uint8_t Vfo = gEeprom.TX_VFO;
 
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if(gEeprom.MENU_LOCK == true) {
         return; // prevent F function if MENU LOCK is true
     }
@@ -686,7 +686,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
                 return;
             }
 
-            #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+            #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             if(gEeprom.MENU_LOCK == false) {
             #endif
 
@@ -696,7 +696,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
                 gAnotherVoiceID   = VOICE_ID_MENU;
             #endif
 
-            #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+            #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             }
             #endif
         }
@@ -709,7 +709,7 @@ static void MAIN_Key_MENU(bool bKeyPressed, bool bKeyHeld)
 static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 {
 
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if(gEeprom.MENU_LOCK == true) {
         return; // prevent F function if MENU LOCK is true
     }
diff --git a/app/menu.c b/app/menu.c
index 03e7252..fed8bf5 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -432,7 +432,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
                 *pMax = 63;
                 break;
         #endif
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             case MENU_SET_KEY:
                 //*pMin = 0;
                 *pMax = 4;
@@ -951,7 +951,7 @@ void MENU_AcceptSetting(void)
                 gEeprom.VOLUME_GAIN = gSubMenuSelection;
                 break;
         #endif
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             case MENU_SET_KEY:
                 gEeprom.SET_KEY = gSubMenuSelection;
                 break;
@@ -1402,7 +1402,7 @@ void MENU_ShowCurrentSetting(void)
                 gSubMenuSelection = gEeprom.VOLUME_GAIN;
                 break;
         #endif
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             case MENU_SET_KEY:
                 gSubMenuSelection = gEeprom.SET_KEY;
                 break;
diff --git a/bitmaps.c b/bitmaps.c
index c6e7a66..305ab8f 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -78,7 +78,7 @@ const uint8_t gFontDWR[3][6] =
     {0x00, 0x7f, 0x9, 0x19, 0x29, 0x46},
 };
 
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     const uint8_t gFontRO[2][6] =
     {   // "RO"
         {0x00, 0x7f, 0x9, 0x19, 0x29, 0x46},
diff --git a/bitmaps.h b/bitmaps.h
index 64b6ca2..040b997 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -16,7 +16,7 @@ extern const uint8_t gFontLight[9];
 extern const uint8_t gFontXB[2][6];
 extern const uint8_t gFontMO[2][6];
 extern const uint8_t gFontDWR[3][6];
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     extern const uint8_t gFontRO[2][6];
 #endif
 extern const uint8_t gFontHold[2][5];
diff --git a/compile-with-docker.sh b/compile-with-docker.sh
index 6e69a04..09d410b 100755
--- a/compile-with-docker.sh
+++ b/compile-with-docker.sh
@@ -31,7 +31,7 @@ bandscope() {
         ENABLE_FMRADIO=0 \
         ENABLE_AIRCOPY=1 \
         ENABLE_NOAA=0 \
-        ENABLE_FEAT_F4HWN_MENU_LOCK=0 \
+        ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Bandscope \
         TARGET=f4hwn.bandscope \
         && cp f4hwn.bandscope* compiled-firmware/"
@@ -45,7 +45,7 @@ broadcast() {
         ENABLE_AIRCOPY=1 \
         ENABLE_NOAA=0 \
         EDITION_STRING=Broadcast \
-        ENABLE_FEAT_F4HWN_MENU_LOCK=0 \
+        ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         TARGET=f4hwn.broadcast \
         && cp f4hwn.broadcast* compiled-firmware/"
 }
@@ -63,7 +63,7 @@ voxless() {
         ENABLE_FEAT_F4HWN_RESTORE_SCAN=0 \
         ENABLE_FEAT_F4HWN_CHARGING_C=0 \
         ENABLE_FEAT_F4HWN_NARROWER=0 \
-        ENABLE_FEAT_F4HWN_MENU_LOCK=0 \
+        ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
         EDITION_STRING=Voxless \
         TARGET=f4hwn.voxless \
         && cp f4hwn.voxless* compiled-firmware/"
@@ -76,7 +76,7 @@ rescueops() {
         ENABLE_FMRADIO=0 \
         ENABLE_AIRCOPY=1 \
         ENABLE_NOAA=1 \
-        ENABLE_FEAT_F4HWN_MENU_LOCK=1 \
+        ENABLE_FEAT_F4HWN_RESCUE_OPS=1 \
         EDITION_STRING=RescueOps \
         TARGET=f4hwn.rescueops \
         && cp f4hwn.rescueops* compiled-firmware/"
diff --git a/helper/boot.c b/helper/boot.c
index 049cc40..c54f241 100644
--- a/helper/boot.c
+++ b/helper/boot.c
@@ -44,7 +44,7 @@ BOOT_Mode_t BOOT_GetMode(void)
         SYSTEM_DelayMs(20);
     }
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if (Keys[0] == (10 + gEeprom.SET_KEY))
     {
         return BOOT_MODE_MENU_LOCK;  // Secret KEY pressed
diff --git a/helper/boot.h b/helper/boot.h
index 3222d40..1954802 100644
--- a/helper/boot.h
+++ b/helper/boot.h
@@ -24,7 +24,7 @@ enum BOOT_Mode_t
 {
     BOOT_MODE_NORMAL = 0,
     BOOT_MODE_F_LOCK,
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         BOOT_MODE_MENU_LOCK,
     #endif
     #ifdef ENABLE_AIRCOPY
diff --git a/main.c b/main.c
index 3253976..e60d87a 100644
--- a/main.c
+++ b/main.c
@@ -131,7 +131,7 @@ void Main(void)
 
     BOOT_Mode_t  BootMode = BOOT_GetMode();
 
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if (BootMode == BOOT_MODE_MENU_LOCK)
     {
         gEeprom.MENU_LOCK = !gEeprom.MENU_LOCK;
@@ -147,7 +147,7 @@ void Main(void)
     }
 #endif
 
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if (BootMode == BOOT_MODE_F_LOCK && gEeprom.MENU_LOCK == true)
     {
         BootMode = BOOT_MODE_NORMAL;
@@ -170,7 +170,7 @@ void Main(void)
             #ifdef ENABLE_NOAA
                 gMenuCursor += 1; // move to hidden section, fix me if change... !!!
             #endif
-            #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+            #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                 gMenuCursor += 1; // move to hidden section, fix me if change... !!!
             #endif
             gSubMenuSelection = gSetting_F_LOCK;
diff --git a/misc.c b/misc.c
index 615b573..ad7f759 100644
--- a/misc.c
+++ b/misc.c
@@ -137,7 +137,7 @@ enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
     uint8_t       crc[15] = { 0 };
     uint8_t       lErrorsDuringAirCopy = 0;
     uint8_t       gAircopyStep = 0;
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         bool          gResetPower = false;
         uint8_t       gInitialPower = 0;
     #endif
diff --git a/misc.h b/misc.h
index 1a3dc05..31340da 100644
--- a/misc.h
+++ b/misc.h
@@ -190,7 +190,7 @@ extern enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
     extern uint8_t            crc[15];
     extern uint8_t            lErrorsDuringAirCopy;
     extern uint8_t            gAircopyStep;
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         extern bool               gResetPower;
         extern uint8_t            gInitialPower;
     #endif
diff --git a/radio.c b/radio.c
index dd04934..44e5793 100644
--- a/radio.c
+++ b/radio.c
@@ -160,7 +160,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, const uint8_t ChannelSave, const uint32_t
 void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure)
 {
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         if(configure == VFO_CONFIGURE_RELOAD)
         {
             gResetPower = true;
@@ -437,7 +437,7 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
 
     RADIO_ConfigureSquelchAndOutputPower(pVfo);
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         if(gEeprom.MENU_LOCK && gResetPower) // RO is active
         {
             gInitialPower = pVfo->OUTPUT_POWER;
diff --git a/settings.c b/settings.c
index d54cf7b..d140979 100644
--- a/settings.c
+++ b/settings.c
@@ -51,7 +51,7 @@ void SETTINGS_InitEEPROM(void)
     #ifdef ENABLE_NOAA
         gEeprom.NOAA_AUTO_SCAN   = (Data[3] <  2) ? Data[3] : false;
     #endif
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         gEeprom.KEY_LOCK = (Data[4] & 0x01) != 0;
         gEeprom.MENU_LOCK = (Data[4] & 0x02) != 0;
         gEeprom.SET_KEY = ((Data[4] >> 2) & 0x0F) > 4 ? 0 : (Data[4] >> 2) & 0x0F;
@@ -597,7 +597,7 @@ void SETTINGS_SaveSettings(void)
         State[3] = false;
     #endif
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         State[4] = (gEeprom.KEY_LOCK ? 0x01 : 0) | (gEeprom.MENU_LOCK ? 0x02 :0) | ((gEeprom.SET_KEY & 0x0F) << 2);
     #else
         State[4] = gEeprom.KEY_LOCK;
@@ -999,7 +999,7 @@ State[1] = 0
 #ifdef ENABLE_SPECTRUM
     | (1 << 5)
 #endif
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     | (1 << 6)
 #endif
 ;
diff --git a/settings.h b/settings.h
index f930d8c..9681429 100644
--- a/settings.h
+++ b/settings.h
@@ -117,7 +117,7 @@ enum ACTION_OPT_t {
     ACTION_OPT_PTT,
     ACTION_OPT_WN,
     ACTION_OPT_BACKLIGHT,
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         ACTION_OPT_POWER_HIGH,
     #endif
 #endif
@@ -189,7 +189,7 @@ typedef struct {
 #ifdef ENABLE_FEAT_F4HWN
     bool                  KEY_LOCK_PTT;
 #endif
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     bool                  MENU_LOCK;
     uint8_t               SET_KEY;
 #endif
diff --git a/ui/main.c b/ui/main.c
index 1178f14..d99753e 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -892,7 +892,7 @@ void UI_DisplayMain(void)
             if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num]))
             {   // it's a channel
 
-                #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                     if(gEeprom.MENU_LOCK == false) {
                 #endif
                 uint8_t countList = 0;
@@ -934,7 +934,7 @@ void UI_DisplayMain(void)
                     memcpy(p_line0 + 127 - (1 * 6), BITMAP_ScanListE, sizeof(BITMAP_ScanListE));
                 }
 
-                #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                 {
                     }
                 }
@@ -1457,7 +1457,7 @@ void UI_DisplayMain(void)
     }
 
 #ifdef ENABLE_FEAT_F4HWN
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     if(gEeprom.MENU_LOCK == false)
     {
     #endif
@@ -1470,7 +1470,7 @@ void UI_DisplayMain(void)
             gFrameBuffer[6][i] ^= 0x7F;
         }
     }
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     }
     #endif
 #endif
diff --git a/ui/menu.c b/ui/menu.c
index a9568a9..276c28f 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -158,7 +158,7 @@ const t_menu_item MenuList[] =
 #ifdef ENABLE_FEAT_F4HWN_VOL
     {"SetVol",      MENU_SET_VOL       },
 #endif
-#ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
     {"SetKey",      MENU_SET_KEY       },
 #endif
 #endif
@@ -401,7 +401,7 @@ const char gSubMenu_SCRAMBLER[][7] =
         };
     #endif
 
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         const char gSubMenu_SET_KEY[][9] =
         {
             "KEY_MENU",
@@ -446,7 +446,7 @@ const t_sidefunction gSubMenu_SIDEFUNCTIONS[] =
     {"MAIN ONLY",       ACTION_OPT_MAINONLY},
     {"PTT",             ACTION_OPT_PTT},
     {"WIDE\nNARROW",    ACTION_OPT_WN},
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         {"POWER\nHIGH",    ACTION_OPT_POWER_HIGH},
     #endif
 #endif
@@ -1083,7 +1083,7 @@ void UI_DisplayMenu(void)
                 break;
         #endif
 
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             case MENU_SET_KEY:
                 strcpy(String, gSubMenu_SET_KEY[gSubMenuSelection]);
                 break;                
@@ -1141,7 +1141,7 @@ void UI_DisplayMenu(void)
                     UI_PrintStringSmallNormal("Bandscope", 54, 127, 6);
                 #elif defined(ENABLE_FMRADIO)
                     UI_PrintStringSmallNormal("Broadcast", 54, 127, 6);
-                #elif defined(ENABLE_FEAT_F4HWN_MENU_LOCK)
+                #elif defined(ENABLE_FEAT_F4HWN_RESCUE_OPS)
                     UI_PrintStringSmallNormal("RescueOps", 54, 127, 6);
                 #endif
 
diff --git a/ui/menu.h b/ui/menu.h
index 5379204..abe6e90 100644
--- a/ui/menu.h
+++ b/ui/menu.h
@@ -147,7 +147,7 @@ enum
     #ifdef ENABLE_FEAT_F4HWN_VOL
         MENU_SET_VOL,
     #endif
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         MENU_SET_KEY,
     #endif
 #endif
@@ -190,7 +190,7 @@ extern const char        gSubMenu_D_RSP[4][11];
     #ifdef ENABLE_FEAT_F4HWN_NARROWER
         extern const char    gSubMenu_SET_NFM[2][9];
     #endif
-    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
         extern const char gSubMenu_SET_KEY[][9];
     #endif
 #endif
diff --git a/ui/status.c b/ui/status.c
index 3845eed..d55bef0 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -154,7 +154,7 @@ void UI_DisplayStatus()
             else
         #endif
             {
-                #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                 if(gEeprom.MENU_LOCK == true) {
                     memcpy(line + x + 2, gFontRO, sizeof(gFontRO));
                 }
@@ -175,7 +175,7 @@ void UI_DisplayStatus()
                     {
                         memcpy(line + x + 2, gFontMO, sizeof(gFontMO));
                     }
-                #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                 }
                 #endif
             }
@@ -213,7 +213,7 @@ void UI_DisplayStatus()
         memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock));
     }
     else if (gWasFKeyPressed) {
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
             if(gEeprom.MENU_LOCK == false) {
                 memcpy(line + x + 1, gFontF, sizeof(gFontF));
             }
diff --git a/ui/welcome.c b/ui/welcome.c
index fcc65ab..85ebcbf 100644
--- a/ui/welcome.c
+++ b/ui/welcome.c
@@ -134,8 +134,8 @@ void UI_DisplayWelcome(void)
         UI_PrintStringSmallNormal(WelcomeString3, 0, 127, 6);
 
         /*
-        #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
-            #if ENABLE_FEAT_F4HWN_MENU_LOCK > 1
+        #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
+            #if ENABLE_FEAT_F4HWN_RESCUE_OPS > 1
                 UI_PrintStringSmallNormal(Edition, 18, 0, 6);
                 if(gEeprom.MENU_LOCK == true) {
                     memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -148,7 +148,7 @@ void UI_DisplayWelcome(void)
                 UI_PrintStringSmallNormal(Edition, 18, 0, 5);
                 memcpy(gFrameBuffer[5] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
                 
-                #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                     UI_PrintStringSmallNormal("RescueOps", 18, 0, 6);
                     if(gEeprom.MENU_LOCK == true) {
                         memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -174,7 +174,7 @@ void UI_DisplayWelcome(void)
                     UI_PrintStringSmallNormal("Bandscope  ", 0, 127, 5);
                     memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));
 
-                    #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+                    #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                         UI_PrintStringSmallNormal("RescueOps  ", 0, 127, 6);
                         if(gEeprom.MENU_LOCK == true) {
                             memcpy(gFrameBuffer[6] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));
@@ -184,7 +184,7 @@ void UI_DisplayWelcome(void)
                     #endif
             #endif
         #else
-            #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
+            #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
                 UI_PrintStringSmallNormal("RescueOps  ", 0, 127, 5);
                 if(gEeprom.MENU_LOCK == true) {
                     memcpy(gFrameBuffer[5] + 95, BITMAP_Ready, sizeof(BITMAP_Ready));