diff --git a/Source/Core/VideoBackends/Null/CMakeLists.txt b/Source/Core/VideoBackends/Null/CMakeLists.txt
index 6713f7d1c5..19f295950d 100644
--- a/Source/Core/VideoBackends/Null/CMakeLists.txt
+++ b/Source/Core/VideoBackends/Null/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_library(videonull
   NullBackend.cpp
+  NullRender.cpp
+  NullRender.h
   NullTexture.cpp
   NullTexture.h
+  NullVertexManager.cpp
+  NullVertexManager.h
   PerfQuery.h
-  Render.cpp
-  Render.h
   TextureCache.h
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 
diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj
index b9001c2718..965d57a6c5 100644
--- a/Source/Core/VideoBackends/Null/Null.vcxproj
+++ b/Source/Core/VideoBackends/Null/Null.vcxproj
@@ -17,16 +17,16 @@
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <ClCompile Include="NullBackend.cpp" />
+    <ClCompile Include="NullRender.cpp" />
     <ClCompile Include="NullTexture.cpp" />
-    <ClCompile Include="Render.cpp" />
-    <ClCompile Include="VertexManager.cpp" />
+    <ClCompile Include="NullVertexManager.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="NullRender.h" />
     <ClInclude Include="NullTexture.h" />
+    <ClInclude Include="NullVertexManager.h" />
     <ClInclude Include="PerfQuery.h" />
-    <ClInclude Include="Render.h" />
     <ClInclude Include="TextureCache.h" />
-    <ClInclude Include="VertexManager.h" />
     <ClInclude Include="VideoBackend.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
index ab061bc7d3..353cd67b0f 100644
--- a/Source/Core/VideoBackends/Null/NullBackend.cpp
+++ b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -7,10 +7,10 @@
 // This backend tries not to do anything in the backend,
 // but everything in VideoCommon.
 
+#include "VideoBackends/Null/NullRender.h"
+#include "VideoBackends/Null/NullVertexManager.h"
 #include "VideoBackends/Null/PerfQuery.h"
-#include "VideoBackends/Null/Render.h"
 #include "VideoBackends/Null/TextureCache.h"
-#include "VideoBackends/Null/VertexManager.h"
 #include "VideoBackends/Null/VideoBackend.h"
 
 #include "Common/Common.h"
diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/NullRender.cpp
similarity index 98%
rename from Source/Core/VideoBackends/Null/Render.cpp
rename to Source/Core/VideoBackends/Null/NullRender.cpp
index 7e8719baf5..df99931908 100644
--- a/Source/Core/VideoBackends/Null/Render.cpp
+++ b/Source/Core/VideoBackends/Null/NullRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Null/Render.h"
+#include "VideoBackends/Null/NullRender.h"
 
 #include "VideoBackends/Null/NullTexture.h"
 
diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/NullRender.h
similarity index 100%
rename from Source/Core/VideoBackends/Null/Render.h
rename to Source/Core/VideoBackends/Null/NullRender.h
diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/NullVertexManager.cpp
similarity index 86%
rename from Source/Core/VideoBackends/Null/VertexManager.cpp
rename to Source/Core/VideoBackends/Null/NullVertexManager.cpp
index 329f89a2a2..6828a0250e 100644
--- a/Source/Core/VideoBackends/Null/VertexManager.cpp
+++ b/Source/Core/VideoBackends/Null/NullVertexManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/Null/VertexManager.h"
+#include "VideoBackends/Null/NullVertexManager.h"
 
 namespace Null
 {
diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/NullVertexManager.h
similarity index 100%
rename from Source/Core/VideoBackends/Null/VertexManager.h
rename to Source/Core/VideoBackends/Null/NullVertexManager.h