diff --git a/Source/Project64-core/Project64-core.vcxproj b/Source/Project64-core/Project64-core.vcxproj
index 435939ac2..df72cf7a2 100644
--- a/Source/Project64-core/Project64-core.vcxproj
+++ b/Source/Project64-core/Project64-core.vcxproj
@@ -5,17 +5,17 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -36,7 +36,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="AppInit.cpp" />
-    <ClCompile Include="logging.cpp" />
+    <ClCompile Include="Logging.cpp" />
     <ClCompile Include="Multilanguage\LanguageClass.cpp" />
     <ClCompile Include="N64System\CheatClass.cpp" />
     <ClCompile Include="N64System\EmulationThread.cpp" />
@@ -71,13 +71,13 @@
     <ClCompile Include="N64System\Recompiler\RecompilerOps.cpp" />
     <ClCompile Include="N64System\Recompiler\RegInfo.cpp" />
     <ClCompile Include="N64System\Recompiler\SectionInfo.cpp" />
-    <ClCompile Include="N64System\Recompiler\x86CodeLog.cpp" />
+    <ClCompile Include="N64System\Recompiler\X86CodeLog.cpp" />
     <ClCompile Include="N64System\Recompiler\X86ops.cpp" />
     <ClCompile Include="N64System\SpeedLimitorClass.cpp" />
     <ClCompile Include="N64System\SystemGlobals.cpp" />
     <ClCompile Include="Plugins\AudioPlugin.cpp" />
     <ClCompile Include="Plugins\ControllerPlugin.cpp" />
-    <ClCompile Include="Plugins\GFXplugin.cpp" />
+    <ClCompile Include="Plugins\GFXPlugin.cpp" />
     <ClCompile Include="Plugins\PluginBase.cpp" />
     <ClCompile Include="Plugins\PluginClass.cpp" />
     <ClCompile Include="Plugins\RSPPlugin.cpp" />
@@ -120,62 +120,62 @@
     <ClInclude Include="AppInit.h" />
     <ClInclude Include="Logging.h" />
     <ClInclude Include="Multilanguage.h" />
-    <ClInclude Include="Multilanguage\Language Class.h" />
-    <ClInclude Include="N64System\Cheat Class.h" />
-    <ClInclude Include="N64System\Frame Per Second Class.h" />
-    <ClInclude Include="N64System\Interpreter\Interpreter CPU.h" />
-    <ClInclude Include="N64System\Interpreter\Interpreter Ops 32.h" />
-    <ClInclude Include="N64System\Interpreter\Interpreter Ops.h" />
+    <ClInclude Include="Multilanguage\LanguageClass.h" />
+    <ClInclude Include="N64System\CheatClass.h" />
+    <ClInclude Include="N64System\FramePerSecondClass.h" />
+    <ClInclude Include="N64System\Interpreter\InterpreterCPU.h" />
+    <ClInclude Include="N64System\Interpreter\InterpreterOps32.h" />
+    <ClInclude Include="N64System\Interpreter\InterpreterOps.h" />
     <ClInclude Include="N64System\Mips\Audio.h" />
     <ClInclude Include="N64System\Mips\Dma.h" />
     <ClInclude Include="N64System\Mips\Eeprom.h" />
     <ClInclude Include="N64System\Mips\FlashRam.h" />
-    <ClInclude Include="N64System\Mips\Memory Class.h" />
-    <ClInclude Include="N64System\Mips\Memory Virtual Mem.h" />
-    <ClInclude Include="N64System\Mips\Mempak.H" />
+    <ClInclude Include="N64System\Mips\MemoryClass.h" />
+    <ClInclude Include="N64System\Mips\MemoryVirtualMem.h" />
+    <ClInclude Include="N64System\Mips\Mempak.h" />
     <ClInclude Include="N64System\Mips\OpCode.h" />
     <ClInclude Include="N64System\Mips\OpcodeName.h" />
-    <ClInclude Include="N64System\Mips\Pif Ram.h" />
-    <ClInclude Include="N64System\Mips\Register Class.h" />
+    <ClInclude Include="N64System\Mips\PifRam.h" />
+    <ClInclude Include="N64System\Mips\RegisterClass.h" />
     <ClInclude Include="N64System\Mips\Rumblepak.h" />
     <ClInclude Include="N64System\Mips\Sram.h" />
