diff --git a/renderdoc/driver/d3d12/d3d12_command_list.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
similarity index 100%
rename from renderdoc/driver/d3d12/d3d12_command_list.cpp
rename to renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
diff --git a/renderdoc/driver/d3d12/d3d12_command_queue.cpp b/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
similarity index 100%
rename from renderdoc/driver/d3d12/d3d12_command_queue.cpp
rename to renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp
diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
index 52a465438..d00aa5fc4 100644
--- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
+++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj
@@ -184,8 +184,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="d3d12_command_list.cpp" />
-    <ClCompile Include="d3d12_command_queue.cpp" />
+    <ClCompile Include="d3d12_command_list_wrap.cpp" />
+    <ClCompile Include="d3d12_command_queue_wrap.cpp" />
     <ClCompile Include="d3d12_common.cpp" />
     <ClCompile Include="d3d12_device.cpp" />
     <ClCompile Include="d3d12_device_wrap.cpp" />
diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj.filters b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj.filters
index 10000bfaa..ecece0426 100644
--- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj.filters
+++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj.filters
@@ -62,11 +62,11 @@
     <ClCompile Include="d3d12_resources.cpp">
       <Filter>Util</Filter>
     </ClCompile>
-    <ClCompile Include="d3d12_command_list.cpp">
-      <Filter>Core IFaces</Filter>
+    <ClCompile Include="d3d12_command_queue_wrap.cpp">
+      <Filter>Wrapped</Filter>
     </ClCompile>
-    <ClCompile Include="d3d12_command_queue.cpp">
-      <Filter>Core IFaces</Filter>
+    <ClCompile Include="d3d12_command_list_wrap.cpp">
+      <Filter>Wrapped</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file