diff --git a/Make.rules.in b/Make.rules.in
index 76189622fca..e8351aef4a3 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -121,7 +121,7 @@ DLLS = \
 	stress \
 	tapi32 \
 	version \
-	win32s \
+	w32skrnl \
 	win87em \
 	windebug \
 	wineoss.drv \
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 45c4079eeb1..a264fc4a1e7 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -33,7 +33,7 @@ DLLFILES = \
 	stress/libstress.@LIBEXT@ \
 	tapi32/libtapi32.@LIBEXT@ \
 	version/libversion.@LIBEXT@ \
-	win32s/libwin32s.@LIBEXT@ \
+	win32s/libw32skrnl.@LIBEXT@ \
 	win87em/libwin87em.@LIBEXT@ \
 	windebug/libwindebug.@LIBEXT@ \
 	wing/libwing.@LIBEXT@ \
@@ -207,9 +207,9 @@ libversion.@LIBEXT@: version/libversion.@LIBEXT@
 	$(RM) $@
 	$(LN_S) version/libversion.@LIBEXT@ $@
 
-libwin32s.@LIBEXT@: win32s/libwin32s.@LIBEXT@
+libw32skrnl.@LIBEXT@: win32s/libw32skrnl.@LIBEXT@
 	$(RM) $@
-	$(LN_S) win32s/libwin32s.@LIBEXT@ $@
+	$(LN_S) win32s/libw32skrnl.@LIBEXT@ $@
 
 libwin87em.@LIBEXT@: win87em/libwin87em.@LIBEXT@
 	$(RM) $@
diff --git a/dlls/win32s/.cvsignore b/dlls/win32s/.cvsignore
index 3cc1e5a6313..ef683c08d8a 100644
--- a/dlls/win32s/.cvsignore
+++ b/dlls/win32s/.cvsignore
@@ -1,4 +1,4 @@
 *.spec.c
 *.spec.glue.s
 Makefile
-libwin32s.so.1.0
+libw32skrnl.so.1.0
diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in
index db28947979b..22d9bc3ca11 100644
--- a/dlls/win32s/Makefile.in
+++ b/dlls/win32s/Makefile.in
@@ -4,13 +4,13 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
-MODULE    = win32s
+MODULE    = w32skrnl
 SOVERSION = 1.0
 
 SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec
 
 C_SRCS = \
-	w32skrnl.c \
+	w32skernel.c \
 	w32sys.c \
 	win32s16.c
 
diff --git a/dlls/win32s/w32skrnl.c b/dlls/win32s/w32skernel.c
similarity index 100%
rename from dlls/win32s/w32skrnl.c
rename to dlls/win32s/w32skernel.c