diff --git a/Source/Core/VideoBackends/D3D12/CMakeLists.txt b/Source/Core/VideoBackends/D3D12/CMakeLists.txt
index 08eec49005..5b440775c0 100644
--- a/Source/Core/VideoBackends/D3D12/CMakeLists.txt
+++ b/Source/Core/VideoBackends/D3D12/CMakeLists.txt
@@ -1,30 +1,30 @@
 add_library(videod3d12
-  BoundingBox.cpp
-  BoundingBox.h
+  D3D12BoundingBox.cpp
+  D3D12BoundingBox.h
+  D3D12PerfQuery.cpp
+  D3D12PerfQuery.h
+  D3D12Renderer.cpp
+  D3D12Renderer.h
+  D3D12StreamBuffer.cpp
+  D3D12StreamBuffer.h
+  D3D12SwapChain.cpp
+  D3D12SwapChain.h
+  D3D12VertexManager.cpp
+  D3D12VertexManager.h
   DescriptorAllocator.cpp
   DescriptorAllocator.h
   DescriptorHeapManager.cpp
   DescriptorHeapManager.h
-  DXContext.cpp
-  DXContext.h
-  DXPipeline.cpp
-  DXPipeline.h
-  DXShader.cpp
-  DXShader.h
-  DXTexture.cpp
-  DXTexture.h
-  DXVertexFormat.cpp
-  DXVertexFormat.h
-  PerfQuery.cpp
-  PerfQuery.h
-  Renderer.cpp
-  Renderer.h
-  StreamBuffer.cpp
-  StreamBuffer.h
-  SwapChain.cpp
-  SwapChain.h
-  VertexManager.cpp
-  VertexManager.h
+  DX12Context.cpp
+  DX12Context.h
+  DX12Pipeline.cpp
+  DX12Pipeline.h
+  DX12Shader.cpp
+  DX12Shader.h
+  DX12Texture.cpp
+  DX12Texture.h
+  DX12VertexFormat.cpp
+  DX12VertexFormat.h
   VideoBackend.cpp
   VideoBackend.h
 )
diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
index 3c297763f7..8901908fba 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
+++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
@@ -16,36 +16,36 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="BoundingBox.cpp" />
+    <ClCompile Include="D3D12BoundingBox.cpp" />
+    <ClCompile Include="D3D12PerfQuery.cpp" />
+    <ClCompile Include="D3D12Renderer.cpp" />
+    <ClCompile Include="D3D12StreamBuffer.cpp" />
+    <ClCompile Include="D3D12SwapChain.cpp" />
+    <ClCompile Include="D3D12VertexManager.cpp" />
     <ClCompile Include="DescriptorAllocator.cpp" />
-    <ClCompile Include="DXContext.cpp" />
     <ClCompile Include="DescriptorHeapManager.cpp" />
-    <ClCompile Include="DXPipeline.cpp" />
-    <ClCompile Include="DXShader.cpp" />
-    <ClCompile Include="StreamBuffer.cpp" />
-    <ClCompile Include="DXTexture.cpp" />
+    <ClCompile Include="DX12Context.cpp" />
+    <ClCompile Include="DX12Pipeline.cpp" />
+    <ClCompile Include="DX12Shader.cpp" />
+    <ClCompile Include="DX12Texture.cpp" />
+    <ClCompile Include="DX12VertexFormat.cpp" />
     <ClCompile Include="VideoBackend.cpp" />
-    <ClCompile Include="PerfQuery.cpp" />
-    <ClCompile Include="Renderer.cpp" />
-    <ClCompile Include="DXVertexFormat.cpp" />
-    <ClCompile Include="SwapChain.cpp" />
-    <ClCompile Include="VertexManager.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="BoundingBox.h" />
     <ClInclude Include="Common.h" />
+    <ClInclude Include="D3D12BoundingBox.h" />
+    <ClInclude Include="D3D12PerfQuery.h" />
+    <ClInclude Include="D3D12Renderer.h" />
+    <ClInclude Include="D3D12StreamBuffer.h" />
+    <ClInclude Include="D3D12SwapChain.h" />
+    <ClInclude Include="D3D12VertexManager.h" />
     <ClInclude Include="DescriptorAllocator.h" />
-    <ClInclude Include="DXContext.h" />
     <ClInclude Include="DescriptorHeapManager.h" />
