diff --git a/Juliet/Juliet.vcxproj b/Juliet/Juliet.vcxproj
index 43918ae..a7931b6 100644
--- a/Juliet/Juliet.vcxproj
+++ b/Juliet/Juliet.vcxproj
@@ -171,11 +171,11 @@
         <ClInclude Include="src\Graphics\D3D12\D3D12Shader.h"/>
         <ClInclude Include="src\Graphics\D3D12\D3D12Synchronization.h"/>
         <ClInclude Include="src\Graphics\D3D12\D3D12Texture.h"/>
-        <ClInclude Include="src\Graphics\D3D12\DX12CommandList.h"/>
-        <ClInclude Include="src\Graphics\D3D12\DX12GraphicsDevice.h"/>
-        <ClInclude Include="src\Graphics\D3D12\DX12Includes.h"/>
-        <ClInclude Include="src\Graphics\D3D12\DX12SwapChain.h"/>
-        <ClInclude Include="src\Graphics\D3D12\DX12Utils.h"/>
+        <ClInclude Include="src\Graphics\D3D12\D3D12CommandList.h" />
+        <ClInclude Include="src\Graphics\D3D12\D3D12GraphicsDevice.h" />
+        <ClInclude Include="src\Graphics\D3D12\D3D12Includes.h" />
+        <ClInclude Include="src\Graphics\D3D12\D3D12SwapChain.h" />
+        <ClInclude Include="src\Graphics\D3D12\D3D12Utils.h" />
         <ClInclude Include="src\Graphics\GraphicsDevice.h"/>
     </ItemGroup>
     <ItemGroup>
@@ -213,10 +213,10 @@
         <ClCompile Include="src\Graphics\D3D12\D3D12Shader.cpp"/>
         <ClCompile Include="src\Graphics\D3D12\D3D12Synchronization.cpp"/>
         <ClCompile Include="src\Graphics\D3D12\D3D12Texture.cpp"/>
-        <ClCompile Include="src\Graphics\D3D12\DX12CommandList.cpp"/>
-        <ClCompile Include="src\Graphics\D3D12\DX12GraphicsDevice.cpp"/>
-        <ClCompile Include="src\Graphics\D3D12\DX12SwapChain.cpp"/>
-        <ClCompile Include="src\Graphics\D3D12\DX12Utils.cpp"/>
+        <ClCompile Include="src\Graphics\D3D12\D3D12CommandList.cpp" />
+        <ClCompile Include="src\Graphics\D3D12\D3D12GraphicsDevice.cpp" />
+        <ClCompile Include="src\Graphics\D3D12\D3D12SwapChain.cpp" />
+        <ClCompile Include="src\Graphics\D3D12\D3D12Utils.cpp" />
         <ClCompile Include="src\Graphics\Graphics.cpp">
             <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
             <Optimization>Disabled</Optimization>
diff --git a/Juliet/src/Graphics/D3D12/DX12CommandList.cpp b/Juliet/src/Graphics/D3D12/D3D12CommandList.cpp
similarity index 99%
rename from Juliet/src/Graphics/D3D12/DX12CommandList.cpp
rename to Juliet/src/Graphics/D3D12/D3D12CommandList.cpp
index 51c2eff..d546db8 100644
--- a/Juliet/src/Graphics/D3D12/DX12CommandList.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12CommandList.cpp
@@ -1,10 +1,10 @@
 #include <pch.h>
 
 #include <Core/Memory/Allocator.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
+#include <Graphics/D3D12/D3D12GraphicsDevice.h>
 #include <Graphics/D3D12/D3D12Synchronization.h>
