diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp
index 8d5cd988e..6aba80ac3 100644
--- a/radio/src/bluetooth.cpp
+++ b/radio/src/bluetooth.cpp
@@ -141,11 +141,11 @@ void Bluetooth::processTrainerFrame(const uint8_t * buffer)
 {
   for (uint8_t channel=0, i=1; channel<BLUETOOTH_TRAINER_CHANNELS; channel+=2, i+=3) {
     // +-500 != 512, but close enough.
-    ppmInput[channel] = buffer[i] + ((buffer[i+1] & 0xf0) << 4) - 1500;
-    ppmInput[channel+1] = ((buffer[i+1] & 0x0f) << 4) + ((buffer[i+2] & 0xf0) >> 4) + ((buffer[i+2] & 0x0f) << 8) - 1500;
+    trainerInput[channel] = buffer[i] + ((buffer[i+1] & 0xf0) << 4) - 1500;
+    trainerInput[channel+1] = ((buffer[i+1] & 0x0f) << 4) + ((buffer[i+2] & 0xf0) >> 4) + ((buffer[i+2] & 0x0f) << 8) - 1500;
   }
 
-  ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
+  trainerInputValidityTimer = TRAINER_IN_VALID_TIMEOUT;
 }
 
 void Bluetooth::appendTrainerByte(uint8_t data)
diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp
index eed0bdcb0..6b78c4222 100644
--- a/radio/src/gui/212x64/view_main.cpp
+++ b/radio/src/gui/212x64/view_main.cpp
@@ -287,12 +287,12 @@ void displayTopBar()
   }
 
   if (SLAVE_MODE()) {
-    if (is_trainer_connected()) {
+    if (is_trainer_dsc_connected()) {
       LCD_NOTIF_ICON(x, ICON_TRAINEE);
       x -= 12;
     }
   }
-  else if (IS_TRAINER_INPUT_VALID()) {
+  else if (is_trainer_connected()) {
     LCD_NOTIF_ICON(x, ICON_TRAINER);
     x -= 12;
   }
diff --git a/radio/src/gui/colorlcd/radio_trainer.cpp b/radio/src/gui/colorlcd/radio_trainer.cpp
index 061620ed6..0c06e7c48 100644
--- a/radio/src/gui/colorlcd/radio_trainer.cpp
+++ b/radio/src/gui/colorlcd/radio_trainer.cpp
@@ -86,7 +86,7 @@ void RadioTrainerPage::build(FormWindow * form)
 #endif
 
     new DynamicNumber<int16_t>(line, rect_t{},
-        [=]() { return (ppmInput[i] - g_eeGeneral.trainer.calib[i]) * 2; },
+        [=]() { return (trainerInput[i] - g_eeGeneral.trainer.calib[i]) * 2; },
         LEFT | PPM_PRECISION | COLOR_THEME_PRIMARY1);
   }
 
@@ -110,7 +110,7 @@ void RadioTrainerPage::build(FormWindow * form)
 
   // Trainer calibration
   auto btn = new TextButton(line, rect_t{0, 0, 0, 30}, std::string(STR_CAL), [=]() -> uint8_t {
-    memcpy(g_eeGeneral.trainer.calib, ppmInput,
+    memcpy(g_eeGeneral.trainer.calib, trainerInput,
            sizeof(g_eeGeneral.trainer.calib));
     SET_DIRTY();
     return 0;
diff --git a/radio/src/gui/common/stdlcd/radio_trainer.cpp b/radio/src/gui/common/stdlcd/radio_trainer.cpp
index 038b7fae2..e2206e752 100644
--- a/radio/src/gui/common/stdlcd/radio_trainer.cpp
+++ b/radio/src/gui/common/stdlcd/radio_trainer.cpp
@@ -93,7 +93,7 @@ void menuRadioTrainer(event_t event)
   lcdDrawText(0*FW, MENU_HEADER_HEIGHT+1+6*FH, STR_CAL, attr);
   for (uint8_t i = 0; i < 4; i++) {
     uint8_t x = 8*FW + (i * TRAINER_CALIB_COLUMN_WIDTH);
-    int32_t chVal = ppmInput[i] - g_eeGeneral.trainer.calib[i];
+    int32_t chVal = trainerInput[i] - g_eeGeneral.trainer.calib[i];
     chVal *= g_eeGeneral.trainer.mix[i].studWeight * 10;
     chVal /= 512;
 #if defined (PPM_UNIT_PERCENT_PREC1)
@@ -106,7 +106,7 @@ void menuRadioTrainer(event_t event)
   if (attr) {
     s_editMode = 0;
     if (event==EVT_KEY_LONG(KEY_ENTER)){
-      memcpy(g_eeGeneral.trainer.calib, ppmInput, sizeof(g_eeGeneral.trainer.calib));
+      memcpy(g_eeGeneral.trainer.calib, trainerInput, sizeof(g_eeGeneral.trainer.calib));
       storageDirty(EE_GENERAL);
       AUDIO_WARNING1();
     }
diff --git a/radio/src/hal/trainer_driver.h b/radio/src/hal/trainer_driver.h
index 185e8cbcf..30f2fef6e 100644
--- a/radio/src/hal/trainer_driver.h
+++ b/radio/src/hal/trainer_driver.h
@@ -33,7 +33,14 @@ void init_trainer_capture();
 void stop_trainer_capture();
 
 // Cable inserted?
-bool is_trainer_connected();
+bool is_trainer_dsc_connected();
+
+// Active signal received
+extern uint8_t trainerInputValidityTimer;
+inline bool is_trainer_connected()
+{
+  return (trainerInputValidityTimer != 0);
+}
 
 #if defined(TRAINER_MODULE_CPPM)
 void init_trainer_module_cppm();
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index 8ab3f0737..b9878455d 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -25,6 +25,7 @@
 #include "input_mapping.h"
 
 #include "hal/adc_driver.h"
+#include "hal/trainer_driver.h"
 #include "hal/switch_driver.h"
 
 uint8_t s_mixer_first_run_done = false;
@@ -162,7 +163,7 @@ void applyExpos(int16_t * anas, uint8_t mode, uint8_t ovwrIdx, int16_t ovwrValue
       continue;
     if (ed->flightModes & (1<<mixerCurrentFlightMode))
       continue;
-    if (ed->srcRaw >= MIXSRC_FIRST_TRAINER && ed->srcRaw <= MIXSRC_LAST_TRAINER && !IS_TRAINER_INPUT_VALID())
+    if (ed->srcRaw >= MIXSRC_FIRST_TRAINER && ed->srcRaw <= MIXSRC_LAST_TRAINER && !is_trainer_connected())
       continue;
     if (getSwitch(ed->swtch)) {
       int32_t v;
@@ -235,8 +236,8 @@ int16_t applyLimits(uint8_t channel, int32_t value)
   }
 #endif
 
-  if (isFunctionActive(FUNCTION_TRAINER_CHANNELS) && IS_TRAINER_INPUT_VALID()) {
-    return ppmInput[channel] * 2;
+  if (isFunctionActive(FUNCTION_TRAINER_CHANNELS) && is_trainer_connected()) {
+    return trainerInput[channel] * 2;
   }
 
   LimitData * lim = limitAddress(channel);
@@ -407,7 +408,7 @@ getvalue_t getValue(mixsrc_t i, bool* valid)
   else if (i <= MIXSRC_LAST_LOGICAL_SWITCH) {
     return getSwitch(SWSRC_FIRST_LOGICAL_SWITCH + i - MIXSRC_FIRST_LOGICAL_SWITCH) ? 1024 : -1024;
   } else if (i <= MIXSRC_LAST_TRAINER) {
-    int16_t x = ppmInput[i - MIXSRC_FIRST_TRAINER];
+    int16_t x = trainerInput[i - MIXSRC_FIRST_TRAINER];
     if (i < MIXSRC_FIRST_TRAINER + NUM_CAL_PPM) {
       x -= g_eeGeneral.trainer.calib[i - MIXSRC_FIRST_TRAINER];
     }
@@ -568,13 +569,13 @@ void evalInputs(uint8_t mode)
 
       if (mode <= e_perout_mode_inactive_flight_mode &&
           isFunctionActive(FUNCTION_TRAINER_STICK1 + ch) &&
-          IS_TRAINER_INPUT_VALID()) {
+          is_trainer_connected()) {
         // trainer mode
         TrainerMix* td = &g_eeGeneral.trainer.mix[ch];
         if (td->mode) {
           uint8_t chStud = td->srcChn;
           int32_t vStud =
-              (ppmInput[chStud] - g_eeGeneral.trainer.calib[chStud]);
+              (trainerInput[chStud] - g_eeGeneral.trainer.calib[chStud]);
           vStud *= td->studWeight;
           vStud /= 50;
           switch (td->mode) {
@@ -762,7 +763,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
 
 #define MIXER_LINE_DISABLE()   (mixCondition = true, mixEnabled = 0)
 
-      if (mixEnabled && md->srcRaw >= MIXSRC_FIRST_TRAINER && md->srcRaw <= MIXSRC_LAST_TRAINER && !IS_TRAINER_INPUT_VALID()) {
+      if (mixEnabled && md->srcRaw >= MIXSRC_FIRST_TRAINER && md->srcRaw <= MIXSRC_LAST_TRAINER && !is_trainer_connected()) {
         MIXER_LINE_DISABLE();
       }
 
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 219f9b9e5..a4c41f9ca 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -146,7 +146,7 @@ void per10ms()
 #endif
 
   if (trimsCheckTimer) trimsCheckTimer--;
-  if (ppmInputValidityTimer) ppmInputValidityTimer--;
+  if (trainerInputValidityTimer) trainerInputValidityTimer--;
 
   if (trimsDisplayTimer)
     trimsDisplayTimer--;
diff --git a/radio/src/sbus.cpp b/radio/src/sbus.cpp
index 096bca02d..fed3c4bc2 100644
--- a/radio/src/sbus.cpp
+++ b/radio/src/sbus.cpp
@@ -91,7 +91,7 @@ void processSbusFrame(uint8_t * sbus, int16_t * pulses, uint32_t size)
     inputbits >>= SBUS_CH_BITS;
   }
 
-  ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
+  trainerInputValidityTimer = TRAINER_IN_VALID_TIMEOUT;
 }
 
 void processSbusInput()
@@ -124,7 +124,7 @@ void processSbusInput()
   // Check if end-of-frame is detected
   if (SbusIndex) {
     if ((uint16_t)(getTmr2MHz() - SbusTimer) > SBUS_FRAME_GAP_DELAY) {
-      processSbusFrame(SbusFrame, ppmInput, SbusIndex);
+      processSbusFrame(SbusFrame, trainerInput, SbusIndex);
       SbusIndex = 0;
     }
   }
diff --git a/radio/src/targets/common/arm/stm32/trainer_driver.cpp b/radio/src/targets/common/arm/stm32/trainer_driver.cpp
index 0f0cac4d2..b35ea7502 100644
--- a/radio/src/targets/common/arm/stm32/trainer_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/trainer_driver.cpp
@@ -271,7 +271,7 @@ void stop_trainer_capture()
 
 #endif // TRAINER_GPIO
 
-bool is_trainer_connected()
+bool is_trainer_dsc_connected()
 {
 #if defined(TRAINER_DETECT_GPIO_PIN)
   bool set = LL_GPIO_IsInputPinSet(TRAINER_DETECT_GPIO, TRAINER_DETECT_GPIO_PIN);
diff --git a/radio/src/targets/simu/module_drivers.cpp b/radio/src/targets/simu/module_drivers.cpp
index 2204fe357..eec84a656 100644
--- a/radio/src/targets/simu/module_drivers.cpp
+++ b/radio/src/targets/simu/module_drivers.cpp
@@ -49,7 +49,7 @@ void stop_trainer_ppm() {}
 void init_trainer_capture() {}
 void stop_trainer_capture() {}
 
-bool is_trainer_connected() { return false; }
+bool is_trainer_dsc_connected() { return false; }
 
 void init_trainer_module_cppm() {}
 void stop_trainer_module_cppm() {}
diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp
index 3c9707f9a..d8e62917f 100644
--- a/radio/src/targets/simu/opentxsimulator.cpp
+++ b/radio/src/targets/simu/opentxsimulator.cpp
@@ -241,10 +241,10 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value)
 
 void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)
 {
-  static unsigned dim = DIM(ppmInput);
+  static unsigned dim = DIM(trainerInput);
   //setTrainerTimeout(100);
   if (inputNumber < dim)
-    ppmInput[inputNumber] = qMin(qMax((int16_t)-512, value), (int16_t)512);
+    trainerInput[inputNumber] = qMin(qMax((int16_t)-512, value), (int16_t)512);
 }
 
 void OpenTxSimulator::setInputValue(int type, uint8_t index, int16_t value)
@@ -411,7 +411,7 @@ void OpenTxSimulator::lcdFlushed()
 
 void OpenTxSimulator::setTrainerTimeout(uint16_t ms)
 {
-  ppmInputValidityTimer = ms;
+  trainerInputValidityTimer = ms;
 }
 
 void OpenTxSimulator::sendTelemetry(const QByteArray data)
diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
index 9c17cbb71..2bfcf49fc 100644
--- a/radio/src/targets/taranis/board.cpp
+++ b/radio/src/targets/taranis/board.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "hal/adc_driver.h"
+#include "hal/trainer_driver.h"
 #include "hal/switch_driver.h"
 #include "hal/module_port.h"
 
@@ -137,6 +138,7 @@ void boardInit()
   }
 #endif
 
+  init_trainer();
   // Sets 'hardwareOption.pcbrev' as well
   pwrInit();
   boardInitModulePorts();
diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp
index 38f09984d..cbfe35025 100644
--- a/radio/src/telemetry/multi.cpp
+++ b/radio/src/telemetry/multi.cpp
@@ -294,7 +294,7 @@ static void processMultiRxChannels(const uint8_t * data, uint8_t len)
     bitsavailable -= MULTI_CHAN_BITS;
     bits >>= MULTI_CHAN_BITS;
 
-    ppmInput[ch] = (value - 1024) * 500 / 800;
+    trainerInput[ch] = (value - 1024) * 500 / 800;
     ch++;
 
     if (byteIdx >= len)
@@ -302,7 +302,7 @@ static void processMultiRxChannels(const uint8_t * data, uint8_t len)
   }
 
   if (ch == maxCh)
-    ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
+    trainerInputValidityTimer = TRAINER_IN_VALID_TIMEOUT;
 }
 #endif
 
diff --git a/radio/src/tests/mixer.cpp b/radio/src/tests/mixer.cpp
index a7abe04ac..14ad80e99 100644
--- a/radio/src/tests/mixer.cpp
+++ b/radio/src/tests/mixer.cpp
@@ -815,8 +815,8 @@ TEST(Trainer, UnpluggedTest)
   g_model.mixData[0].weight = 100;
   g_model.mixData[0].delayUp = 50;
   g_model.mixData[0].delayDown = 50;
-  ppmInputValidityTimer = 0;
-  ppmInput[0] = 1024;
+  trainerInputValidityTimer = 0;
+  trainerInput[0] = 1024;
   CHECK_DELAY(0, 5000);
 }
 
diff --git a/radio/src/trainer.cpp b/radio/src/trainer.cpp
index 3a5aa99fe..109efbdfe 100644
--- a/radio/src/trainer.cpp
+++ b/radio/src/trainer.cpp
@@ -23,8 +23,8 @@
 #include "hal/trainer_driver.h"
 #include "heartbeat_driver.h"
 
-int16_t ppmInput[MAX_TRAINER_CHANNELS];
-uint8_t ppmInputValidityTimer;
+int16_t trainerInput[MAX_TRAINER_CHANNELS];
+uint8_t trainerInputValidityTimer;
 uint8_t currentTrainerMode = 0xff;
 
 enum {
@@ -38,25 +38,25 @@ uint8_t trainerStatus = TRAINER_NOT_CONNECTED;
 void checkTrainerSignalWarning()
 {
   enum {
-    PPM_IN_IS_NOT_USED = 0,
-    PPM_IN_IS_VALID,
-    PPM_IN_INVALID
+    TRAINER_IN_IS_NOT_USED = 0,
+    TRAINER_IN_IS_VALID,
+    TRAINER_IN_IS_INVALID
   };
 
-  static uint8_t ppmInputValidState = PPM_IN_IS_NOT_USED;
+  static uint8_t trainerInputValidState = TRAINER_IN_IS_NOT_USED;
 
-  if (ppmInputValidityTimer && (ppmInputValidState == PPM_IN_IS_NOT_USED)) {
-    ppmInputValidState = PPM_IN_IS_VALID;
+  if (trainerInputValidityTimer && (trainerInputValidState == TRAINER_IN_IS_NOT_USED)) {
+    trainerInputValidState = TRAINER_IN_IS_VALID;
     trainerStatus = TRAINER_CONNECTED;
     AUDIO_TRAINER_CONNECTED();
   }
-  else if (!ppmInputValidityTimer && (ppmInputValidState == PPM_IN_IS_VALID)) {
-    ppmInputValidState = PPM_IN_INVALID;
+  else if (!trainerInputValidityTimer && (trainerInputValidState == TRAINER_IN_IS_VALID)) {
+    trainerInputValidState = TRAINER_IN_IS_INVALID;
     trainerStatus = TRAINER_DISCONNECTED;
     AUDIO_TRAINER_LOST();
   }
-  else if (ppmInputValidityTimer && (ppmInputValidState == PPM_IN_INVALID)) {
-    ppmInputValidState = PPM_IN_IS_VALID;
+  else if (trainerInputValidityTimer && (trainerInputValidState == TRAINER_IN_IS_INVALID)) {
+    trainerInputValidState = TRAINER_IN_IS_VALID;
     trainerStatus = TRAINER_RECONNECTED;
     AUDIO_TRAINER_BACK();
   }
diff --git a/radio/src/trainer.h b/radio/src/trainer.h
index 9a81901a5..22cd73153 100644
--- a/radio/src/trainer.h
+++ b/radio/src/trainer.h
@@ -25,14 +25,13 @@
 #include "dataconstants.h"
 
 // Trainer input channels
-extern int16_t ppmInput[MAX_TRAINER_CHANNELS];
+extern int16_t trainerInput[MAX_TRAINER_CHANNELS];
 
 // Timer gets decremented in per10ms()
-#define PPM_IN_VALID_TIMEOUT 100 // 1s
-extern uint8_t ppmInputValidityTimer;
+#define TRAINER_IN_VALID_TIMEOUT 100 // 1s
+extern uint8_t trainerInputValidityTimer;
 
 extern uint8_t currentTrainerMode;
-#define IS_TRAINER_INPUT_VALID() (ppmInputValidityTimer != 0)
 
 void checkTrainerSignalWarning();
 void checkTrainerSettings();
@@ -48,7 +47,7 @@ inline void captureTrainerPulses(uint16_t capture)
   uint16_t val = (uint16_t)(capture - lastCapt) / 2;
   lastCapt = capture;
 
-  // We process ppmInput right here to make servo movement as smooth as possible
+  // We process trainerInput right here to make servo movement as smooth as possible
   //    while under trainee control
   //
   // G: Prioritize reset pulse. (Needed when less than 16 incoming pulses)
@@ -59,8 +58,8 @@ inline void captureTrainerPulses(uint16_t capture)
   else {
     if (channelNumber >= 0 && channelNumber < MAX_TRAINER_CHANNELS) {
       if (val > 800 && val < 2200) {
-        ppmInputValidityTimer = PPM_IN_VALID_TIMEOUT;
-        ppmInput[channelNumber++] =
+        trainerInputValidityTimer = TRAINER_IN_VALID_TIMEOUT;
+        trainerInput[channelNumber++] =
           // +-500 != 512, but close enough.
           (int16_t)(val - 1500) * (g_eeGeneral.PPM_Multiplier+10) / 10;
       }