-    <ClInclude Include="N64System\Mips\System Events.h" />
-    <ClInclude Include="N64System\Mips\System Timing.h" />
-    <ClInclude Include="N64System\Mips\TLB Class.h" />
+    <ClInclude Include="N64System\Mips\SystemEvents.h" />
+    <ClInclude Include="N64System\Mips\SystemTiming.h" />
+    <ClInclude Include="N64System\Mips\TLBClass.h" />
     <ClInclude Include="N64System\Mips\TranslateVaddr.h" />
-    <ClInclude Include="N64System\N64 Class.h" />
-    <ClInclude Include="N64System\N64 Rom Class.h" />
-    <ClInclude Include="N64System\N64 Types.h" />
-    <ClInclude Include="N64System\Profiling Class.h" />
-    <ClInclude Include="N64System\Recompiler\Code Block.h" />
-    <ClInclude Include="N64System\Recompiler\Code Section.h" />
-    <ClInclude Include="N64System\Recompiler\Exit Info.h" />
-    <ClInclude Include="N64System\Recompiler\Function Info.h" />
-    <ClInclude Include="N64System\Recompiler\Function Map Class.h" />
-    <ClInclude Include="N64System\Recompiler\Jump Info.h" />
-    <ClInclude Include="N64System\Recompiler\Loop Analysis.h" />
-    <ClInclude Include="N64System\Recompiler\Recompiler Class.h" />
-    <ClInclude Include="N64System\Recompiler\Recompiler Memory.h" />
-    <ClInclude Include="N64System\Recompiler\Recompiler Ops.h" />
-    <ClInclude Include="N64System\Recompiler\Reg Info.h" />
-    <ClInclude Include="N64System\Recompiler\Section Info.h" />
-    <ClInclude Include="N64System\Recompiler\x86CodeLog.h" />
+    <ClInclude Include="N64System\N64Class.h" />
+    <ClInclude Include="N64System\N64RomClass.h" />
+    <ClInclude Include="N64System\N64Types.h" />
+    <ClInclude Include="N64System\ProfilingClass.h" />
+    <ClInclude Include="N64System\Recompiler\CodeBlock.h" />
+    <ClInclude Include="N64System\Recompiler\CodeSection.h" />
+    <ClInclude Include="N64System\Recompiler\ExitInfo.h" />
+    <ClInclude Include="N64System\Recompiler\FunctionInfo.h" />
+    <ClInclude Include="N64System\Recompiler\FunctionMapClass.h" />
+    <ClInclude Include="N64System\Recompiler\JumpInfo.h" />
+    <ClInclude Include="N64System\Recompiler\LoopAnalysis.h" />
+    <ClInclude Include="N64System\Recompiler\RecompilerClass.h" />
+    <ClInclude Include="N64System\Recompiler\RecompilerMemory.h" />
+    <ClInclude Include="N64System\Recompiler\RecompilerOps.h" />
+    <ClInclude Include="N64System\Recompiler\RegInfo.h" />
+    <ClInclude Include="N64System\Recompiler\SectionInfo.h" />
+    <ClInclude Include="N64System\Recompiler\X86CodeLog.h" />
     <ClInclude Include="N64System\Recompiler\X86ops.h" />
-    <ClInclude Include="N64System\Speed Limitor Class.h" />
-    <ClInclude Include="N64System\System Globals.h" />
+    <ClInclude Include="N64System\SpeedLimitorClass.h" />
+    <ClInclude Include="N64System\SystemGlobals.h" />
     <ClInclude Include="Notification.h" />
     <ClInclude Include="Plugin.h" />
