diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index afc88301e..23b6a0bc9 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -47,7 +47,7 @@ option(TRACE_SIMPGMSPACE "Turn on traces in simpgmspace.cpp" ON)
 option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF)
 option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF)
 option(NANO "Use nano newlib and binalloc")
-option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF)
+option(TEST_BUILD_WARNING "Warn this is a test build" OFF)
 option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
 option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON)
 option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF)
@@ -315,8 +315,8 @@ if(EEPROM_VARIANT_NEEDED)
   add_definitions(-DEEPROM_VARIANT=${EEPROM_VARIANT})
 endif()
 
-if(NIGHTLY_BUILD_WARNING)
-  add_definitions(-DNIGHTLY_BUILD_WARNING)
+if(TEST_BUILD_WARNING)
+  add_definitions(-DTEST_BUILD_WARNING)
 endif()
 
 if(MODULE_PROTOCOL_FCC)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 5805f3161..13f8140e6 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1554,8 +1554,8 @@ void opentxStart(const uint8_t startOptions = OPENTX_START_DEFAULT_ARGS)
   }
 #endif
 
-#if defined(NIGHTLY_BUILD_WARNING)
-  ALERT(STR_NIGHTLY_WARNING, TR_NIGHTLY_NOTSAFE, AU_ERROR);
+#if defined(TEST_BUILD_WARNING)
+  ALERT(STR_TEST_WARNING, TR_TEST_NOTSAFE, AU_ERROR);
 #endif
 
 #if defined(GUI)
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index ba23c2436..d6b103000 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -705,9 +705,9 @@ const char STR_MODELS_PATH[] = MODELS_PATH;
 const char STR_MODELS_EXT[] = MODELS_EXT;
 #endif
 
-#if defined(NIGHTLY_BUILD_WARNING)
-const char STR_NIGHTLY_WARNING[] = TR_NIGHTLY_WARNING;
-const char STR_NIGHTLY_NOTSAFE[] = TR_NIGHTLY_NOTSAFE;
+#if defined(TEST_BUILD_WARNING)
+const char STR_TEST_WARNING[] = TR_TEST_WARNING;
+const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE;
 #endif
 
 #if LCD_W >= 212
diff --git a/radio/src/translations.h b/radio/src/translations.h
index e1e9e9c0f..239fd7c71 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -552,8 +552,8 @@ extern const char STR_THROTTLEWARN[];
 extern const char STR_ALARMSWARN[];
 extern const char STR_SWITCHWARN[];
 extern const char STR_FAILSAFEWARN[];
-extern const char STR_NIGHTLY_WARNING[];
-extern const char STR_NIGHTLY_NOTSAFE[];
+extern const char STR_TEST_WARNING[];
+extern const char STR_TEST_NOTSAFE[];
 extern const char STR_WRONG_SDCARDVERSION[];
 extern const char STR_WARN_RTC_BATTERY_LOW[];
 extern const char STR_WARN_MULTI_LOWPOWER[];
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index d90d692c7..fe2f4a921 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -733,8 +733,8 @@
 #define TR_ALARMSWARN                  "ALARMU"
 #define TR_SWITCHWARN                  "POZICE"
 #define TR_FAILSAFEWARN                "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NOČNÍ", "NOČNÍ SESTAVENÍ")
-#define TR_NIGHTLY_NOTSAFE             "Verze není bezpečná k létání"
+#define TR_TEST_WARNING                 TR("NOČNÍ", "NOČNÍ SESTAVENÍ")
+#define TR_TEST_NOTSAFE                 "Use for tests only"
 #define TR_WRONG_SDCARDVERSION         "Očekávaná ver.: "
 #define TR_WARN_RTC_BATTERY_LOW        "Slabá RTC baterie"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index de1421c0e..1cfef0aef 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -735,8 +735,8 @@
 #define TR_ALARMSWARN          			"ALARM"
 #define TR_SWITCHWARN          			"SCHALTER"
 #define TR_FAILSAFEWARN        			"FAILSAFE"
