diff --git a/reactos/subsys/win32k/eng/brush.c b/reactos/subsys/win32k/eng/engbrush.c
similarity index 100%
rename from reactos/subsys/win32k/eng/brush.c
rename to reactos/subsys/win32k/eng/engbrush.c
diff --git a/reactos/subsys/win32k/eng/misc.c b/reactos/subsys/win32k/eng/engmisc.c
similarity index 100%
rename from reactos/subsys/win32k/eng/misc.c
rename to reactos/subsys/win32k/eng/engmisc.c
diff --git a/reactos/subsys/win32k/eng/window.c b/reactos/subsys/win32k/eng/engwindow.c
similarity index 100%
rename from reactos/subsys/win32k/eng/window.c
rename to reactos/subsys/win32k/eng/engwindow.c
diff --git a/reactos/subsys/win32k/misc/error.c b/reactos/subsys/win32k/misc/err.c
similarity index 100%
rename from reactos/subsys/win32k/misc/error.c
rename to reactos/subsys/win32k/misc/err.c
diff --git a/reactos/subsys/win32k/ntuser/stubs.c b/reactos/subsys/win32k/ntuser/ntstubs.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/stubs.c
rename to reactos/subsys/win32k/ntuser/ntstubs.c
diff --git a/reactos/subsys/win32k/objects/dib.c b/reactos/subsys/win32k/objects/dibobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/dib.c
rename to reactos/subsys/win32k/objects/dibobj.c
diff --git a/reactos/subsys/win32k/objects/paint.c b/reactos/subsys/win32k/objects/paintobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/paint.c
rename to reactos/subsys/win32k/objects/paintobj.c
diff --git a/reactos/subsys/win32k/objects/palette.c b/reactos/subsys/win32k/objects/palobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/palette.c
rename to reactos/subsys/win32k/objects/palobj.c
diff --git a/reactos/subsys/win32k/win32k.xml b/reactos/subsys/win32k/win32k.xml
index 72ced55397b..3c0f958cfd9 100644
--- a/reactos/subsys/win32k/win32k.xml
+++ b/reactos/subsys/win32k/win32k.xml
@@ -25,7 +25,7 @@
 	<directory name="eng">
 		<compilationunit name="eng.c">
 			<file>bitblt.c</file>
-			<file>brush.c</file>
+			<file>engbrush.c</file>
 			<file>clip.c</file>
 			<file>copybits.c</file>
 			<file>debug.c</file>
@@ -37,7 +37,7 @@
 			<file>gradient.c</file>
 			<file>lineto.c</file>
 			<file>mem.c</file>
-			<file>misc.c</file>
+			<file>engmisc.c</file>
 			<file>mouse.c</file>
 			<file>paint.c</file>
 			<file>palette.c</file>
@@ -46,7 +46,7 @@
 			<file>sort.c</file>
 			<file>surface.c</file>
 			<file>transblt.c</file>
-			<file>window.c</file>
+			<file>engwindow.c</file>
 			<file>xlate.c</file>
 		</compilationunit>
 	</directory>
@@ -59,7 +59,7 @@
 	<directory name="misc">
 		<compilationunit name="misc.c">
 			<file>driver.c</file>
-			<file>error.c</file>
+			<file>err.c</file>
 			<file>math.c</file>
 			<file>copy.c</file>
 		</compilationunit>
@@ -104,7 +104,7 @@
 			<file>prop.c</file>
 			<file>scrollbar.c</file>
 			<file>session.c</file>
-			<file>stubs.c</file>
+			<file>ntstubs.c</file>
 			<file>timer.c</file>
 			<file>useratom.c</file>
 			<file>vis.c</file>
@@ -125,14 +125,14 @@
 			<file>color.c</file>
 			<file>coord.c</file>
 			<file>dc.c</file>
-			<file>dib.c</file>
+			<file>dibobj.c</file>
 			<file>fillshap.c</file>
 			<file>gdiobj.c</file>
 			<file>icm.c</file>
 			<file>line.c</file>
 			<file>metafile.c</file>
-			<file>paint.c</file>
-			<file>palette.c</file>
+			<file>paintobj.c</file>
+			<file>palobj.c</file>
 			<file>path.c</file>
 			<file>pen.c</file>
 			<file>polyfill.c</file>