diff --git a/ArduinoTimers.h b/ArduinoTimers.h
index 84fb17b..c705e4d 100644
--- a/ArduinoTimers.h
+++ b/ArduinoTimers.h
@@ -11,8 +11,8 @@
 #include "ATMEGA2560/Timer.h"
 #elif defined(ARDUINO_AVR_UNO)
 #include "ATMEGA328/Timer.h"
-#elif defined(ARDUINO_AVR_UNO_WIFI_REV2)
-#include "ATMEGA4809/Timer.h"
+#elif defined(ARDUINO_ARCH_MEGAAVR)
+#include "ATMEGA4809/EveryTimerB.h"
 #else
 #error "Cannot compile - ArduinoTimers library does not support your board, or you are missing compatible build flags."
 #endif
diff --git a/DCC.h b/DCC.h
index 9fbdaf7..db746cb 100644
--- a/DCC.h
+++ b/DCC.h
@@ -155,8 +155,8 @@ private:
 #define ARDUINO_TYPE "NANO"
 #elif defined(ARDUINO_AVR_MEGA2560)
 #define ARDUINO_TYPE "MEGA"
-#elif defined(ARDUINO_AVR_UNO_WIFI_REV2)
-#define ARDUINO_TYPE "UNOWIFIR2"
+#elif defined(ARDUINO_ARCH_MEGAAVR)
+#define ARDUINO_TYPE "MEGAAVR"
 #else
 #error CANNOT COMPILE - DCC++ EX ONLY WORKS WITH AN ARDUINO UNO, NANO 328, OR ARDUINO MEGA 1280/2560
 #endif