-    <ClInclude Include="Plugins\Audio Plugin.h" />
-    <ClInclude Include="Plugins\Controller Plugin.h" />
-    <ClInclude Include="Plugins\GFX plugin.h" />
-    <ClInclude Include="Plugins\Plugin Base.h" />
-    <ClInclude Include="Plugins\Plugin Class.h" />
-    <ClInclude Include="Plugins\RSP Plugin.h" />
-    <ClInclude Include="Settings\Debug Settings.h" />
-    <ClInclude Include="Settings\Game Settings.h" />
-    <ClInclude Include="Settings\Logging Settings.h" />
-    <ClInclude Include="Settings\N64System Settings.h" />
-    <ClInclude Include="Settings\Recompiler Settings.h" />
+    <ClInclude Include="Plugins\AudioPlugin.h" />
+    <ClInclude Include="Plugins\ControllerPlugin.h" />
+    <ClInclude Include="Plugins\GFXPlugin.h" />
+    <ClInclude Include="Plugins\PluginBase.h" />
+    <ClInclude Include="Plugins\PluginClass.h" />
+    <ClInclude Include="Plugins\RSPPlugin.h" />
+    <ClInclude Include="Settings\DebugSettings.h" />
+    <ClInclude Include="Settings\GameSettings.h" />
+    <ClInclude Include="Settings\LoggingSettings.h" />
+    <ClInclude Include="Settings\N64SystemSettings.h" />
+    <ClInclude Include="Settings\RecompilerSettings.h" />
     <ClInclude Include="Settings\Settings.h" />
     <ClInclude Include="Settings\SettingsClass.h" />
     <ClInclude Include="Settings\SettingType\SettingsType-Application.h" />
diff --git a/Source/Project64-core/Project64-core.vcxproj.filters b/Source/Project64-core/Project64-core.vcxproj.filters
index 05c2b696d..382b3b7d1 100644
--- a/Source/Project64-core/Project64-core.vcxproj.filters
+++ b/Source/Project64-core/Project64-core.vcxproj.filters
@@ -299,7 +299,7 @@
     <ClInclude Include="AppInit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Multilanguage\Language Class.h">
+    <ClInclude Include="Multilanguage\LanguageClass.h">
       <Filter>Header Files\Multilanguage</Filter>
     </ClInclude>
     <ClInclude Include="Settings\SettingType\SettingsType-Application.h">
@@ -371,31 +371,31 @@
     <ClInclude Include="Notification.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\Plugin Class.h">
+    <ClInclude Include="Plugins\PluginClass.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\Audio Plugin.h">
+    <ClInclude Include="Plugins\AudioPlugin.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\Controller Plugin.h">
+    <ClInclude Include="Plugins\ControllerPlugin.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\GFX plugin.h">
+    <ClInclude Include="Plugins\GFXPlugin.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\Plugin Base.h">
+    <ClInclude Include="Plugins\PluginBase.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Plugins\RSP Plugin.h">
+    <ClInclude Include="Plugins\RSPPlugin.h">
       <Filter>Header Files\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\Debug Settings.h">
+    <ClInclude Include="Settings\DebugSettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\Game Settings.h">
+    <ClInclude Include="Settings\GameSettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\N64System Settings.h">
+    <ClInclude Include="Settings\N64SystemSettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
     <ClInclude Include="Multilanguage.h">
@@ -407,94 +407,94 @@
     <ClInclude Include="Version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\Recompiler Settings.h">
+    <ClInclude Include="Settings\RecompilerSettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
-    <ClInclude Include="3rd Party\7zip.h">
+    <ClInclude Include="3rdParty\7zip.h">
       <Filter>Header Files\3rd Party</Filter>
     </ClInclude>
-    <ClInclude Include="3rd Party\zip.h">
+    <ClInclude Include="3rdParty\zip.h">
       <Filter>Header Files\3rd Party</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rd Party\zlib\zconf.h">
+    <ClInclude Include="..\3rdParty\zlib\zconf.h">
       <Filter>Header Files\3rd Party\Zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rd Party\zlib\zlib.h">
+    <ClInclude Include="..\3rdParty\zlib\zlib.h">
       <Filter>Header Files\3rd Party\Zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\unzip.h">
+    <ClInclude Include="..\3rdParty\zlib\contrib\minizip\unzip.h">
       <Filter>Header Files\3rd Party\Zlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\zip.h">
+    <ClInclude Include="..\3rdParty\zlib\contrib\minizip\zip.h">
       <Filter>Header Files\3rd Party\Zlib</Filter>
     </ClInclude>
     <ClInclude Include="Logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Settings\Logging Settings.h">
+    <ClInclude Include="Settings\LoggingSettings.h">
       <Filter>Header Files\Settings</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Cheat Class.h">