-    <ClInclude Include="DXPipeline.h" />
-    <ClInclude Include="DXShader.h" />
-    <ClInclude Include="StreamBuffer.h" />
-    <ClInclude Include="DXTexture.h" />
-    <ClInclude Include="PerfQuery.h" />
-    <ClInclude Include="Renderer.h" />
-    <ClInclude Include="DXVertexFormat.h" />
-    <ClInclude Include="SwapChain.h" />
-    <ClInclude Include="VertexManager.h" />
+    <ClInclude Include="DX12Context.h" />
+    <ClInclude Include="DX12Pipeline.h" />
+    <ClInclude Include="DX12Shader.h" />
+    <ClInclude Include="DX12Texture.h" />
+    <ClInclude Include="DX12VertexFormat.h" />
     <ClInclude Include="VideoBackend.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters
index 24feadc6ff..a9533e36cf 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters
+++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="VideoBackend.cpp" />
-    <ClCompile Include="DXContext.cpp" />
-    <ClCompile Include="DXPipeline.cpp" />
-    <ClCompile Include="DXShader.cpp" />
-    <ClCompile Include="DXTexture.cpp" />
-    <ClCompile Include="DXVertexFormat.cpp" />
-    <ClCompile Include="StreamBuffer.cpp" />
-    <ClCompile Include="SwapChain.cpp" />
-    <ClCompile Include="PerfQuery.cpp" />
-    <ClCompile Include="Renderer.cpp" />
-    <ClCompile Include="VertexManager.cpp" />
-    <ClCompile Include="BoundingBox.cpp" />
-    <ClCompile Include="DescriptorHeapManager.cpp" />
+    <ClCompile Include="D3D12BoundingBox.cpp" />
+    <ClCompile Include="D3D12PerfQuery.cpp" />
+    <ClCompile Include="D3D12Renderer.cpp" />
+    <ClCompile Include="D3D12StreamBuffer.cpp" />
+    <ClCompile Include="D3D12SwapChain.cpp" />
+    <ClCompile Include="D3D12VertexManager.cpp" />
     <ClCompile Include="DescriptorAllocator.cpp" />
+    <ClCompile Include="DescriptorHeapManager.cpp" />
+    <ClCompile Include="DX12Context.cpp" />
+    <ClCompile Include="DX12Pipeline.cpp" />
+    <ClCompile Include="DX12Shader.cpp" />
+    <ClCompile Include="DX12Texture.cpp" />
+    <ClCompile Include="DX12VertexFormat.cpp" />
+    <ClCompile Include="VideoBackend.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="VideoBackend.h" />
-    <ClInclude Include="SwapChain.h" />
-    <ClInclude Include="DXContext.h" />
-    <ClInclude Include="DXPipeline.h" />
-    <ClInclude Include="DXShader.h" />
-    <ClInclude Include="DXTexture.h" />
-    <ClInclude Include="DXVertexFormat.h" />
-    <ClInclude Include="StreamBuffer.h" />
-    <ClInclude Include="VertexManager.h" />
-    <ClInclude Include="BoundingBox.h" />
-    <ClInclude Include="PerfQuery.h" />
-    <ClInclude Include="Renderer.h" />
     <ClInclude Include="Common.h" />
-    <ClInclude Include="DescriptorHeapManager.h" />
+    <ClInclude Include="D3D12BoundingBox.h" />
+    <ClInclude Include="D3D12PerfQuery.h" />
+    <ClInclude Include="D3D12Renderer.h" />
+    <ClInclude Include="D3D12StreamBuffer.h" />
+    <ClInclude Include="D3D12SwapChain.h" />
+    <ClInclude Include="D3D12VertexManager.h" />
     <ClInclude Include="DescriptorAllocator.h" />
+    <ClInclude Include="DescriptorHeapManager.h" />
+    <ClInclude Include="DX12Context.h" />
+    <ClInclude Include="DX12Pipeline.h" />
+    <ClInclude Include="DX12Shader.h" />
+    <ClInclude Include="DX12Texture.h" />
+    <ClInclude Include="DX12VertexFormat.h" />
+    <ClInclude Include="VideoBackend.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp
similarity index 97%
rename from Source/Core/VideoBackends/D3D12/BoundingBox.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp
index f5f44c4ef4..cc79e4094c 100644
--- a/Source/Core/VideoBackends/D3D12/BoundingBox.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/BoundingBox.h"
+#include "VideoBackends/D3D12/D3D12BoundingBox.h"
 #include "Common/Logging/Log.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/BoundingBox.h b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h
