diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 53cc718de..b6b2b4c46 100755
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -951,7 +951,7 @@ void evalMixes(uint8_t tick10ms)
         fp_act[s_last_phase] = 0;
         fp_act[phase] = MAX_ACT;
       }
-      copyLswState(s_last_phase, phase); //push last logical switches state from old to new phase
+      logicalSwitchesCopyState(s_last_phase, phase); //push last logical switches state from old to new phase
     }
     s_last_phase = phase;
   }
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index b884d03d0..cbc7d7e08 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2219,7 +2219,7 @@ void doMixerCalculations()
       s_cnt_100ms -= 10;
       s_cnt_1s += 1;
 
-      lswTimerTick();
+      logicalSwitchesTimerTick();
 
       if (s_cnt_1s >= 10) { // 1sec
         s_cnt_1s -= 10;
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 604d82303..d69411a71 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -693,10 +693,10 @@ NOINLINE void per10ms();
 
 getvalue_t getValue(uint8_t i);
 bool getSwitch(int8_t swtch);
-void lswTimerTick();
+void logicalSwitchesTimerTick();
 void logicalSwitchesReset();
 void evalLogicalSwitches(uint8_t mode);
-void copyLswState(uint8_t oldPhase, uint8_t newPhase);
+void logicalSwitchesCopyState(uint8_t oldPhase, uint8_t newPhase);
 
 #if defined(PCBTARANIS)
   void getSwitchesPosition(bool startup);
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index cf8b9bccb..bb7dacff3 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -603,7 +603,7 @@ void checkSwitches()
 #endif    
 }
 
-void lswTimerTick() {
+void logicalSwitchesTimerTick() {
   for (uint8_t fm=0; fm<MAX_FLIGHT_MODES; fm++) {
     for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) {
       LogicalSwitchData * ls = lswAddress(i);
@@ -727,7 +727,7 @@ getvalue_t convertLswTelemValue(LogicalSwitchData * ls)
   return val;
 }
 
-void copyLswState(uint8_t oldPhase, uint8_t newPhase) {
+void logicalSwitchesCopyState(uint8_t oldPhase, uint8_t newPhase) {
   for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) {
     lswFm[newPhase].ls[i].state = lswFm[oldPhase].ls[i].state;
   }