-#include <Graphics/D3D12/DX12CommandList.h>
-#include <Graphics/D3D12/DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Utils.h>
+#include <Graphics/D3D12/D3D12Utils.h>
 
 namespace Juliet::D3D12
 {
diff --git a/Juliet/src/Graphics/D3D12/DX12CommandList.h b/Juliet/src/Graphics/D3D12/D3D12CommandList.h
similarity index 98%
rename from Juliet/src/Graphics/D3D12/DX12CommandList.h
rename to Juliet/src/Graphics/D3D12/D3D12CommandList.h
index e3acce1..1a97cac 100644
--- a/Juliet/src/Graphics/D3D12/DX12CommandList.h
+++ b/Juliet/src/Graphics/D3D12/D3D12CommandList.h
@@ -2,7 +2,7 @@
 
 #include <Core/Common/NonNullPtr.h>
 #include <Core/Math/Shape.h>
-#include <Graphics/D3D12/DX12Includes.h>
+#include <Graphics/D3D12/D3D12Includes.h>
 #include <Graphics/GraphicsDevice.h>
 
 namespace Juliet::D3D12
diff --git a/Juliet/src/Graphics/D3D12/D3D12Common.cpp b/Juliet/src/Graphics/D3D12/D3D12Common.cpp
index eaeaaf3..a5368f3 100644
--- a/Juliet/src/Graphics/D3D12/D3D12Common.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12Common.cpp
@@ -4,9 +4,9 @@
 #include <Core/Memory/Allocator.h>
 #include <Core/Memory/Utils.h>
 #include <Graphics/D3D12/D3D12Common.h>
-#include <Graphics/D3D12/DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Includes.h>
-#include <Graphics/D3D12/DX12Utils.h>
+#include <Graphics/D3D12/D3D12GraphicsDevice.h>
+#include <Graphics/D3D12/D3D12Includes.h>
+#include <Graphics/D3D12/D3D12Utils.h>
 
 namespace Juliet::D3D12
 {
diff --git a/Juliet/src/Graphics/D3D12/D3D12Common.h b/Juliet/src/Graphics/D3D12/D3D12Common.h
index 1f5b817..76afc6d 100644
--- a/Juliet/src/Graphics/D3D12/D3D12Common.h
+++ b/Juliet/src/Graphics/D3D12/D3D12Common.h
@@ -2,7 +2,7 @@
 
 #include <Core/Common/NonNullPtr.h>
 #include <Core/Thread/Mutex.h>
-#include <Graphics/D3D12/DX12Includes.h>
+#include <Graphics/D3D12/D3D12Includes.h>
 
 // Definitions:
 // RTV = Render Target View
diff --git a/Juliet/src/Graphics/D3D12/DX12GraphicsDevice.cpp b/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
similarity index 99%
rename from Juliet/src/Graphics/D3D12/DX12GraphicsDevice.cpp
rename to Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
index 4acfdda..e448bdf 100644
--- a/Juliet/src/Graphics/D3D12/DX12GraphicsDevice.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
@@ -3,13 +3,13 @@
 #include <Core/Common/NonNullPtr.h>
 #include <Core/HAL/DynLib/DynamicLibrary.h>
 #include <Core/Memory/Allocator.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
+#include <Graphics/D3D12/D3D12GraphicsDevice.h>
 #include <Graphics/D3D12/D3D12GraphicsPipeline.h>
+#include <Graphics/D3D12/D3D12Includes.h>
 #include <Graphics/D3D12/D3D12RenderPass.h>
+#include <Graphics/D3D12/D3D12SwapChain.h>
 #include <Graphics/D3D12/D3D12Synchronization.h>
-#include <Graphics/D3D12/DX12CommandList.h>
-#include <Graphics/D3D12/DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Includes.h>
-#include <Graphics/D3D12/DX12SwapChain.h>
 #include <Graphics/Graphics.h>
 #include <Graphics/GraphicsDevice.h>
 
diff --git a/Juliet/src/Graphics/D3D12/DX12GraphicsDevice.h b/Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.h
similarity index 100%
rename from Juliet/src/Graphics/D3D12/DX12GraphicsDevice.h
rename to Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.h
diff --git a/Juliet/src/Graphics/D3D12/DX12Includes.h b/Juliet/src/Graphics/D3D12/D3D12Includes.h
similarity index 100%
rename from Juliet/src/Graphics/D3D12/DX12Includes.h
rename to Juliet/src/Graphics/D3D12/D3D12Includes.h
diff --git a/Juliet/src/Graphics/D3D12/D3D12RenderPass.h b/Juliet/src/Graphics/D3D12/D3D12RenderPass.h
index 86c4021..0c9854f 100644
--- a/Juliet/src/Graphics/D3D12/D3D12RenderPass.h
+++ b/Juliet/src/Graphics/D3D12/D3D12RenderPass.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/Common/NonNullPtr.h>
-#include <Graphics/D3D12/DX12CommandList.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
 #include <Graphics/RenderPass.h>
 
 namespace Juliet::D3D12
diff --git a/Juliet/src/Graphics/D3D12/DX12SwapChain.cpp b/Juliet/src/Graphics/D3D12/D3D12SwapChain.cpp
similarity index 98%
rename from Juliet/src/Graphics/D3D12/DX12SwapChain.cpp
rename to Juliet/src/Graphics/D3D12/D3D12SwapChain.cpp
index 216eead..84a168a 100644
--- a/Juliet/src/Graphics/D3D12/DX12SwapChain.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12SwapChain.cpp
@@ -2,12 +2,12 @@
 
 #include <Core/HAL/Display/Win32/Win32Window.h>
 #include <Core/Memory/Allocator.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
+#include <Graphics/D3D12/D3D12GraphicsDevice.h>
+#include <Graphics/D3D12/D3D12Includes.h>
+#include <Graphics/D3D12/D3D12SwapChain.h>
 #include <Graphics/D3D12/D3D12Texture.h>
-#include <Graphics/D3D12/DX12CommandList.h>
-#include <Graphics/D3D12/DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Includes.h>
-#include <Graphics/D3D12/DX12SwapChain.h>
-#include <Graphics/D3D12/DX12Utils.h>
+#include <Graphics/D3D12/D3D12Utils.h>
 
 #include <algorithm>
 
diff --git a/Juliet/src/Graphics/D3D12/DX12SwapChain.h b/Juliet/src/Graphics/D3D12/D3D12SwapChain.h
similarity index 100%
rename from Juliet/src/Graphics/D3D12/DX12SwapChain.h
rename to Juliet/src/Graphics/D3D12/D3D12SwapChain.h
diff --git a/Juliet/src/Graphics/D3D12/D3D12Synchronization.cpp b/Juliet/src/Graphics/D3D12/D3D12Synchronization.cpp
index 0e4ff45..86f0159 100644
--- a/Juliet/src/Graphics/D3D12/D3D12Synchronization.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12Synchronization.cpp
@@ -1,10 +1,10 @@
 #include <pch.h>
 
 #include <Core/Memory/Allocator.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
+#include <Graphics/D3D12/D3D12GraphicsDevice.h>
 #include <Graphics/D3D12/D3D12Synchronization.h>
-#include <Graphics/D3D12/DX12CommandList.h>
-#include <Graphics/D3D12/DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Utils.h>
+#include <Graphics/D3D12/D3D12Utils.h>
 
 namespace Juliet::D3D12
 {
diff --git a/Juliet/src/Graphics/D3D12/D3D12Texture.cpp b/Juliet/src/Graphics/D3D12/D3D12Texture.cpp
index ac94ca8..f84bfec 100644
--- a/Juliet/src/Graphics/D3D12/D3D12Texture.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12Texture.cpp
@@ -1,9 +1,9 @@
 #include <pch.h>
 
 #include <Core/Common/EnumUtils.h>
+#include <Graphics/D3D12/D3D12CommandList.h>
 #include <Graphics/D3D12/D3D12Synchronization.h>
 #include <Graphics/D3D12/D3D12Texture.h>
-#include <Graphics/D3D12/DX12CommandList.h>
 
 namespace Juliet::D3D12
 {
diff --git a/Juliet/src/Graphics/D3D12/D3D12Texture.h b/Juliet/src/Graphics/D3D12/D3D12Texture.h
index 83e6602..d59d87b 100644
--- a/Juliet/src/Graphics/D3D12/D3D12Texture.h
+++ b/Juliet/src/Graphics/D3D12/D3D12Texture.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Graphics/D3D12/D3D12Common.h>
-#include <Graphics/D3D12/DX12Includes.h>
+#include <Graphics/D3D12/D3D12Includes.h>
 #include <Graphics/GraphicsDevice.h>
 
 struct ID3D12Resource;
diff --git a/Juliet/src/Graphics/D3D12/DX12Utils.cpp b/Juliet/src/Graphics/D3D12/D3D12Utils.cpp
similarity index 96%
rename from Juliet/src/Graphics/D3D12/DX12Utils.cpp
rename to Juliet/src/Graphics/D3D12/D3D12Utils.cpp
index b3a9123..62df7b3 100644
--- a/Juliet/src/Graphics/D3D12/DX12Utils.cpp
+++ b/Juliet/src/Graphics/D3D12/D3D12Utils.cpp
@@ -1,8 +1,8 @@
 #include <pch.h>
 
 #include <Core/Common/NonNullPtr.h>
-#include <DX12GraphicsDevice.h>
-#include <Graphics/D3D12/DX12Utils.h>
+#include <D3D12GraphicsDevice.h>
+#include <Graphics/D3D12/D3D12Utils.h>
 
 #include <algorithm>
 
diff --git a/Juliet/src/Graphics/D3D12/DX12Utils.h b/Juliet/src/Graphics/D3D12/D3D12Utils.h
similarity index 92%
rename from Juliet/src/Graphics/D3D12/DX12Utils.h
rename to Juliet/src/Graphics/D3D12/D3D12Utils.h
index c458fdc..5c61102 100644
--- a/Juliet/src/Graphics/D3D12/DX12Utils.h
+++ b/Juliet/src/Graphics/D3D12/D3D12Utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Graphics/D3D12/DX12Includes.h>
+#include <Graphics/D3D12/D3D12Includes.h>
 
 #ifdef _WIN32
 #define HRESULT_FMT "(0x%08lX)"
diff --git a/Juliet/src/TODO.txt b/Juliet/src/TODO.txt
index fd983a9..6cea5bb 100644
--- a/Juliet/src/TODO.txt
+++ b/Juliet/src/TODO.txt
@@ -1,4 +1,3 @@
-- Rename DX12 files to D3D12
 - Create Simple vector class to make the vector stuff a bit more easier than writing Capacity and Count
 - Make a string struct instead of StringBuffer.
     - Support wchar and char (template is ok) conversions, printf, compare, etc.