diff --git a/Makefile.pre.in b/Makefile.pre.in
index 94e937c4b833..c7b72f5e4464 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -303,7 +303,6 @@ OBJECT_OBJS=	\
 		Objects/bufferobject.o \
 		Objects/bytes_methods.o \
 		Objects/bytearrayobject.o \
-		Objects/bytesobject.o \
 		Objects/cellobject.o \
 		Objects/classobject.o \
 		Objects/cobject.o \
@@ -327,8 +326,9 @@ OBJECT_OBJS=	\
 		Objects/object.o \
 		Objects/obmalloc.o \
 		Objects/rangeobject.o \
-                Objects/setobject.o \
+		Objects/setobject.o \
 		Objects/sliceobject.o \
+		Objects/stringobject.o \
 		Objects/structseq.o \
 		Objects/tupleobject.o \
 		Objects/typeobject.o \
@@ -563,8 +563,6 @@ Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
 
 Objects/stringobject.o: $(srcdir)/Objects/stringobject.c \
 				$(STRINGLIB_HEADERS)
-Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c \
-				$(STRINGLIB_HEADERS)
 
 Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
 				$(STRINGLIB_HEADERS)
diff --git a/Objects/bytesobject.c b/Objects/stringobject.c
similarity index 100%
rename from Objects/bytesobject.c
rename to Objects/stringobject.c
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 24641b1f8b1d..992f816a47dc 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -241,7 +241,7 @@ SOURCE=..\..\Objects\bytearrayobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Objects\bytesobject.c
+SOURCE=..\..\Objects\stringobject.c
 # End Source File
 # Begin Source File
 
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index a79de8d78629..e541ca613e19 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -446,7 +446,7 @@
 			RelativePath="..\..\Objects\bytearrayobject.c">
 		</File>
 		<File
-			RelativePath="..\..\Objects\bytesobject.c">
+			RelativePath="..\..\Objects\stringobject.c">
 		</File>
 		<File
 			RelativePath="..\..\Objects\bytes_methods.c">
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index d6bb6b61cffa..3f99a629769b 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1379,7 +1379,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Objects\bytesobject.c"
+				RelativePath="..\..\Objects\stringobject.c"
 				>
 			</File>
 			<File
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index a55f864d53c8..70d87241f3bc 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1379,7 +1379,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Objects\bytesobject.c"
+				RelativePath="..\Objects\stringobject.c"
 				>
 			</File>
 			<File