similarity index 96%
rename from Source/Core/VideoBackends/D3D12/BoundingBox.h
rename to Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h
index 45cb979ca8..2942b9a3e3 100644
--- a/Source/Core/VideoBackends/D3D12/BoundingBox.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12BoundingBox.h
@@ -5,8 +5,8 @@
 #pragma once
 #include <memory>
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D12/PerfQuery.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp
index bcea01ab9b..d6b6b6a193 100644
--- a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.cpp
@@ -2,15 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
 
 #include <algorithm>
 
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/VideoCommon.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.h b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h
similarity index 97%
rename from Source/Core/VideoBackends/D3D12/PerfQuery.h
rename to Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h
index 2173519a2c..3121da45d6 100644
--- a/Source/Core/VideoBackends/D3D12/PerfQuery.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12PerfQuery.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <array>
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/PerfQueryBase.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/Renderer.cpp b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D12/Renderer.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp
index dc4ab47afb..ce9ac2504b 100644
--- a/Source/Core/VideoBackends/D3D12/Renderer.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12Renderer.cpp
@@ -4,17 +4,17 @@
 
 #include "Common/Logging/Log.h"
 
-#include "VideoBackends/D3D12/BoundingBox.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXPipeline.h"
-#include "VideoBackends/D3D12/DXShader.h"
-#include "VideoBackends/D3D12/DXTexture.h"
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/D3D12BoundingBox.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Pipeline.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/PerfQuery.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/SwapChain.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/Renderer.h b/Source/Core/VideoBackends/D3D12/D3D12Renderer.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/Renderer.h
rename to Source/Core/VideoBackends/D3D12/D3D12Renderer.h
diff --git a/Source/Core/VideoBackends/D3D12/StreamBuffer.cpp b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D12/StreamBuffer.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp
index a13b94fb16..d6dd5dc249 100644
--- a/Source/Core/VideoBackends/D3D12/StreamBuffer.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/StreamBuffer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 
 #include <algorithm>
 #include <functional>
@@ -11,7 +11,7 @@
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
 
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/StreamBuffer.h b/Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/StreamBuffer.h
rename to Source/Core/VideoBackends/D3D12/D3D12StreamBuffer.h
diff --git a/Source/Core/VideoBackends/D3D12/SwapChain.cpp b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp
similarity index 93%
rename from Source/Core/VideoBackends/D3D12/SwapChain.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp
index 8435cc981d..b8ed3eff75 100644
--- a/Source/Core/VideoBackends/D3D12/SwapChain.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/SwapChain.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXTexture.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/SwapChain.h b/Source/Core/VideoBackends/D3D12/D3D12SwapChain.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/SwapChain.h
rename to Source/Core/VideoBackends/D3D12/D3D12SwapChain.h
diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.cpp b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D12/VertexManager.cpp
rename to Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp
index 66dafa533a..89ef13772b 100644
--- a/Source/Core/VideoBackends/D3D12/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.cpp
@@ -4,16 +4,16 @@
 
 #include "Common/CommonTypes.h"
 
-#include "VideoBackends/D3D12/VertexManager.h"
+#include "VideoBackends/D3D12/D3D12VertexManager.h"
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/IndexGenerator.h"
diff --git a/Source/Core/VideoBackends/D3D12/VertexManager.h b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
similarity index 97%
rename from Source/Core/VideoBackends/D3D12/VertexManager.h
rename to Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
index c609b49bd0..4e1837e89a 100644
--- a/Source/Core/VideoBackends/D3D12/VertexManager.h
+++ b/Source/Core/VideoBackends/D3D12/D3D12VertexManager.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <memory>
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/DXContext.cpp b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
similarity index 99%
rename from Source/Core/VideoBackends/D3D12/DXContext.cpp
rename to Source/Core/VideoBackends/D3D12/DX12Context.cpp
index 2fed2d611c..970fb1f94e 100644
--- a/Source/Core/VideoBackends/D3D12/DXContext.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 #include <algorithm>
 #include <array>
@@ -14,8 +14,8 @@
 #include "Common/DynamicLibrary.h"
 #include "Common/StringUtil.h"
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/DXContext.h b/Source/Core/VideoBackends/D3D12/DX12Context.h
similarity index 99%
rename from Source/Core/VideoBackends/D3D12/DXContext.h
rename to Source/Core/VideoBackends/D3D12/DX12Context.h
index b19851741d..87e9839639 100644
--- a/Source/Core/VideoBackends/D3D12/DXContext.h
+++ b/Source/Core/VideoBackends/D3D12/DX12Context.h
@@ -9,9 +9,9 @@
 
 #include "Common/CommonTypes.h"
 #include "VideoBackends/D3D12/Common.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
 #include "VideoBackends/D3D12/DescriptorAllocator.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 struct IDXGIFactory;
 
