diff --git a/MiSTer.vcxproj b/MiSTer.vcxproj
index 390f559..9f7bdbc 100644
--- a/MiSTer.vcxproj
+++ b/MiSTer.vcxproj
@@ -76,16 +76,16 @@
     <ClCompile Include="scheduler.cpp" />
     <ClCompile Include="spi.cpp" />
     <ClCompile Include="support\arcade\buffer.cpp" />
-    <ClCompile Include="support\arcade\romutils.cpp" />
+    <ClCompile Include="support\arcade\mra_loader.cpp" />
     <ClCompile Include="support\archie\archie.cpp" />
     <ClCompile Include="support\c64\c64.cpp" />
-    <ClCompile Include="support\megacd\cdd.cpp" />
     <ClCompile Include="support\megacd\megacd.cpp" />
+    <ClCompile Include="support\megacd\megacdd.cpp" />
     <ClCompile Include="support\minimig\minimig_boot.cpp" />
     <ClCompile Include="support\minimig\minimig_config.cpp" />
     <ClCompile Include="support\minimig\minimig_fdd.cpp" />
     <ClCompile Include="support\minimig\minimig_hdd.cpp" />
-    <ClCompile Include="support\neogeo\loader.cpp" />
+    <ClCompile Include="support\neogeo\neogeo_loader.cpp" />
     <ClCompile Include="support\pcecd\pcecd.cpp" />
     <ClCompile Include="support\pcecd\pcecdd.cpp" />
     <ClCompile Include="support\sharpmz\sharpmz.cpp" />
@@ -135,7 +135,7 @@
     <ClInclude Include="spi.h" />
     <ClInclude Include="support.h" />
     <ClInclude Include="support\arcade\buffer.h" />
-    <ClInclude Include="support\arcade\romutils.h" />
+    <ClInclude Include="support\arcade\mra_loader.h" />
     <ClInclude Include="support\archie\archie.h" />
     <ClInclude Include="support\c64\c64.h" />
     <ClInclude Include="support\megacd\megacd.h" />
@@ -144,7 +144,7 @@
     <ClInclude Include="support\minimig\minimig_fdd.h" />
     <ClInclude Include="support\minimig\minimig_hdd.h" />
     <ClInclude Include="support\minimig\minimig_hdd_internal.h" />
-    <ClInclude Include="support\neogeo\loader.h" />
+    <ClInclude Include="support\neogeo\neogeo_loader.h" />
     <ClInclude Include="support\pcecd\pcecd.h" />
     <ClInclude Include="support\sharpmz\sharpmz.h" />
     <ClInclude Include="support\snes\snes.h" />
diff --git a/MiSTer.vcxproj.filters b/MiSTer.vcxproj.filters
index 457d032..3a031d7 100644
--- a/MiSTer.vcxproj.filters
+++ b/MiSTer.vcxproj.filters
@@ -139,12 +139,6 @@
     <ClCompile Include="support\archie\archie.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
-    <ClCompile Include="support\megacd\cdd.cpp">
-      <Filter>Source Files\support</Filter>
-    </ClCompile>
-    <ClCompile Include="support\neogeo\loader.cpp">
-      <Filter>Source Files\support</Filter>
-    </ClCompile>
     <ClCompile Include="support\megacd\megacd.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
@@ -175,9 +169,6 @@
     <ClCompile Include="support\arcade\buffer.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
-    <ClCompile Include="support\arcade\romutils.cpp">
-      <Filter>Source Files\support</Filter>
-    </ClCompile>
     <ClCompile Include="recent.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -190,6 +181,15 @@
     <ClCompile Include="support\pcecd\pcecdd.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
+    <ClCompile Include="support\megacd\megacdd.cpp">
+      <Filter>Source Files\support</Filter>
+    </ClCompile>
+    <ClCompile Include="support\neogeo\neogeo_loader.cpp">
+      <Filter>Source Files\support</Filter>
+    </ClCompile>
+    <ClCompile Include="support\arcade\mra_loader.cpp">
+      <Filter>Source Files\support</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="battery.h">
@@ -303,9 +303,6 @@
     <ClInclude Include="lib\imlib2\Imlib2.h">
       <Filter>Header Files\imlib</Filter>
     </ClInclude>
-    <ClInclude Include="support\neogeo\loader.h">
-      <Filter>Header Files\support</Filter>
-    </ClInclude>
     <ClInclude Include="support\st\st_tos.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
@@ -342,9 +339,6 @@
     <ClInclude Include="support\megacd\megacd.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
-    <ClInclude Include="support\arcade\romutils.h">
-      <Filter>Header Files\support</Filter>
-    </ClInclude>
     <ClInclude Include="support\arcade\buffer.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
@@ -360,5 +354,11 @@
     <ClInclude Include="support\pcecd\pcecd.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
+    <ClInclude Include="support\neogeo\neogeo_loader.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
+    <ClInclude Include="support\arcade\mra_loader.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/support.h b/support.h
index d6507d4..884a2f9 100644
--- a/support.h
+++ b/support.h
@@ -20,10 +20,10 @@
 #include "support/snes/snes.h"
 
 // NeoGeo  support
-#include "support/neogeo/loader.h"
+#include "support/neogeo/neogeo_loader.h"
 
 // Arcade support
-#include "support/arcade/romutils.h"
+#include "support/arcade/mra_loader.h"
 
 // MEGACD  support
 #include "support/megacd/megacd.h"
diff --git a/support/arcade/romutils.cpp b/support/arcade/mra_loader.cpp
similarity index 99%
rename from support/arcade/romutils.cpp
rename to support/arcade/mra_loader.cpp
index 82d7b11..41d0a9e 100644
--- a/support/arcade/romutils.cpp
+++ b/support/arcade/mra_loader.cpp
@@ -15,7 +15,7 @@
 #include "../../lib/md5/md5.h"
 
 #include "buffer.h"
-#include "romutils.h"
+#include "mra_loader.h"
 
 #define kBigTextSize 1024
 struct arc_struct {
diff --git a/support/arcade/romutils.h b/support/arcade/mra_loader.h
similarity index 100%
rename from support/arcade/romutils.h
rename to support/arcade/mra_loader.h
diff --git a/support/megacd/cdd.cpp b/support/megacd/megacdd.cpp
similarity index 100%
rename from support/megacd/cdd.cpp
rename to support/megacd/megacdd.cpp
diff --git a/support/neogeo/loader.cpp b/support/neogeo/neogeo_loader.cpp
similarity index 99%
rename from support/neogeo/loader.cpp
rename to support/neogeo/neogeo_loader.cpp
index 8417421..f659994 100644
--- a/support/neogeo/loader.cpp
+++ b/support/neogeo/neogeo_loader.cpp
@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include <time.h>   // clock_gettime, CLOCK_REALTIME
 #include <sys/mman.h>
-#include "loader.h"
+#include "neogeo_loader.h"
 #include "../../sxmlc.h"
 #include "../../user_io.h"
 #include "../../fpga_io.h"
diff --git a/support/neogeo/loader.h b/support/neogeo/neogeo_loader.h
similarity index 100%
rename from support/neogeo/loader.h
rename to support/neogeo/neogeo_loader.h