diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp
index 3c69625a..88ef3924 100644
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -110,8 +110,8 @@ void setup() {
 
   board.begin();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.begin();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
 #endif
 
 #ifdef DISPLAY_CLASS
@@ -229,7 +229,7 @@ void loop() {
   ui_task.loop();
 #endif
   rtc_clock.tick();
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.loop();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
 #endif
 }
diff --git a/examples/simple_repeater/main.cpp b/examples/simple_repeater/main.cpp
index 1760abea..f0271c88 100644
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -29,8 +29,8 @@ void setup() {
 
   board.begin();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.begin();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
 #endif
 
 #if defined(MESH_DEBUG) && defined(NRF52_PLATFORM)
@@ -138,13 +138,13 @@ void loop() {
 #endif
   rtc_clock.tick();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.loop();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
 #endif
   if (the_mesh.getNodePrefs()->powersaving_enabled && !the_mesh.hasPendingWork()) {
 #if defined(NRF52_PLATFORM)
-#ifdef HAS_EX_WATCHDOG
-    uint32_t sleep_interval = ex_watchdog.getIntervalMs()/1000;
+#ifdef HAS_EXTERNAL_WATCHDOG
+    uint32_t sleep_interval = external_watchdog.getIntervalMs()/1000;
     board.sleep((sleep_interval > 1800) ? 1800 : sleep_interval);             // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
 #else
     board.sleep(1800);             // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
@@ -152,8 +152,8 @@ void loop() {
     board.sleep(1800); // nrf ignores seconds param, sleeps whenever possible
 #else
     if (the_mesh.millisHasNowPassed(lastActive + nextSleepinSecs * 1000)) { // To check if it is time to sleep
-#ifdef HAS_EX_WATCHDOG
-      uint32_t sleep_interval = ex_watchdog.getIntervalMs()/1000;
+#ifdef HAS_EXTERNAL_WATCHDOG
+      uint32_t sleep_interval = external_watchdog.getIntervalMs()/1000;
       board.sleep((sleep_interval > 1800) ? 1800 : sleep_interval);             // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
 #else
       board.sleep(1800);             // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
diff --git a/examples/simple_room_server/main.cpp b/examples/simple_room_server/main.cpp
index bb6a860b..d20ebc6d 100644
--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -24,8 +24,8 @@ void setup() {
 
   board.begin();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.begin();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
 #endif
 
 #ifdef DISPLAY_CLASS
@@ -117,7 +117,7 @@ void loop() {
   ui_task.loop();
 #endif
   rtc_clock.tick();
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.loop();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
 #endif
 }
diff --git a/examples/simple_secure_chat/main.cpp b/examples/simple_secure_chat/main.cpp
index a2182236..a21741db 100644
--- a/examples/simple_secure_chat/main.cpp
+++ b/examples/simple_secure_chat/main.cpp
@@ -559,8 +559,8 @@ void setup() {
 
   board.begin();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.begin();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
 #endif
 
   if (!radio_init()) { halt(); }
@@ -594,7 +594,7 @@ void setup() {
 void loop() {
   the_mesh.loop();
   rtc_clock.tick();
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.loop();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
 #endif
 }
diff --git a/examples/simple_sensor/main.cpp b/examples/simple_sensor/main.cpp
index e9ff9387..346f4dfc 100644
--- a/examples/simple_sensor/main.cpp
+++ b/examples/simple_sensor/main.cpp
@@ -58,8 +58,8 @@ void setup() {
 
   board.begin();
 
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.begin();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.begin();
 #endif
 
 #ifdef DISPLAY_CLASS
@@ -151,7 +151,7 @@ void loop() {
   ui_task.loop();
 #endif
   rtc_clock.tick();
-#ifdef HAS_EX_WATCHDOG
-  ex_watchdog.loop();
+#ifdef HAS_EXTERNAL_WATCHDOG
+  external_watchdog.loop();
 #endif
 }
diff --git a/src/helpers/ExWatchdogManager.h b/src/helpers/ExternalWatchdogManager.h
similarity index 71%
rename from src/helpers/ExWatchdogManager.h
rename to src/helpers/ExternalWatchdogManager.h
index 4df901b7..9ef8abaa 100644
--- a/src/helpers/ExWatchdogManager.h
+++ b/src/helpers/ExternalWatchdogManager.h
@@ -1,10 +1,10 @@
 #pragma once
 
-class ExWatchdogManager {
+class ExternalWatchdogManager {
 protected:
   unsigned long next_feed_watchdog;
 public:
-  ExWatchdogManager() { next_feed_watchdog = 0; }
+  ExternalWatchdogManager() { next_feed_watchdog = 0; }
   virtual bool begin() { return false; }
   virtual void loop() { }
   virtual unsigned long getIntervalMs() const { return 0; }
diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini
index 3eb51f0a..1bc7e7fa 100644
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@@ -14,10 +14,10 @@ build_flags =  ${nrf52_base.build_flags}
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D HAS_EX_WATCHDOG
-  -D EX_WATCHDOG_DONE_PIN=9
-  -D EX_WATCHDOG_WAKE_PIN=10
-  -D EX_WATCHDOG_TIMEOUT_MS=480000 ;(6*60*1000) ; 6 minute watchdog
+  -D HAS_EXTERNAL_WATCHDOG
+  -D EXTERNAL_WATCHDOG_DONE_PIN=9
+  -D EXTERNAL_WATCHDOG_WAKE_PIN=10
+  -D EXTERNAL_WATCHDOG_TIMEOUT_MS=480000 ;(6*60*1000) ; 6 minute watchdog
 
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp
index 7eb44bfa..fa234202 100644
--- a/variants/heltec_mesh_solar/target.cpp
+++ b/variants/heltec_mesh_solar/target.cpp
@@ -13,7 +13,7 @@ VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
 SolarSensorManager sensors = SolarSensorManager(nmea);
-SolarExWatchdog ex_watchdog;
+SolarExternalWatchdog external_watchdog;
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;
@@ -123,34 +123,34 @@ bool SolarSensorManager::setSettingValue(const char* name, const char* value) {
   return false;  // not supported
 }
 
-bool SolarExWatchdog::begin() {
+bool SolarExternalWatchdog::begin() {
   next_feed_watchdog = 0;
-  pinMode(EX_WATCHDOG_WAKE_PIN, INPUT);
-  pinMode(EX_WATCHDOG_DONE_PIN, OUTPUT);
+  pinMode(EXTERNAL_WATCHDOG_WAKE_PIN, INPUT);
+  pinMode(EXTERNAL_WATCHDOG_DONE_PIN, OUTPUT);
   delay(1);
-  digitalWrite(EX_WATCHDOG_DONE_PIN, LOW);
+  digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, LOW);
   delay(1);
   feed();
   return true;
 }
-void SolarExWatchdog::loop() {
+void SolarExternalWatchdog::loop() {
   if (millis() > next_feed_watchdog) {
     feed();
-    next_feed_watchdog = millis() + EX_WATCHDOG_TIMEOUT_MS;
+    next_feed_watchdog = millis() + EXTERNAL_WATCHDOG_TIMEOUT_MS;
   }
 }
 
-unsigned long SolarExWatchdog::getIntervalMs() const {
+unsigned long SolarExternalWatchdog::getIntervalMs() const {
     unsigned long interval_ms = 0;
     interval_ms = next_feed_watchdog - millis();
-    if(interval_ms > EX_WATCHDOG_TIMEOUT_MS) {
-      interval_ms = EX_WATCHDOG_TIMEOUT_MS;
+    if(interval_ms > EXTERNAL_WATCHDOG_TIMEOUT_MS) {
+      interval_ms = EXTERNAL_WATCHDOG_TIMEOUT_MS;
     }
     return interval_ms;
 }
 
-void SolarExWatchdog::feed() {
-    digitalWrite(EX_WATCHDOG_DONE_PIN, HIGH);
+void SolarExternalWatchdog::feed() {
+    digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, HIGH);
     delay(1);
-    digitalWrite(EX_WATCHDOG_DONE_PIN, LOW);
+    digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, LOW);
 }
diff --git a/variants/heltec_mesh_solar/target.h b/variants/heltec_mesh_solar/target.h
index 3fc78672..124e3afb 100644
--- a/variants/heltec_mesh_solar/target.h
+++ b/variants/heltec_mesh_solar/target.h
@@ -8,7 +8,7 @@
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>
 #include <helpers/sensors/LocationProvider.h>
-#include <helpers/ExWatchdogManager.h>
+#include <helpers/ExternalWatchdogManager.h>
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/ST7789Display.h>
 #endif
@@ -31,9 +31,9 @@ public:
   bool setSettingValue(const char* name, const char* value) override;
 };
 
-class SolarExWatchdog : public ExWatchdogManager {
+class SolarExternalWatchdog : public ExternalWatchdogManager {
 public:
-    SolarExWatchdog() {}
+    SolarExternalWatchdog() {}
     bool begin() override;
     void loop() override;
     unsigned long getIntervalMs() const override;
@@ -44,7 +44,7 @@ extern MeshSolarBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
 extern SolarSensorManager sensors;
-extern SolarExWatchdog ex_watchdog;
+extern SolarExternalWatchdog external_watchdog;
 
 #ifdef DISPLAY_CLASS
   extern DISPLAY_CLASS display;