diff --git a/src/Arduboy2.h b/src/Arduboy2.h
index d541982..2972bbd 100644
--- a/src/Arduboy2.h
+++ b/src/Arduboy2.h
@@ -1,7 +1,7 @@
-#ifndef Arduboy2_h
-#define Arduboy2_h
+#ifndef ARDUBOY2_H
+#define ARDUBOY2_H
 
-#include "core/core.h"
+#include "ArduboyCore.h"
 #include <Print.h>
 #include <limits.h>
 
@@ -20,7 +20,7 @@
 #define EEPROM_STORAGE_SPACE_START 16 // and onward
 
 // eeprom settings above are neded for audio
-#include "audio/audio.h"
+#include "ArduboyAudio.h"
 
 #define PIXEL_SAFE_MODE
 
diff --git a/src/audio/audio.cpp b/src/ArduboyAudio.cpp
similarity index 96%
rename from src/audio/audio.cpp
rename to src/ArduboyAudio.cpp
index 748af8e..5e8db9e 100644
--- a/src/audio/audio.cpp
+++ b/src/ArduboyAudio.cpp
@@ -1,5 +1,5 @@
 #include "Arduboy2.h"
-#include "audio.h"
+#include "ArduboyAudio.h"
 
 bool ArduboyAudio::audio_enabled = false;
 
diff --git a/src/audio/audio.h b/src/ArduboyAudio.h
similarity index 83%
rename from src/audio/audio.h
rename to src/ArduboyAudio.h
index 31bc7e4..729b6d6 100644
--- a/src/audio/audio.h
+++ b/src/ArduboyAudio.h
@@ -1,5 +1,5 @@
-#ifndef ArduboyAudio_h
-#define ArduboyAudio_h
+#ifndef ARDUBOY_AUDIO_H
+#define ARDUBOY_AUDIO_H
 
 #include <Arduino.h>
 #include <EEPROM.h>
diff --git a/src/core/core.cpp b/src/ArduboyCore.cpp
similarity index 99%
rename from src/core/core.cpp
rename to src/ArduboyCore.cpp
index d9f4493..ab8a3a0 100644
--- a/src/core/core.cpp
+++ b/src/ArduboyCore.cpp
@@ -1,4 +1,4 @@
-#include "core.h"
+#include "ArduboyCore.h"
 
 // need to redeclare these here since we declare them static in .h
 volatile uint8_t *ArduboyCore::csport, *ArduboyCore::dcport;
diff --git a/src/core/core.h b/src/ArduboyCore.h
similarity index 99%
rename from src/core/core.h
rename to src/ArduboyCore.h
index cd48692..1051ca3 100644
--- a/src/core/core.h
+++ b/src/ArduboyCore.h
@@ -1,5 +1,5 @@
-#ifndef ArduboyCore_h
-#define ArduboyCore_h
+#ifndef ARDUBOY_CORE_H
+#define ARDUBOY_CORE_H
 
 #include <avr/power.h>
 #include <SPI.h>