diff --git a/ChangeLog b/ChangeLog
index c700da4e5..5ba550681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-02  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/win32/GSFileHandle.m: rename to GSFileHandleWin32.m
+	* Source/win32/NSUserDefaultsWin32.m: rename to NSUserDefaults.m
+	* Source/win32/NSMessagePortWin32.m: rename to NSMessagePort.m
+	* Source/win32/NSStreamWin32.m: rename to NSStream.m
+	* Source/win32/NSMessagePortNameServerWin32.m: rename to
+	NSMessagePortNameServer.m
+	* Source/win32/GNUmakefile: Rename source files for consistency.
+
 2008-01-01  Adam Fedor  <fedor@gnu.org>
 
 	* Tools/HTMLLinker.gsdoc: Readded
diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile
index 3da28a77c..8ec26a10b 100644
--- a/Source/win32/GNUmakefile
+++ b/Source/win32/GNUmakefile
@@ -30,12 +30,12 @@ include ../../config.mak
 SUBPROJECT_NAME = win32
 
 win32_OBJC_FILES =\
-	GSFileHandleWin32.m \
+	GSFileHandle.m \
 	GSRunLoopCtxt.m \
-	NSMessagePortWin32.m \
-	NSMessagePortNameServerWin32.m \
-	NSStreamWin32.m \
-	NSUserDefaultsWin32.m \
+	NSMessagePort.m \
+	NSMessagePortNameServer.m \
+	NSStream.m \
+	NSUserDefaults.m \
 
 
 -include Makefile.preamble
diff --git a/Source/win32/GSFileHandleWin32.m b/Source/win32/GSFileHandle.m
similarity index 100%
rename from Source/win32/GSFileHandleWin32.m
rename to Source/win32/GSFileHandle.m
diff --git a/Source/win32/NSMessagePortWin32.m b/Source/win32/NSMessagePort.m
similarity index 100%
rename from Source/win32/NSMessagePortWin32.m
rename to Source/win32/NSMessagePort.m
diff --git a/Source/win32/NSMessagePortNameServerWin32.m b/Source/win32/NSMessagePortNameServer.m
similarity index 100%
rename from Source/win32/NSMessagePortNameServerWin32.m
rename to Source/win32/NSMessagePortNameServer.m
diff --git a/Source/win32/NSStreamWin32.m b/Source/win32/NSStream.m
similarity index 100%
rename from Source/win32/NSStreamWin32.m
rename to Source/win32/NSStream.m
diff --git a/Source/win32/NSUserDefaultsWin32.m b/Source/win32/NSUserDefaults.m
similarity index 100%
rename from Source/win32/NSUserDefaultsWin32.m
rename to Source/win32/NSUserDefaults.m