diff --git a/Source/Core/VideoBackends/D3D12/DXPipeline.cpp b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp
similarity index 97%
rename from Source/Core/VideoBackends/D3D12/DXPipeline.cpp
rename to Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp
index 089f13475e..dfce47a2fb 100644
--- a/Source/Core/VideoBackends/D3D12/DXPipeline.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Pipeline.cpp
@@ -6,11 +6,11 @@
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/DXPipeline.h"
-#include "VideoBackends/D3D12/DXShader.h"
-#include "VideoBackends/D3D12/DXTexture.h"
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/DX12Context.h"
+#include "VideoBackends/D3D12/DX12Pipeline.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/DXPipeline.h b/Source/Core/VideoBackends/D3D12/DX12Pipeline.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/DXPipeline.h
rename to Source/Core/VideoBackends/D3D12/DX12Pipeline.h
diff --git a/Source/Core/VideoBackends/D3D12/DXShader.cpp b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp
similarity index 94%
rename from Source/Core/VideoBackends/D3D12/DXShader.cpp
rename to Source/Core/VideoBackends/D3D12/DX12Shader.cpp
index 856d0e8682..a8ce2bbd60 100644
--- a/Source/Core/VideoBackends/D3D12/DXShader.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Shader.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXShader.h"
+#include "VideoBackends/D3D12/DX12Shader.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/DXShader.h b/Source/Core/VideoBackends/D3D12/DX12Shader.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/DXShader.h
rename to Source/Core/VideoBackends/D3D12/DX12Shader.h
diff --git a/Source/Core/VideoBackends/D3D12/DXTexture.cpp b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp
similarity index 99%
rename from Source/Core/VideoBackends/D3D12/DXTexture.cpp
rename to Source/Core/VideoBackends/D3D12/DX12Texture.cpp
index fae8361da2..b9469b8d86 100644
--- a/Source/Core/VideoBackends/D3D12/DXTexture.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Texture.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXTexture.h"
+#include "VideoBackends/D3D12/DX12Texture.h"
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12StreamBuffer.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/StreamBuffer.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/DXTexture.h b/Source/Core/VideoBackends/D3D12/DX12Texture.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/DXTexture.h
rename to Source/Core/VideoBackends/D3D12/DX12Texture.h
diff --git a/Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp
similarity index 98%
rename from Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp
rename to Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp
index 5d49810d19..1bd5ce23d5 100644
--- a/Source/Core/VideoBackends/D3D12/DXVertexFormat.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/D3D12/DXVertexFormat.h"
+#include "VideoBackends/D3D12/DX12VertexFormat.h"
 
 #include "Common/Assert.h"
 
diff --git a/Source/Core/VideoBackends/D3D12/DXVertexFormat.h b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.h
similarity index 100%
rename from Source/Core/VideoBackends/D3D12/DXVertexFormat.h
rename to Source/Core/VideoBackends/D3D12/DX12VertexFormat.h
diff --git a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp
index 220099642c..afaec95a33 100644
--- a/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp
+++ b/Source/Core/VideoBackends/D3D12/DescriptorAllocator.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "VideoBackends/D3D12/DescriptorAllocator.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 
 namespace DX12
 {
diff --git a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp
index 8e515ecdd5..64fdc61f97 100644
--- a/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp
+++ b/Source/Core/VideoBackends/D3D12/DescriptorHeapManager.cpp
@@ -4,7 +4,7 @@
 
 #include "VideoBackends/D3D12/DescriptorHeapManager.h"
 #include "Common/Assert.h"
-#include "VideoBackends/D3D12/DXContext.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
index af25c810c1..808935f74f 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
@@ -10,11 +10,11 @@
 #include "Core/ConfigManager.h"
 
 #include "VideoBackends/D3D12/Common.h"
-#include "VideoBackends/D3D12/DXContext.h"
-#include "VideoBackends/D3D12/PerfQuery.h"
-#include "VideoBackends/D3D12/Renderer.h"
-#include "VideoBackends/D3D12/SwapChain.h"
-#include "VideoBackends/D3D12/VertexManager.h"
+#include "VideoBackends/D3D12/D3D12PerfQuery.h"
+#include "VideoBackends/D3D12/D3D12Renderer.h"
+#include "VideoBackends/D3D12/D3D12SwapChain.h"
+#include "VideoBackends/D3D12/D3D12VertexManager.h"
+#include "VideoBackends/D3D12/DX12Context.h"
 #include "VideoBackends/D3D12/VideoBackend.h"
 
 #include "VideoCommon/FramebufferManager.h"