+    <ClInclude Include="N64System\CheatClass.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Frame Per Second Class.h">
+    <ClInclude Include="N64System\FramePerSecondClass.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\N64 Class.h">
+    <ClInclude Include="N64System\N64Class.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\N64 Rom Class.h">
+    <ClInclude Include="N64System\N64RomClass.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\N64 Types.h">
+    <ClInclude Include="N64System\N64Types.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Profiling Class.h">
+    <ClInclude Include="N64System\ProfilingClass.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Speed Limitor Class.h">
+    <ClInclude Include="N64System\Speed LimitorClass.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\System Globals.h">
+    <ClInclude Include="N64System\SystemGlobals.h">
       <Filter>Header Files\N64 System</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Code Block.h">
+    <ClInclude Include="N64System\Recompiler\CodeBlock.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Code Section.h">
+    <ClInclude Include="N64System\Recompiler\CodeSection.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Exit Info.h">
+    <ClInclude Include="N64System\Recompiler\ExitInfo.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Function Info.h">
+    <ClInclude Include="N64System\Recompiler\FunctionInfo.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Function Map Class.h">
+    <ClInclude Include="N64System\Recompiler\FunctionMapClass.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Jump Info.h">
+    <ClInclude Include="N64System\Recompiler\JumpInfo.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Loop Analysis.h">
+    <ClInclude Include="N64System\Recompiler\LoopAnalysis.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Recompiler Class.h">
+    <ClInclude Include="N64System\Recompiler\RecompilerClass.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Recompiler Memory.h">
+    <ClInclude Include="N64System\Recompiler\RecompilerMemory.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Recompiler Ops.h">
+    <ClInclude Include="N64System\Recompiler\RecompilerOps.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Reg Info.h">
+    <ClInclude Include="N64System\Recompiler\RegInfo.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\Section Info.h">
+    <ClInclude Include="N64System\Recompiler\SectionInfo.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Recompiler\x86CodeLog.h">
+    <ClInclude Include="N64System\Recompiler\X86CodeLog.h">
       <Filter>Header Files\N64 System\Recompiler</Filter>
     </ClInclude>
     <ClInclude Include="N64System\Recompiler\X86ops.h">
@@ -512,10 +512,10 @@
     <ClInclude Include="N64System\Mips\FlashRam.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\Memory Class.h">
+    <ClInclude Include="N64System\Mips\MemoryClass.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\Memory Virtual Mem.h">
+    <ClInclude Include="N64System\Mips\MemoryVirtualMem.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
     <ClInclude Include="N64System\Mips\Mempak.H">
@@ -527,10 +527,10 @@
     <ClInclude Include="N64System\Mips\OpcodeName.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\Pif Ram.h">
+    <ClInclude Include="N64System\Mips\PifRam.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\Register Class.h">
+    <ClInclude Include="N64System\Mips\RegisterClass.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
     <ClInclude Include="N64System\Mips\Rumblepak.h">
@@ -539,25 +539,25 @@
     <ClInclude Include="N64System\Mips\Sram.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\System Events.h">
+    <ClInclude Include="N64System\Mips\SystemEvents.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\System Timing.h">
+    <ClInclude Include="N64System\Mips\SystemTiming.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Mips\TLB Class.h">
+    <ClInclude Include="N64System\Mips\TLBClass.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
     <ClInclude Include="N64System\Mips\TranslateVaddr.h">
       <Filter>Header Files\N64 System\Mips</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Interpreter\Interpreter CPU.h">
+    <ClInclude Include="N64System\Interpreter\InterpreterCPU.h">
       <Filter>Header Files\N64 System\Interpreter</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Interpreter\Interpreter Ops 32.h">
+    <ClInclude Include="N64System\Interpreter\InterpreterOps32.h">
       <Filter>Header Files\N64 System\Interpreter</Filter>
     </ClInclude>
-    <ClInclude Include="N64System\Interpreter\Interpreter Ops.h">
+    <ClInclude Include="N64System\Interpreter\InterpreterOps.h">
       <Filter>Header Files\N64 System\Interpreter</Filter>
     </ClInclude>
     <ClInclude Include="Settings\SettingsClass.h">