diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index c3d6d7d72..e63153a24 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -656,7 +656,7 @@ enum CSFunctionFamily {
   LS_FAMILY_STAY,
 };
 
-class LogicalSwitchData { // Custom Switches data
+class LogicalSwitchData { // Logical Switches data
   public:
     LogicalSwitchData(unsigned int func=0)
     {
diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index badaf7ac8..df36ace44 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -449,7 +449,7 @@ void ConvertModel_215_to_216(ModelData &model)
   // Curves: structure changed, 32 curves
   // Limits: min and max with PREC1
   // Custom Functions: play repeat * 5
-  // Custom Switches: better precision for x when A comes from telemetry
+  // Logical Switches: better precision for x when A comes from telemetry
   // Main View: altitude in top bar
   // Mixes: GVARS in weight moved from 512 to 4096 and -512 to -4096, because GVARS may be used in limits [-1250:1250]
   // Switches: two 6-pos pots added, REa added to Sky9x
diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index cb3371220..316b97460 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -724,7 +724,7 @@ void menuMainView(uint8_t event)
     doMainScreenGraphics();
   }
   else {
-    // Custom Switches
+    // Logical Switches
     uint8_t sw = 0;
     for (uint8_t line=0; line<4; line++) {
       for (uint8_t col=0; col<8; col++) {
@@ -823,7 +823,7 @@ void menuMainView(uint8_t event)
       }
 #endif // PCBGRUVIN9X && ROTARY_ENCODERS
 
-      // Custom Switches
+      // Logical Switches
 #if defined(PCBSKY9X)
       for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) {
         int8_t len = getSwitch(SWSRC_SW1+i) ? BAR_HEIGHT : 1;
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 4b538f22e..e347abc52 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -745,7 +745,7 @@ enum LogicalSwitchesFunctions {
 #define MAX_LS_DELAY    250 /*25s*/
 #define MAX_LS_ANDSW    SWSRC_LAST
 typedef int16_t ls_telemetry_value_t;
-PACK(typedef struct t_LogicalSwitchData { // Custom Switches data
+PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
   int8_t  v1;
   int16_t v2;
   int16_t v3;
@@ -757,7 +757,7 @@ PACK(typedef struct t_LogicalSwitchData { // Custom Switches data
 #else
 typedef uint8_t ls_telemetry_value_t;
 #define MAX_LS_ANDSW    15
-PACK(typedef struct t_LogicalSwitchData { // Custom Switches data
+PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
   int8_t  v1; //input
   int8_t  v2; //offset
   uint8_t func:4;