diff --git a/Source/Core/VideoBackends/D3D/CMakeLists.txt b/Source/Core/VideoBackends/D3D/CMakeLists.txt
index 0b4a859ec4..b8ebb509b9 100644
--- a/Source/Core/VideoBackends/D3D/CMakeLists.txt
+++ b/Source/Core/VideoBackends/D3D/CMakeLists.txt
@@ -1,25 +1,25 @@
 add_library(videod3d
-  BoundingBox.cpp
-  BoundingBox.h
   D3DBase.cpp
   D3DBase.h
+  D3DBoundingBox.cpp
+  D3DBoundingBox.h
+  D3DMain.cpp
+  D3DNativeVertexFormat.cpp
+  D3DPerfQuery.cpp
+  D3DPerfQuery.h
+  D3DRender.cpp
+  D3DRender.h
   D3DState.cpp
   D3DState.h
+  D3DSwapChain.cpp
+  D3DVertexManager.cpp
+  D3DVertexManager.h
   DXPipeline.cpp
   DXPipeline.h
   DXShader.cpp
   DXShader.h
   DXTexture.cpp
   DXTexture.h
-  main.cpp
-  NativeVertexFormat.cpp
-  PerfQuery.cpp
-  PerfQuery.h
-  Render.cpp
-  Render.h
-  SwapChain.cpp
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
index a549474bdd..79b0cf086f 100644
--- a/Source/Core/VideoBackends/D3D/D3D.vcxproj
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -16,30 +16,30 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="BoundingBox.cpp" />
     <ClCompile Include="D3DBase.cpp" />
+    <ClCompile Include="D3DBoundingBox.cpp" />
+    <ClCompile Include="D3DMain.cpp" />
+    <ClCompile Include="D3DNativeVertexFormat.cpp" />
+    <ClCompile Include="D3DPerfQuery.cpp" />
+    <ClCompile Include="D3DRender.cpp" />
     <ClCompile Include="D3DState.cpp" />
+    <ClCompile Include="D3DSwapChain.cpp" />
+    <ClCompile Include="D3DVertexManager.cpp" />
     <ClCompile Include="DXPipeline.cpp" />
     <ClCompile Include="DXShader.cpp" />
     <ClCompile Include="DXTexture.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="NativeVertexFormat.cpp" />
-    <ClCompile Include="PerfQuery.cpp" />
-    <ClCompile Include="Render.cpp" />
-    <ClCompile Include="SwapChain.cpp" />
-    <ClCompile Include="VertexManager.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BoundingBox.h" />
     <ClInclude Include="D3DBase.h" />
+    <ClInclude Include="D3DBoundingBox.h" />
+    <ClInclude Include="D3DPerfQuery.h" />
+    <ClInclude Include="D3DRender.h" />
     <ClInclude Include="D3DState.h" />
+    <ClInclude Include="D3DSwapChain.h" />
+    <ClInclude Include="D3DVertexManager.h" />
     <ClInclude Include="DXPipeline.h" />
     <ClInclude Include="DXShader.h" />
     <ClInclude Include="DXTexture.h" />
-    <ClInclude Include="PerfQuery.h" />
-    <ClInclude Include="Render.h" />
-    <ClInclude Include="SwapChain.h" />
-    <ClInclude Include="VertexManager.h" />
     <ClInclude Include="VideoBackend.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
index 630e95a808..f3838e16b1 100644
--- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
@@ -15,20 +15,20 @@
     <ClCompile Include="D3DState.cpp">
       <Filter>D3D</Filter>
     </ClCompile>
-    <ClCompile Include="NativeVertexFormat.cpp">
+    <ClCompile Include="D3DNativeVertexFormat.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="PerfQuery.cpp">
+    <ClCompile Include="D3DPerfQuery.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="Render.cpp">
+    <ClCompile Include="D3DRender.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="VertexManager.cpp">
+    <ClCompile Include="D3DVertexManager.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="BoundingBox.cpp">
+    <ClCompile Include="D3DMain.cpp" />
+    <ClCompile Include="D3DBoundingBox.cpp">
       <Filter>Render</Filter>
     </ClCompile>
     <ClCompile Include="DXTexture.cpp">
@@ -40,7 +40,7 @@
     <ClCompile Include="DXPipeline.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="SwapChain.cpp">
+    <ClCompile Include="D3DSwapChain.cpp">
       <Filter>Render</Filter>
     </ClCompile>
   </ItemGroup>
@@ -51,17 +51,17 @@
     <ClInclude Include="D3DState.h">
       <Filter>D3D</Filter>
     </ClInclude>
-    <ClInclude Include="PerfQuery.h">
+    <ClInclude Include="D3DPerfQuery.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="Render.h">
+    <ClInclude Include="D3DRender.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="VertexManager.h">
+    <ClInclude Include="D3DVertexManager.h">
       <Filter>Render</Filter>
     </ClInclude>
     <ClInclude Include="VideoBackend.h" />
-    <ClInclude Include="BoundingBox.h">
+    <ClInclude Include="D3DBoundingBox.h">
       <Filter>Render</Filter>
     </ClInclude>
     <ClInclude Include="DXTexture.h">
@@ -73,7 +73,7 @@
     <ClInclude Include="DXPipeline.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="SwapChain.h">
+    <ClInclude Include="D3DSwapChain.h">
       <Filter>Render</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.cpp b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D/BoundingBox.cpp
rename to Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp
index 7cae36e1a1..8fd1b744a7 100644
--- a/Source/Core/VideoBackends/D3D/BoundingBox.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBoundingBox.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/BoundingBox.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "VideoBackends/D3D/D3DState.h"
diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.h b/Source/Core/VideoBackends/D3D/D3DBoundingBox.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D/BoundingBox.h
rename to Source/Core/VideoBackends/D3D/D3DBoundingBox.h
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp
similarity index 96%
rename from Source/Core/VideoBackends/D3D/main.cpp
rename to Source/Core/VideoBackends/D3D/D3DMain.cpp
index a916b4d6fc..888f4decdc 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp
@@ -10,12 +10,12 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
-#include "VideoBackends/D3D/PerfQuery.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/SwapChain.h"
-#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
+#include "VideoBackends/D3D/D3DPerfQuery.h"
+#include "VideoBackends/D3D/D3DRender.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/VideoBackend.h"
 #include "VideoBackends/D3DCommon/Common.h"
 
diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
rename to Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
index 6233059262..d8294d7abc 100644
--- a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
@@ -5,10 +5,10 @@
 #include <array>
 
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/DXShader.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/VertexManager.h"
 #include "VideoCommon/NativeVertexFormat.h"
 
 namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D/PerfQuery.cpp
rename to Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp
index 70eba20c57..a05077e14b 100644
--- a/Source/Core/VideoBackends/D3D/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/PerfQuery.h"
+#include "VideoBackends/D3D/D3DPerfQuery.h"
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/D3DPerfQuery.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D/PerfQuery.h
rename to Source/Core/VideoBackends/D3D/D3DPerfQuery.h
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/D3DRender.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D/Render.cpp
rename to Source/Core/VideoBackends/D3D/D3DRender.cpp
index 83a177342e..8830039af8 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/Render.h"
+#include "VideoBackends/D3D/D3DRender.h"
 
 #include <algorithm>
 #include <array>
@@ -21,13 +21,13 @@
 
 #include "Core/Core.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
 #include "VideoBackends/D3D/DXPipeline.h"
 #include "VideoBackends/D3D/DXShader.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3D/SwapChain.h"
 
 #include "VideoCommon/BPFunctions.h"
 #include "VideoCommon/FramebufferManager.h"
diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/D3DRender.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D/Render.h
rename to Source/Core/VideoBackends/D3D/D3DRender.h
diff --git a/Source/Core/VideoBackends/D3D/SwapChain.cpp b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp
similarity index 96%
rename from Source/Core/VideoBackends/D3D/SwapChain.cpp
rename to Source/Core/VideoBackends/D3D/D3DSwapChain.cpp
index 7a2e889194..66684f3a4b 100644
--- a/Source/Core/VideoBackends/D3D/SwapChain.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DSwapChain.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/SwapChain.h"
+#include "VideoBackends/D3D/D3DSwapChain.h"
 #include "VideoBackends/D3D/DXTexture.h"
 
 namespace DX11
diff --git a/Source/Core/VideoBackends/D3D/SwapChain.h b/Source/Core/VideoBackends/D3D/D3DSwapChain.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D/SwapChain.h
rename to Source/Core/VideoBackends/D3D/D3DSwapChain.h
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D/VertexManager.cpp
rename to Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
index 817f58c656..fefc8b5148 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DVertexManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D/VertexManager.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 
 #include <d3d11.h>
 
@@ -10,10 +10,10 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 
-#include "VideoBackends/D3D/BoundingBox.h"
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DBoundingBox.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
-#include "VideoBackends/D3D/Render.h"
 #include "VideoBackends/D3DCommon/Common.h"
 
 #include "VideoCommon/BoundingBox.h"
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/D3DVertexManager.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D/VertexManager.h
rename to Source/Core/VideoBackends/D3D/D3DVertexManager.h
diff --git a/Source/Core/VideoBackends/D3D/DXPipeline.cpp b/Source/Core/VideoBackends/D3D/DXPipeline.cpp
index 67450b11da..23e5e6dd21 100644
--- a/Source/Core/VideoBackends/D3D/DXPipeline.cpp
+++ b/Source/Core/VideoBackends/D3D/DXPipeline.cpp
@@ -6,12 +6,12 @@
 #include "Common/Logging/Log.h"
 
 #include "VideoBackends/D3D/D3DBase.h"
+#include "VideoBackends/D3D/D3DRender.h"
 #include "VideoBackends/D3D/D3DState.h"
+#include "VideoBackends/D3D/D3DVertexManager.h"
 #include "VideoBackends/D3D/DXPipeline.h"
 #include "VideoBackends/D3D/DXShader.h"
 #include "VideoBackends/D3D/DXTexture.h"
-#include "VideoBackends/D3D/Render.h"
-#include "VideoBackends/D3D/VertexManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11