diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index da2f88cd8..33f4327f0 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -48,7 +48,7 @@
   #define MAX_TRAINER_CHANNELS         16
   #define MAX_TELEMETRY_SENSORS        60
   #define MAX_CUSTOM_SCREENS           5
-#elif defined(PCBX9)
+#elif defined(PCBX9D) || defined(PCBX9E)
   #define MAX_MODELS                   60
   #define MAX_OUTPUT_CHANNELS          32 // number of real output channels CH1-CH32
   #define MAX_FLIGHT_MODES             9
@@ -383,22 +383,22 @@ enum SwitchSources {
   SWSRC_SD0,
   SWSRC_SD1,
   SWSRC_SD2,
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBXLITES)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBXLITES)
   SWSRC_SE0,
   SWSRC_SE1,
   SWSRC_SE2,
 #endif
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBX7) || defined(PCBXLITES)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES)
   SWSRC_SF0,
   SWSRC_SF1,
   SWSRC_SF2,
 #endif
-#if defined(PCBHORUS) || defined(PCBX9)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E)
   SWSRC_SG0,
   SWSRC_SG1,
   SWSRC_SG2,
 #endif
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBX7)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7)
   SWSRC_SH0,
   SWSRC_SH1,
   SWSRC_SH2,
@@ -623,16 +623,16 @@ enum MixSources {
   MIXSRC_SB,                        LUA_EXPORT("sb", "Switch B")
   MIXSRC_SC,                        LUA_EXPORT("sc", "Switch C")
   MIXSRC_SD,                        LUA_EXPORT("sd", "Switch D")
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBXLITES)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBXLITES)
   MIXSRC_SE,                        LUA_EXPORT("se", "Switch E")
 #endif
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBX7) || defined(PCBXLITES)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES)
   MIXSRC_SF,                        LUA_EXPORT("sf", "Switch F")
 #endif
-#if defined(PCBHORUS) || defined(PCBX9)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E)
   MIXSRC_SG,                        LUA_EXPORT("sg", "Switch G")
 #endif
-#if defined(PCBHORUS) || defined(PCBX9) || defined(PCBX7)
+#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7)
   MIXSRC_SH,                        LUA_EXPORT("sh", "Switch H")
 #endif
 #if defined(PCBX9E)
diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index b3ec3eccb..68be52dae 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -540,7 +540,7 @@ PACK(struct CustomScreenData {
   uint8_t view;
 #endif
 
-#if defined(PCBX9)
+#if defined(PCBX9D) || defined(PCBX9E)
   #define TOPBAR_DATA \
     NOBACKUP(uint8_t voltsSource); \
     NOBACKUP(uint8_t altitudeSource);
diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
index b7fa89c1a..e79fa8547 100644
--- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
@@ -267,7 +267,7 @@ void menuRadioSdManager(event_t _event)
       menuVerticalOffset = reusableBuffer.sdManager.offset;
       break;
 
-#if defined(PCBX9) || defined(PCBX7) || defined(PCBX3) // TODO NO_MENU_KEY
+#if defined(PCBX9) || defined(PCBX7) // TODO NO_MENU_KEY
     case EVT_KEY_LONG(KEY_MENU):
       if (SD_CARD_PRESENT() && !READ_ONLY() && s_editMode == 0) {
         killEvents(_event);
@@ -303,7 +303,7 @@ void menuRadioSdManager(event_t _event)
       break;
 
     case EVT_KEY_LONG(KEY_ENTER):
-#if !defined(PCBX9) && !defined(PCBX7) && !defined(PCBX3)// TODO NO_HEADER_LINE
+#if !defined(PCBX9) && !defined(PCBX7) // TODO NO_HEADER_LINE
       if (menuVerticalPosition < HEADER_LINE) {
         killEvents(_event);
         POPUP_MENU_ADD_ITEM(STR_SD_INFO);
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 53b36eeac..3819552aa 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -704,7 +704,7 @@ bool isTrainerModeAvailable(int mode)
   else
     return true;
 }
-#elif defined(PCBX9)
+#elif defined(PCBX9D) || defined(PCBX9E)
 bool isTrainerModeAvailable(int mode)
 {
   if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE))
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index f17cbb343..3b60cc42f 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -34,12 +34,12 @@ set(LUA_INCLUDES_STM32F4
   )
 
 if(PYTHONINTERP_FOUND)
-  add_lua_export_target(x3      ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX3)
+  add_lua_export_target(x3      ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX3 -DPCBX9)
   add_lua_export_target(x7      ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX7)
   add_lua_export_target(xlite   ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITE)
   add_lua_export_target(xlites  ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBXLITES -DPCBXLITE -DGYRO)
-  add_lua_export_target(x9d     ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D)
-  add_lua_export_target(x9e     ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E  -DSTM32F40_41xxx)
+  add_lua_export_target(x9d     ${LUA_INCLUDES_STM32F2} -DPCBTARANIS -DPCBX9D -DPCBX9)
+  add_lua_export_target(x9e     ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DPCBX9 -DSTM32F40_41xxx)
   add_lua_export_target(x10     ${LUA_INCLUDES_STM32F4} -DPCBHORUS   -DPCBX10  -DSTM32F40_41xxx)
   add_lua_export_target(x12s    ${LUA_INCLUDES_STM32F4} -DPCBHORUS   -DPCBX12S -DSTM32F40_41xxx)
 endif()
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 035970d26..bbdd088aa 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -99,7 +99,7 @@ void convertModelData_218_to_219(ModelData &model)
   newModel.varioData.min = oldModel.frsky.varioMin;
   newModel.varioData.max = oldModel.frsky.varioMax;
 
-#if defined(PCBX9)
+#if defined(PCBX9D) || defined(PCBX9E)
   newModel.voltsSource = oldModel.frsky.voltsSource;
   newModel.altitudeSource = oldModel.frsky.altitudeSource;
 #endif
diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt
index 4930709ee..c152ee0b6 100644
--- a/radio/src/targets/taranis/CMakeLists.txt
+++ b/radio/src/targets/taranis/CMakeLists.txt
@@ -95,7 +95,7 @@ elseif(PCB STREQUAL X3)
   set(LUA_EXPORT lua_export_x3)
   set(FLAVOUR x3)
   add_definitions(-DBOARD_NAME="x9lite")
-  add_definitions(-DPCBX3 -DSOFTWARE_VOLUME)
+  add_definitions(-DPCBX3 -DPCBX9 -DSOFTWARE_VOLUME)
   add_definitions(-DEEPROM_VARIANT=0x0800)
   add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
   set(GUI_DIR 128x64)
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 8313789d7..558bb4a2d 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -347,22 +347,22 @@ enum EnumSwitchesPositions
   SW_SD1,
   SW_SD2,
 #endif
-#if defined(PCBX9) || defined(PCBXLITES) || defined(PCBX3)
+#if defined(PCBX9) || defined(PCBXLITES)
   SW_SE0,
   SW_SE1,
   SW_SE2,
 #endif
-#if defined(PCBX9) || defined(PCBX7) || defined(PCBXLITES) || defined(PCBX3)
+#if defined(PCBX9) || defined(PCBX7) || defined(PCBXLITES)
   SW_SF0,
   SW_SF1,
   SW_SF2,
 #endif
-#if defined(PCBX9)
+#if defined(PCBX9D) || defined(PCBX9E)
   SW_SG0,
   SW_SG1,
   SW_SG2,
 #endif
-#if defined(PCBX9) || defined(PCBX7)
+#if defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7)
   SW_SH0,
   SW_SH1,
   SW_SH2,
diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp
index 72aa0f133..22c8c7ded 100644
--- a/radio/src/tests/frsky.cpp
+++ b/radio/src/tests/frsky.cpp
@@ -310,7 +310,7 @@ TEST(FrSkySPORT, frskySetCellVoltage)
   //display test
   lcdClear();
 
-#if defined(PCBX9)
+#if defined(PCBX9D) || defined(PCBX9E)
   g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1;
 #endif
 }
@@ -390,7 +390,7 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
   //display test
   lcdClear();
 
-#if defined(PCBX9)
+#if defined(PCBX9D) || defined(PCBX9E)
   g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1;
 #endif
 }