diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 9566712191..ac2e82bb6b 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -15,7 +15,7 @@ set(SRCS	Src/BPFunctions.cpp
 			Src/OnScreenDisplay.cpp
 			Src/OpcodeDecoding.cpp
 			Src/OpenCL.cpp
-			Src/OpenCL/OCLTextureDecoder.cpp
+			Src/OpenCL/TextureDecoder_OpenCL.cpp
 			Src/PerfQueryBase.cpp
 			Src/PixelEngine.cpp
 			Src/PixelShaderGen.cpp
@@ -42,11 +42,11 @@ set(SRCS	Src/BPFunctions.cpp
 set(LIBS core png)
 
 if(NOT _M_GENERIC)
-	set(SRCS ${SRCS}	Src/x64TextureDecoder.cpp
-						Src/x64DLCache.cpp)
+	set(SRCS ${SRCS}	Src/TextureDecoder_x64.cpp
+						Src/DLCache_x64.cpp)
 else()
-	set(SRCS ${SRCS}	Src/GenericTextureDecoder.cpp
-						Src/GenericDLCache.cpp)
+	set(SRCS ${SRCS}	Src/TextureDecoder_Generic.cpp
+						Src/DLCache_Generic.cpp)
 endif()
 if(NOT ${CL} STREQUAL CL-NOTFOUND)
 	list(APPEND LIBS ${CL})
diff --git a/Source/Core/VideoCommon/Src/GenericDLCache.cpp b/Source/Core/VideoCommon/Src/DLCache_Generic.cpp
similarity index 100%
rename from Source/Core/VideoCommon/Src/GenericDLCache.cpp
rename to Source/Core/VideoCommon/Src/DLCache_Generic.cpp
diff --git a/Source/Core/VideoCommon/Src/x64DLCache.cpp b/Source/Core/VideoCommon/Src/DLCache_x64.cpp
similarity index 100%
rename from Source/Core/VideoCommon/Src/x64DLCache.cpp
rename to Source/Core/VideoCommon/Src/DLCache_x64.cpp
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
index 72b0584908..839d3fd5f6 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
@@ -34,7 +34,7 @@
 #include "DataReader.h"
 
 #include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
+#include "OpenCL/TextureDecoder_OpenCL.h"
 #include "VideoConfig.h"
 
 u8* g_pVideoData = 0;
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder_OpenCL.cpp
similarity index 99%
rename from Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
rename to Source/Core/VideoCommon/Src/OpenCL/TextureDecoder_OpenCL.cpp
index daea0bfca1..02e720d4a3 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder_OpenCL.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "OCLTextureDecoder.h"
+#include "TextureDecoder_OpenCL.h"
 
 #include "../OpenCL.h"
 #include "CommonPaths.h"
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h b/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder_OpenCL.h
similarity index 100%
rename from Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.h
rename to Source/Core/VideoCommon/Src/OpenCL/TextureDecoder_OpenCL.h
diff --git a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder_Generic.cpp
similarity index 99%
rename from Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp
rename to Source/Core/VideoCommon/Src/TextureDecoder_Generic.cpp
index fa9c2b1520..a8c34cfac7 100644
--- a/Source/Core/VideoCommon/Src/GenericTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/TextureDecoder_Generic.cpp
@@ -21,7 +21,7 @@
 #include "CPUDetect.h"
 #include "TextureDecoder.h"
 #include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
+#include "OpenCL/TextureDecoder_OpenCL.h"
 #include "VideoConfig.h"
 
 #include "LookUpTables.h"
diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder_x64.cpp
similarity index 99%
rename from Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
rename to Source/Core/VideoCommon/Src/TextureDecoder_x64.cpp
index a02738479a..f15a498e24 100644
--- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/TextureDecoder_x64.cpp
@@ -8,7 +8,7 @@
 #include "CPUDetect.h"
 #include "TextureDecoder.h"
 #include "OpenCL.h"
-#include "OpenCL/OCLTextureDecoder.h"
+#include "OpenCL/TextureDecoder_OpenCL.h"
 #include "VideoConfig.h"
 
 #include "LookUpTables.h"
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index fa7ef921ae..264159def0 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -50,6 +50,7 @@
     <ClCompile Include="Src\CommandProcessor.cpp" />
     <ClCompile Include="Src\CPMemory.cpp" />
     <ClCompile Include="Src\Debugger.cpp" />
+    <ClCompile Include="Src\DLCache_x64.cpp" />
     <ClCompile Include="Src\DriverDetails.cpp" />
     <ClCompile Include="Src\EmuWindow.cpp" />
     <ClCompile Include="Src\Fifo.cpp" />
@@ -63,7 +64,7 @@
     <ClCompile Include="Src\OnScreenDisplay.cpp" />
     <ClCompile Include="Src\OpcodeDecoding.cpp" />
     <ClCompile Include="Src\OpenCL.cpp" />
-    <ClCompile Include="Src\OpenCL\OCLTextureDecoder.cpp" />
+    <ClCompile Include="Src\OpenCL\TextureDecoder_OpenCL.cpp" />
     <ClCompile Include="Src\PerfQueryBase.cpp" />
     <ClCompile Include="Src\PixelEngine.cpp" />
     <ClCompile Include="Src\PixelShaderGen.cpp" />
@@ -75,6 +76,7 @@
     </ClCompile>
     <ClCompile Include="Src\TextureCacheBase.cpp" />
     <ClCompile Include="Src\TextureConversionShader.cpp" />
+    <ClCompile Include="Src\TextureDecoder_x64.cpp" />
     <ClCompile Include="Src\VertexLoader.cpp" />
     <ClCompile Include="Src\VertexLoaderManager.cpp" />
     <ClCompile Include="Src\VertexLoader_Color.cpp" />
@@ -87,8 +89,6 @@
     <ClCompile Include="Src\VideoBackendBase.cpp" />
     <ClCompile Include="Src\VideoConfig.cpp" />
     <ClCompile Include="Src\VideoState.cpp" />
-    <ClCompile Include="Src\x64DLCache.cpp" />
-    <ClCompile Include="Src\x64TextureDecoder.cpp" />
     <ClCompile Include="Src\XFMemory.cpp" />
     <ClCompile Include="Src\XFStructs.cpp" />
   </ItemGroup>
@@ -117,7 +117,7 @@
     <ClInclude Include="Src\OnScreenDisplay.h" />
     <ClInclude Include="Src\OpcodeDecoding.h" />
     <ClInclude Include="Src\OpenCL.h" />
-    <ClInclude Include="Src\OpenCL\OCLTextureDecoder.h" />
+    <ClInclude Include="Src\OpenCL\TextureDecoder_OpenCL.h" />
     <ClInclude Include="Src\PerfQueryBase.h" />
     <ClInclude Include="Src\PixelEngine.h" />
     <ClInclude Include="Src\PixelShaderGen.h" />
@@ -168,4 +168,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
index 7d9534f4eb..96503ba0e0 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
@@ -57,10 +57,10 @@
     <ClCompile Include="Src\VertexManagerBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OpenCL\OCLTextureDecoder.cpp">
+    <ClCompile Include="Src\OpenCL.cpp">
       <Filter>Decoding\OpenCL</Filter>
     </ClCompile>
-    <ClCompile Include="Src\OpenCL.cpp">
+    <ClCompile Include="Src\OpenCL\TextureDecoder_OpenCL.cpp">
       <Filter>Decoding\OpenCL</Filter>
     </ClCompile>
     <ClCompile Include="Src\Fifo.cpp">
@@ -69,9 +69,6 @@
     <ClCompile Include="Src\OpcodeDecoding.cpp">
       <Filter>Decoding</Filter>
     </ClCompile>
-    <ClCompile Include="Src\x64TextureDecoder.cpp">
-      <Filter>Decoding</Filter>
-    </ClCompile>
     <ClCompile Include="Src\BPFunctions.cpp">
       <Filter>Register Sections</Filter>
     </ClCompile>
@@ -96,6 +93,9 @@
     <ClCompile Include="Src\TextureConversionShader.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
+    <ClCompile Include="Src\TextureDecoder_x64.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
     <ClCompile Include="Src\VertexShaderGen.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
@@ -129,6 +129,9 @@
     <ClCompile Include="Src\VideoState.cpp">
       <Filter>Util</Filter>
     </ClCompile>
+    <ClCompile Include="Src\DLCache_x64.cpp">
+      <Filter>Vertex Loading</Filter>
+    </ClCompile>
     <ClCompile Include="Src\VertexLoader.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
@@ -147,9 +150,6 @@
     <ClCompile Include="Src\VertexLoaderManager.cpp">
       <Filter>Vertex Loading</Filter>
     </ClCompile>
-    <ClCompile Include="Src\x64DLCache.cpp">
-      <Filter>Vertex Loading</Filter>
-    </ClCompile>
     <ClCompile Include="Src\stdafx.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -184,7 +184,7 @@
     <ClInclude Include="Src\VertexManagerBase.h">
       <Filter>Base</Filter>
     </ClInclude>
-    <ClInclude Include="Src\OpenCL\OCLTextureDecoder.h">
+    <ClInclude Include="Src\OpenCL\TextureDecoder_OpenCL.h">
       <Filter>Decoding\OpenCL</Filter>
     </ClInclude>
     <ClInclude Include="Src\OpenCL.h">
@@ -294,4 +294,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>