diff --git a/DDrawCompat/DDrawCompat.vcxproj b/DDrawCompat/DDrawCompat.vcxproj
index 5bbb9ae..8d80be5 100644
--- a/DDrawCompat/DDrawCompat.vcxproj
+++ b/DDrawCompat/DDrawCompat.vcxproj
@@ -221,7 +221,7 @@
     <ClInclude Include="Gdi\Dc.h" />
     <ClInclude Include="Gdi\DcCache.h" />
     <ClInclude Include="Gdi\DcFunctions.h" />
-    <ClInclude Include="Gdi\PaintHandlers.h" />
+    <ClInclude Include="Gdi\User32WndProcs.h" />
     <ClInclude Include="Gdi\Palette.h" />
     <ClInclude Include="Gdi\Region.h" />
     <ClInclude Include="Gdi\ScrollBar.h" />
@@ -294,7 +294,7 @@
     <ClCompile Include="Gdi\Dc.cpp" />
     <ClCompile Include="Gdi\DcCache.cpp" />
     <ClCompile Include="Gdi\DcFunctions.cpp" />
-    <ClCompile Include="Gdi\PaintHandlers.cpp" />
+    <ClCompile Include="Gdi\User32WndProcs.cpp" />
     <ClCompile Include="Gdi\Palette.cpp" />
     <ClCompile Include="Gdi\Region.cpp" />
     <ClCompile Include="Gdi\ScrollBar.cpp" />
diff --git a/DDrawCompat/DDrawCompat.vcxproj.filters b/DDrawCompat/DDrawCompat.vcxproj.filters
index bad23fa..d4ec640 100644
--- a/DDrawCompat/DDrawCompat.vcxproj.filters
+++ b/DDrawCompat/DDrawCompat.vcxproj.filters
@@ -96,9 +96,6 @@
     <ClInclude Include="Gdi\DcFunctions.h">
       <Filter>Header Files\Gdi</Filter>
     </ClInclude>
-    <ClInclude Include="Gdi\PaintHandlers.h">
-      <Filter>Header Files\Gdi</Filter>
-    </ClInclude>
     <ClInclude Include="Gdi\ScrollBar.h">
       <Filter>Header Files\Gdi</Filter>
     </ClInclude>
@@ -399,6 +396,9 @@
     <ClInclude Include="Common\ScopedSrwLock.h">
       <Filter>Header Files\Common</Filter>
     </ClInclude>
+    <ClInclude Include="Gdi\User32WndProcs.h">
+      <Filter>Header Files\Gdi</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Gdi\Gdi.cpp">
@@ -416,9 +416,6 @@
     <ClCompile Include="Gdi\DcFunctions.cpp">
       <Filter>Source Files\Gdi</Filter>
     </ClCompile>
-    <ClCompile Include="Gdi\PaintHandlers.cpp">
-      <Filter>Source Files\Gdi</Filter>
-    </ClCompile>
     <ClCompile Include="Gdi\ScrollBar.cpp">
       <Filter>Source Files\Gdi</Filter>
     </ClCompile>
@@ -614,5 +611,8 @@
     <ClCompile Include="Win32\MemoryManagement.cpp">
       <Filter>Source Files\Win32</Filter>
     </ClCompile>
+    <ClCompile Include="Gdi\User32WndProcs.cpp">
+      <Filter>Source Files\Gdi</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DDrawCompat/Gdi/Gdi.cpp b/DDrawCompat/Gdi/Gdi.cpp
index 7a0e644..e1a1a67 100644
--- a/DDrawCompat/Gdi/Gdi.cpp
+++ b/DDrawCompat/Gdi/Gdi.cpp
@@ -5,9 +5,9 @@
 #include <Gdi/DcFunctions.h>
 #include <Gdi/Font.h>
 #include <Gdi/Gdi.h>
-#include <Gdi/PaintHandlers.h>
 #include <Gdi/Palette.h>
 #include <Gdi/ScrollFunctions.h>
+#include <Gdi/User32WndProcs.h>
 #include <Gdi/Window.h>
 #include <Gdi/WinProc.h>
 
@@ -37,9 +37,9 @@ namespace Gdi
 	void installHooks()
 	{
 		DcFunctions::installHooks();
-		PaintHandlers::installHooks();
 		Palette::installHooks();
 		ScrollFunctions::installHooks();
+		User32WndProcs::installHooks();
 		Window::installHooks();
 		WinProc::installHooks();
 		Caret::installHooks();
diff --git a/DDrawCompat/Gdi/PaintHandlers.cpp b/DDrawCompat/Gdi/User32WndProcs.cpp
similarity index 99%
rename from DDrawCompat/Gdi/PaintHandlers.cpp
rename to DDrawCompat/Gdi/User32WndProcs.cpp
index 44cd9e3..596f69c 100644
--- a/DDrawCompat/Gdi/PaintHandlers.cpp
+++ b/DDrawCompat/Gdi/User32WndProcs.cpp
@@ -2,10 +2,10 @@
 
 #include <Gdi/AccessGuard.h>
 #include <Gdi/Dc.h>
-#include <Gdi/PaintHandlers.h>
 #include <Gdi/ScrollBar.h>
 #include <Gdi/ScrollFunctions.h>
 #include <Gdi/TitleBar.h>
+#include <Gdi/User32WndProcs.h>
 #include <Gdi/VirtualScreen.h>
 #include <Gdi/WinProc.h>
 
@@ -574,7 +574,7 @@ namespace
 
 namespace Gdi
 {
-	namespace PaintHandlers
+	namespace User32WndProcs
 	{
 		void installHooks()
 		{
diff --git a/DDrawCompat/Gdi/PaintHandlers.h b/DDrawCompat/Gdi/User32WndProcs.h
similarity index 70%
rename from DDrawCompat/Gdi/PaintHandlers.h
rename to DDrawCompat/Gdi/User32WndProcs.h
index f87ae1d..25a0e7a 100644
--- a/DDrawCompat/Gdi/PaintHandlers.h
+++ b/DDrawCompat/Gdi/User32WndProcs.h
@@ -2,7 +2,7 @@
 
 namespace Gdi
 {
-	namespace PaintHandlers
+	namespace User32WndProcs
 	{
 		void installHooks();
 	}