diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 58e67b3cd7..58e134687b 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -67,17 +67,17 @@ set(SRCS	ActionReplay.cpp
 			HW/AudioInterface.cpp
 			HW/CPU.cpp
 			HW/DSP.cpp
-			HW/DSPHLE/UCodes/UCode_AX.cpp
-			HW/DSPHLE/UCodes/UCode_AXWii.cpp
-			HW/DSPHLE/UCodes/UCode_CARD.cpp
-			HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
-			HW/DSPHLE/UCodes/UCode_ROM.cpp
+			HW/DSPHLE/UCodes/AX.cpp
+			HW/DSPHLE/UCodes/AXWii.cpp
+			HW/DSPHLE/UCodes/CARD.cpp
+			HW/DSPHLE/UCodes/GBA.cpp
+			HW/DSPHLE/UCodes/INIT.cpp
+			HW/DSPHLE/UCodes/ROM.cpp
 			HW/DSPHLE/UCodes/UCodes.cpp
-			HW/DSPHLE/UCodes/UCode_GBA.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
-			HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+			HW/DSPHLE/UCodes/Zelda.cpp
+			HW/DSPHLE/UCodes/ZeldaADPCM.cpp
+			HW/DSPHLE/UCodes/ZeldaSynth.cpp
+			HW/DSPHLE/UCodes/ZeldaVoice.cpp
 			HW/DSPHLE/MailHandler.cpp
 			HW/DSPHLE/DSPHLE.cpp
 			HW/DSPLLE/DSPDebugInterface.cpp
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index e2b02f8a82..ed9525e64e 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -108,16 +108,16 @@
     <ClCompile Include="HW\DSPHLE\DSPHLE.cpp" />
     <ClCompile Include="HW\DSPHLE\MailHandler.cpp" />
     <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AX.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_CARD.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_GBA.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_ROM.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp" />
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPDebugInterface.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPHost.cpp" />
     <ClCompile Include="HW\DSPLLE\DSPLLE.cpp" />
@@ -306,15 +306,15 @@
     <ClInclude Include="HW\DSPHLE\DSPHLE.h" />
     <ClInclude Include="HW\DSPHLE\MailHandler.h" />
     <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXStructs.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_CARD.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_GBA.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_ROM.h" />
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_Zelda.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h" />
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h" />
     <ClInclude Include="HW\DSPLLE\DSPDebugInterface.h" />
     <ClInclude Include="HW\DSPLLE\DSPLLE.h" />
     <ClInclude Include="HW\DSPLLE\DSPLLEGlobals.h" />
@@ -470,4 +470,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index af927b7b9f..8a630230b7 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -311,34 +311,34 @@
     <ClCompile Include="HW\DVDInterface.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AX.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\AX.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_AXWii.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\AXWii.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_CARD.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\CARD.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_GBA.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\GBA.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\INIT.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_ROM.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ROM.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\Zelda.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaADPCM.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaSynth.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
-    <ClCompile Include="HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp">
+    <ClCompile Include="HW\DSPHLE\UCodes\ZeldaVoice.cpp">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClCompile>
     <ClCompile Include="HW\DSPHLE\UCodes\UCodes.cpp">
@@ -837,31 +837,31 @@
     <ClInclude Include="HW\DVDInterface.h">
       <Filter>HW %28Flipper/Hollywood%29\DI - Drive Interface</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AX.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AX_Voice.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXVoice.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXStructs.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXStructs.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_AXWii.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\AXWii.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_CARD.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\CARD.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_GBA.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\GBA.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_InitAudioSystem.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\INIT.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_ROM.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\ROM.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
-    <ClInclude Include="HW\DSPHLE\UCodes\UCode_Zelda.h">
+    <ClInclude Include="HW\DSPHLE\UCodes\Zelda.h">
       <Filter>HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes</Filter>
     </ClInclude>
     <ClInclude Include="HW\DSPHLE\UCodes\UCodes.h">
@@ -1211,4 +1211,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
similarity index 99%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
index 379da8bab4..5f097ee054 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
@@ -7,10 +7,10 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
 
 #define AX_GC
-#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
 
 CUCode_AX::CUCode_AX(DSPHLE* dsp_hle, u32 crc)
 	: IUCode(dsp_hle, crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/AX.h
index f29c14659b..78fab126f5 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 // We can't directly use the mixer_control field from the PB because it does
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXStructs.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
similarity index 99%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
index 6f4c2a490c..73f20f4e3b 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #if !defined(AX_GC) && !defined(AX_WII)
-#error UCode_AX_Voice.h included without specifying version
+#error AXVoice.h included without specifying version
 #endif
 
 #include <functional>
@@ -18,8 +18,8 @@
 #include "Common/MathUtil.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
 
 #ifdef AX_GC
 # define PB_TYPE AXPB
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
index 4432ac6bb9..50a10414da 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
@@ -2,16 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 //
-#define AX_WII // Used in UCode_AX_Voice.
+#define AX_WII // Used in AXVoice.
 
 #include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
 
 #include "Core/HW/DSPHLE/MailHandler.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AX_Voice.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXStructs.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
+#include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+#include "Core/HW/DSPHLE/UCodes/AXVoice.h"
+#include "Core/HW/DSPHLE/UCodes/AXWii.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
index fcee1ea139..dae363fc72 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
 
 class CUCode_AXWii : public CUCode_AX
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp
similarity index 95%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp
index 9708a90773..2407c899a5 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp
@@ -5,7 +5,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
+#include "Core/HW/DSPHLE/UCodes/CARD.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h b/Source/Core/Core/HW/DSPHLE/UCodes/CARD.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_CARD.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/CARD.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
index e9dd1da116..2d79989910 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
@@ -4,7 +4,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h"
+#include "Core/HW/DSPHLE/UCodes/GBA.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_GBA::CUCode_GBA(DSPHLE *dsp_hle, u32 crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_GBA.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/GBA.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
similarity index 93%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
index 840d284e27..4ae0d93bd1 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Core/ConfigManager.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
+#include "Core/HW/DSPHLE/UCodes/INIT.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_InitAudioSystem::CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h b/Source/Core/Core/HW/DSPHLE/UCodes/INIT.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/INIT.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
index 6048fd4c75..6ecb7dce81 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
@@ -10,7 +10,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
+#include "Core/HW/DSPHLE/UCodes/ROM.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 CUCode_Rom::CUCode_Rom(DSPHLE *dsp_hle, u32 crc)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/ROM.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
index 7253723561..08c924d1a3 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
@@ -8,14 +8,14 @@
 
 #include "Common/Hash.h"
 
-#include "Core/HW/DSPHLE/UCodes/UCode_AX.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_AXWii.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_CARD.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_GBA.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_InitAudioSystem.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_ROM.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/AX.h"
+#include "Core/HW/DSPHLE/UCodes/AXWii.h"
+#include "Core/HW/DSPHLE/UCodes/CARD.h"
+#include "Core/HW/DSPHLE/UCodes/GBA.h"
+#include "Core/HW/DSPHLE/UCodes/INIT.h"
+#include "Core/HW/DSPHLE/UCodes/ROM.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
 IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
similarity index 99%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
index b5513783f6..6ce094c45a 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
@@ -9,8 +9,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
 
 CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.h
rename to Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp
similarity index 97%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp
index 5c28a7ff41..99f71a7113 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_ADPCM.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp
@@ -4,7 +4,7 @@
 
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
 void CUCode_Zelda::AFCdecodebuffer(const s16 *coef, const char *src, signed short *out, short *histp, short *hist2p, int type)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Obsolete.txt b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaObsolete.txt
similarity index 100%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Obsolete.txt
rename to Source/Core/Core/HW/DSPHLE/UCodes/ZeldaObsolete.txt
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp
similarity index 98%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp
index 2b93f83107..662142c7b3 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaSynth.cpp
@@ -4,8 +4,8 @@
 
 #include <cmath>
 
-#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
 void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
 {
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
similarity index 99%
rename from Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
rename to Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
index f1d75e6199..f0e629dff2 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
@@ -8,8 +8,8 @@
 
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"
-#include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/DSPHLE/UCodes/Zelda.h"
 
 void CUCode_Zelda::ReadVoicePB(u32 _Addr, ZeldaVoicePB& PB)
 {