diff --git a/companion/src/firmwares/opentx/open9xStockeeprom.cpp b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
index 0f26c96a6..2876e2c45 100644
--- a/companion/src/firmwares/opentx/open9xStockeeprom.cpp
+++ b/companion/src/firmwares/opentx/open9xStockeeprom.cpp
@@ -573,8 +573,8 @@ t_Open9xFuncSwData_v201::operator FuncSwData ()
 }
 
 enum Functions {
-  FUNC_SAFETY_CH1,
-  FUNC_SAFETY_CH16=FUNC_SAFETY_CH1+15,
+  FUNC_OVERRIDE_CH1,
+  FUNC_OVERRIDE_CH16=FUNC_OVERRIDE_CH1+15,
   FUNC_TRAINER,
   FUNC_TRAINER_RUD,
   FUNC_TRAINER_ELE,
diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
index 70e4b31ec..16f7c6f7e 100644
--- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp
@@ -48,7 +48,7 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
-#define SAFETY_CHANNEL_FUNCTION
+#define OVERRIDE_CHANNEL_FUNCTION
 
 #define EEPROM_VARIANT 3
 
diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp
index a04496e71..09af72f72 100644
--- a/companion/src/firmwares/opentx/opentxM128simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp
@@ -48,7 +48,7 @@
 #define FRSKY_STICKS
 #define DSM2
 #define DSM2_PPM
-#define SAFETY_CHANNEL_FUNCTION
+#define OVERRIDE_CHANNEL_FUNCTION
 
 #define EEPROM_VARIANT SIMU_M128_VARIANTS
 #define GAUGES
diff --git a/companion/src/firmwares/opentx/opentxM64simulator.cpp b/companion/src/firmwares/opentx/opentxM64simulator.cpp
index 30177b38e..32dc6b261 100644
--- a/companion/src/firmwares/opentx/opentxM64simulator.cpp
+++ b/companion/src/firmwares/opentx/opentxM64simulator.cpp
@@ -50,7 +50,7 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
-#define SAFETY_CHANNEL_FUNCTION
+#define OVERRIDE_CHANNEL_FUNCTION
 #define FAS_OFFSET
 
 #define EEPROM_VARIANT SIMU_STOCK_VARIANTS
diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
index 2c36ab434..b67a118fb 100644
--- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
@@ -54,7 +54,7 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
-#define SAFETY_CHANNEL_FUNCTION
+#define OVERRIDE_CHANNEL_FUNCTION
 
 #define NUM_POTS  3
 #define EEPROM_VARIANT 3
diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index 5194e2c2e..6e67cd6d1 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -54,7 +54,7 @@
 #define EEPROM_VARIANT 3
 #define HAPTIC
 #define REVPLUS
-#define SAFETY_CHANNEL_FUNCTION
+#define OVERRIDE_CHANNEL_FUNCTION
 
 #define NUM_POTS  5
 
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 4d01105a1..07b2dc8bf 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -169,9 +169,9 @@ PPM_LIMITS_SYMETRICAL = NO
 # Values = PERCENT_PREC1, PERCENT_PREC0, US
 PPM_UNIT = PERCENT_PREC1
 
-# SafetyCHxx functions enable
+# OverrideCHxx functions enable
 # Values = YES, NO
-SAFETY_CHANNEL_FUNCTION = YES
+OVERRIDE_CHANNEL_FUNCTION = YES
 
 # FrSky Hub 
 # Values = YES, NO
@@ -1024,8 +1024,8 @@ ifeq ($(PPM_LIMITS_SYMETRICAL), YES)
   CPPDEFS += -DPPM_LIMITS_SYMETRICAL
 endif
 
-ifeq ($(SAFETY_CHANNEL_FUNCTION), YES)
-  CPPDEFS += -DSAFETY_CHANNEL_FUNCTION
+ifeq ($(OVERRIDE_CHANNEL_FUNCTION), YES)
+  CPPDEFS += -DOVERRIDE_CHANNEL_FUNCTION
 endif
 
 ifeq ($(PPM_UNIT), US)
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index 64da41aed..aa1a56bd7 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -730,7 +730,7 @@ void ConvertModel_215_to_216(ModelData &model)
     fn.func = oldModel.funcSw[i].func;
     if (fn.func <= 15) {
       fn.all.param = fn.func;
-      fn.func = FUNC_SAFETY_CHANNEL;
+      fn.func = FUNC_OVERRIDE_CHANNEL;
     }
     else if (fn.func <= 20) {
       fn.all.param = fn.func - 16;
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 0b29dbbb3..feedd682a 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -5068,8 +5068,8 @@ void menuModelCustomFunctions(uint8_t event)
         case 2:
         {
           int8_t maxParam = NUM_CHNOUT-1;
-#if defined(SAFETY_CHANNEL_FUNCTION)
-          if (func == FUNC_SAFETY_CHANNEL) {
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
+          if (func == FUNC_OVERRIDE_CHANNEL) {
             putsChn(lcdNextPos, y, CFN_CH_INDEX(sd)+1, attr);
           }
           else
@@ -5120,8 +5120,8 @@ void menuModelCustomFunctions(uint8_t event)
             val_max = FUNC_RESET_PARAM_LAST;
             lcd_putsiAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_VFSWRESET, CFN_PARAM(sd), attr);
           }
-#if defined(SAFETY_CHANNEL_FUNCTION)
-          else if (func == FUNC_SAFETY_CHANNEL) {
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
+          else if (func == FUNC_OVERRIDE_CHANNEL) {
             val_displayed = (int8_t)CFN_PARAM(sd);
             val_min = -125; val_max = 125;
             lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp
index b88ae4215..8b04aae29 100644
--- a/radio/src/gui/menus.cpp
+++ b/radio/src/gui/menus.cpp
@@ -1544,8 +1544,8 @@ bool isLogicalSwitchFunctionAvailable(int function)
 bool isAssignableFunctionAvailable(int function)
 {
   switch (function) {
-#if !defined(SAFETY_CHANNEL_FUNCTION)
-    case FUNC_SAFETY_CHANNEL:
+#if !defined(OVERRIDE_CHANNEL_FUNCTION)
+    case FUNC_OVERRIDE_CHANNEL:
 #endif
 #if !defined(HAPTIC)
     case FUNC_HAPTIC:
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index f25358e18..796e7f3eb 100755
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -245,7 +245,7 @@ int16_t applyLimits(uint8_t channel, int32_t value)
 
   if (lim->revert) ofs = -ofs; // finally do the reverse.
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   if (safetyCh[channel] != -128) // if safety channel available for channel check
     ofs = calc100toRESX(safetyCh[channel]);
 #endif
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 1d8b0992f..b68a773ff 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -807,7 +807,7 @@ PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
 
 enum Functions {
   // first the functions which need a checkbox
-  FUNC_SAFETY_CHANNEL,
+  FUNC_OVERRIDE_CHANNEL,
   FUNC_TRAINER,
   FUNC_INSTANT_TRIM,
   FUNC_RESET,
@@ -849,10 +849,10 @@ enum Functions {
   FUNC_MAX
 };
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define HAS_ENABLE_PARAM(func)    ((func) < FUNC_FIRST_WITHOUT_ENABLE)
 #else
-  #define HAS_ENABLE_PARAM(func)    ((func) < FUNC_FIRST_WITHOUT_ENABLE && (func) != FUNC_SAFETY_CHANNEL)
+  #define HAS_ENABLE_PARAM(func)    ((func) < FUNC_FIRST_WITHOUT_ENABLE && (func) != FUNC_OVERRIDE_CHANNEL)
 #endif
 
 #if defined(VOICE)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 52090bcab..c7c2a6780 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -147,7 +147,7 @@ uint8_t heartbeat;
 
 uint8_t stickMode;
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
 int8_t safetyCh[NUM_CHNOUT];
 #endif
 
@@ -1867,7 +1867,7 @@ void evalFunctions()
   static rotenc_t rePreviousValues[ROTARY_ENCODERS];
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   for (uint8_t i=0; i<NUM_CHNOUT; i++) {
     safetyCh[i] = -128; // not defined
   }
@@ -1900,8 +1900,8 @@ void evalFunctions()
 
         switch (CFN_FUNC(sd)) {
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
-          case FUNC_SAFETY_CHANNEL:
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
+          case FUNC_OVERRIDE_CHANNEL:
             safetyCh[CFN_CH_INDEX(sd)] = CFN_PARAM(sd);
             break;
 #endif
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 4809c6c17..c3835284f 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -843,7 +843,7 @@ struct TimerState {
 
 extern TimerState timersStates[MAX_TIMERS];
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
 extern int8_t safetyCh[NUM_CHNOUT];
 #endif
 
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 9f49227d2..94803ee61 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Zámek \0    "
 #else
   #define TR_CFN_SAFETY        "---\0       "
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index de8e613db..cfd045c13 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Sicher\0   "
 #else
   #define TR_CFN_SAFETY        "---\0      "
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 4fb2ad45d..c3afb04b5 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -264,9 +264,9 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION) && LCD_W >= 212
+#if defined(OVERRIDE_CHANNEL_FUNCTION) && LCD_W >= 212
   #define TR_CFN_SAFETY        "Override\0 "
-#elif defined(SAFETY_CHANNEL_FUNCTION)
+#elif defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Overr.\0   "
 #else
   #define TR_CFN_SAFETY        "---\0      "
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index 4a51963e7..61cfd17a4 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Seguro\0   "
 #else
   #define TR_CFN_SAFETY        "---\0      "
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 9bf378ecc..86735965e 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Safety\0   "
 #else
   #define TR_CFN_SAFETY        "---\0      "
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 2c34fa839..203fc03cc 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Rempl.\0      "
 #else
   #define TR_CFN_SAFETY        "---\0         "
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 77956bd2c..15dcd4d7c 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST          
 #endif                         
           
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Blocco\0      "
 #else
   #define TR_CFN_SAFETY        "---\0         "
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 25173fa4c..acc0c7d7b 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
           
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Bezp.\0    "
 #else
   #define TR_CFN_SAFETY        "---\0      "
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index a952866ab..1a8266c37 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
           
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Seguro\0      "
 #else
   #define TR_CFN_SAFETY        "---\0         "
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index fd03a16e4..7a40b85d6 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -264,7 +264,7 @@
   #define TR_CFN_TEST
 #endif
 
-#if defined(SAFETY_CHANNEL_FUNCTION)
+#if defined(OVERRIDE_CHANNEL_FUNCTION)
   #define TR_CFN_SAFETY        "Säkra \0   "
 #else
   #define TR_CFN_SAFETY        "---\0      "