-#define TR_NIGHTLY_WARNING     			TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE     			"Nicht für Flug geeignet"
+#define TR_TEST_WARNING     			TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE     			"Use for tests only"
 #define TR_WRONG_SDCARDVERSION          TR("Erw. Version: ","Erwartete Version: ")
 #define TR_WARN_RTC_BATTERY_LOW         "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index f7600bf4f..9ab4f8725 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -734,8 +734,8 @@
 #define TR_ALARMSWARN                  "ALARMS"
 #define TR_SWITCHWARN                  TR("SWITCH", "CONTROL")
 #define TR_FAILSAFEWARN                "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING                 TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE                 "Use for tests only"
 #define TR_WRONG_SDCARDVERSION         TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index a52691923..3d7a70d43 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -758,9 +758,9 @@
 #define TR_ALARMSWARN          "ALARMAS"
 #define TR_SWITCHWARN          "INTERPTOR"
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
-#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
+#define TR_TEST_WARNING         TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE         "Use for tests only"
+#define TR_WRONG_SDCARDVERSION  TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
 #define TR_BATTERY                     "BATTERY"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index f5e018ead..241e4fdcb 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -752,8 +752,8 @@
 #define TR_ALARMSWARN          "ALARMS"
 #define TR_SWITCHWARN          TR("SWITCH","CONTROL")
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for tests only"
 #define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index c8ec87b9f..88fa0689f 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -755,8 +755,8 @@
 #define TR_ALARMSWARN                  "SON"
 #define TR_SWITCHWARN                  TR("INTERS","CONTROLES")
 #define TR_FAILSAFEWARN                "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version de test uniq."
+#define TR_TEST_WARNING                 TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE                 "Version de test uniq."
 #define TR_WRONG_SDCARDVERSION         "Version requise: "
 #define TR_WARN_RTC_BATTERY_LOW        "Batterie RTC faible"
 #define TR_WARN_MULTI_LOWPOWER         "Mode basse puis."
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index f2852ba7b..f0534853d 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -754,8 +754,8 @@
 #define TR_ALARMSWARN          "ALLARMI"
 #define TR_SWITCHWARN          "CONTROLLI"
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Versione non sicura"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for test only"
 #define TR_WRONG_SDCARDVERSION TR("Richiede ver: ", "Richiede versione: ")
 #define TR_WARN_RTC_BATTERY_LOW        "Batteria RTC scarica"
 #define TR_WARN_MULTI_LOWPOWER         "Modalità bassa pot."
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index 633d83a26..e67be0298 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -740,8 +740,8 @@
 #define TR_ALARMSWARN          "ALARM"
 #define TR_SWITCHWARN          "SCHAKELAAR"
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for tests only"
 #define TR_WRONG_SDCARDVERSION TR("Verwachte ver: ","Verwachte versie: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index 339755077..a52b0da24 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -753,8 +753,8 @@
 #define TR_ALARMSWARN          "ALARM"
 #define TR_SWITCHWARN          TR("Przełą","Kontrola")
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for tests only"
 #define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 7d51e12f7..2d4d6fc71 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -743,8 +743,8 @@
 #define TR_ALARMSWARN          "ALARMES"
 #define TR_SWITCHWARN          "CHAVES"
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for tests only"
 #define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
 #define TR_WARN_MULTI_LOWPOWER         "Low power mode"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 2c26a7a0a..85b31e4d9 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -752,8 +752,8 @@
 #define TR_ALARMSWARN          "ALARM"
 #define TR_SWITCHWARN          "BRYTARE"
 #define TR_FAILSAFEWARN        "FAILSAFE"
-#define TR_NIGHTLY_WARNING             TR("NIGHTLY", "NIGHTLY BUILD")
-#define TR_NIGHTLY_NOTSAFE             "Version not safe to fly"
+#define TR_TEST_WARNING        TR("TESTING", "TEST BUILD")
+#define TR_TEST_NOTSAFE        "Use for tests only"
 #define TR_SDCARDVERSIONWARN   "SD Card Check"
 #define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
 #define TR_WARN_RTC_BATTERY_LOW        "RTC Battery low"
diff --git a/radio/util/build-firmware.py b/radio/util/build-firmware.py
index 4488659b0..9658e605d 100755
--- a/radio/util/build-firmware.py
+++ b/radio/util/build-firmware.py
@@ -30,7 +30,7 @@ def build_target(target, path, cmake_options):
         suffix = os.environ["OPENTX_VERSION_SUFFIX"]
         cmd.append('-DVERSION_SUFFIX="%s"' % suffix)
         if suffix.startswith("N"):
-            cmd.append('-DNIGHTLY_BUILD_WARNING=YES')
+            cmd.append('-DTEST_BUILD_WARNING=YES')
     cmd.append(srcdir)
 
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh
index ac2004b16..58d64709c 100755
--- a/tools/build-companion-nightly.sh
+++ b/tools/build-companion-nightly.sh
@@ -25,7 +25,7 @@ done
 SRCDIR=$1
 OUTDIR=$2
 
-COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DNIGHTLY_BUILD_WARNING=YES -DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
+COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DTEST_BUILD_WARNING=YES -DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
 if [ "$(uname)" = "Darwin" ]; then
     COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/ -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
 fi