diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 1892a7a1..16063a6a 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -143,6 +143,9 @@ bool isDoubleBondedActive(uint8_t pin);
 #ifdef UNO_WIFI_REV2_328MODE
 #include <UNO_compat.h>
 #endif
+#ifdef AVR_NANO_4809_328MODE
+#include <NANO_compat.h>
+#endif
 #if defined(HAVE_HWSERIAL0) && defined(HAVE_CDCSERIAL)
 #error "Targets with both UART0 and CDC serial not supported"
 #endif
diff --git a/cores/arduino/NANO_Compat.cpp b/cores/arduino/NANO_compat.cpp
similarity index 99%
rename from cores/arduino/NANO_Compat.cpp
rename to cores/arduino/NANO_compat.cpp
index f199125d..997d36e3 100644
--- a/cores/arduino/NANO_Compat.cpp
+++ b/cores/arduino/NANO_compat.cpp
@@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "NANO_Compat.h"
+#include "NANO_compat.h"
 
 #ifdef AVR_NANO_4809_328MODE
 
diff --git a/cores/arduino/NANO_Compat.h b/cores/arduino/NANO_compat.h
similarity index 100%
rename from cores/arduino/NANO_Compat.h
rename to cores/arduino/NANO_compat.h
diff --git a/cores/test/CMakeLists.txt b/cores/test/CMakeLists.txt
index 2605c248..bea90144 100644
--- a/cores/test/CMakeLists.txt
+++ b/cores/test/CMakeLists.txt
@@ -25,7 +25,7 @@ set(TEST_TARGET testArduinoCore-megaavr)
 
 set(TEST_SRCS
   src/test_main.cpp
-  ../arduino/NANO_Compat.cpp
+  ../arduino/NANO_compat.cpp
 )
 
 ##########################################################################
diff --git a/cores/test/src/test_main.cpp b/cores/test/src/test_main.cpp
index 41adfe12..4b0d36da 100644
--- a/cores/test/src/test_main.cpp
+++ b/cores/test/src/test_main.cpp
@@ -19,11 +19,11 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
-#include "../../arduino/NANO_Compat.h"
+#include "../../arduino/NANO_compat.h"
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_Compat::DDRBClass") {
+SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_compat::DDRBClass") {
   PORT_t portb, porte;
 
   DDRBClass DDRB(&portb, &porte);
@@ -63,7 +63,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_Compat::DDR
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_Compat::PORTBClass") {
+SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_compat::PORTBClass") {
   PORT_t portb, porte;
 
   PORTBClass PORTB(&portb, &porte);
@@ -103,7 +103,7 @@ SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_Compat::PO
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_Compat::DDRCClass") {
+SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_compat::DDRCClass") {
   PORT_t porta, portd;
 
   DDRCClass DDRC(&porta, &portd);
@@ -149,7 +149,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_Compat::DDR
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_Compat::PORTCClass") {
+SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_compat::PORTCClass") {
   PORT_t porta, portd;
 
   PORTCClass PORTC(&porta, &portd);
@@ -195,7 +195,7 @@ SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_Compat::PO
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_Compat::DDRDClass") {
+SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_compat::DDRDClass") {
   PORT_t porta, portb, portc, portf;
 
   DDRDClass DDRD(&porta, &portb, &portc, &portf);
@@ -245,7 +245,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_Compat::DDR
 
 /*****************************************************************************/
 
-SCENARIO("Testing Arduino Nano 4809 PORTD compatibility class", "NANO_Compat::PORTDClass") {
+SCENARIO("Testing Arduino Nano 4809 PORTD compatibility class", "NANO_compat::PORTDClass") {
   PORT_t porta, portb, portc, portf;
 
   PORTDClass PORTD(&porta, &portb, &portc, &portf);