diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index b7443e747..192dacbfc 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1310,7 +1310,7 @@ void menuModelSetup(event_t event)
           else {
             lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
           }
-          if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
+          if (isModuleBindRangeAvailable(moduleIdx)) {
             if (xOffsetBind)
               lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
             if (attr && l_posHorz == 0) {
diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index 36c01311f..400910488 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -1038,7 +1038,7 @@ void menuModelSetup(event_t event)
           else {
             lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM);
           }
-          if (isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx)) {
+          if (isModuleBindRangeAvailable(moduleIdx)) {
             if (xOffsetBind)
               lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
             if (attr && l_posHorz==0) {
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index 4ffdee597..2dfae7f96 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -454,6 +454,11 @@ inline bool isModuleFailsafeAvailable(uint8_t idx)
   return false;
 }
 
+inline bool isModuleBindRangeAvailable(uint8_t moduleIdx)
+{
+  return isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx);
+}
+
 inline uint8_t getMaxRxNum(uint8_t idx)
 {
   if (isModuleDSM2(idx))
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index e4ca61315..2dd6d7de1 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -89,12 +89,10 @@ ISTR(VANTENNATYPES);
 ISTR(VBEEPLEN);
 #endif
 
-#if defined(PCBTARANIS) || defined(PCBHORUS)
 ISTR(AUX_SERIAL_MODES);
 ISTR(SWTYPES);
 ISTR(POTTYPES);
 ISTR(SLIDERTYPES);
-#endif
 
 #if defined(PCBSKY9X) && defined(REVX)
 ISTR(VOUTPUT_TYPE);
@@ -589,7 +587,7 @@ const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
 const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;
 #endif
 
-#if !defined(PCBHORUS)
+#if !defined(COLORLCD)
 const char STR_MENUWHENDONE[] = TR_MENUWHENDONE;
 #endif
 
@@ -623,7 +621,7 @@ const char STR_GYRO_OFFSET[] = TR_GYRO_OFFSET;
 const char STR_GYRO_MAX[] = TR_GYRO_MAX;
 #endif
 
-#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
+#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
 const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
 const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
 #endif
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 676d1f79a..2e0a54ae1 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -290,7 +290,7 @@ extern const char STR_PERSISTENT[];
 extern const char STR_BACKLIGHT_LABEL[];
 extern const char STR_BLDELAY[];
 
-#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
+#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
 extern const char STR_BLONBRIGHTNESS[];
 extern const char STR_BLOFFBRIGHTNESS[];
 #endif