diff --git a/build/Makefile.linux_gcc b/build/Makefile.linux_gcc
index 3e8f1041..7021e221 100644
--- a/build/Makefile.linux_gcc
+++ b/build/Makefile.linux_gcc
@@ -79,7 +79,7 @@ DEPOBJ= $(OBJ) comprehensive.o abstract.o \
 
 .SUFFIXES: .o .cpp
 
-all: libbpl.a test.so abstract.so \
+all: libbpl.a boost_python_test.so abstract.so \
      getting_started1.so getting_started2.so getting_started3.so \
      getting_started4.so getting_started5.so
 
@@ -111,8 +111,8 @@ libbpl.a: $(OBJ)
 	rm -f libbpl.a
 	ar r libbpl.a $(OBJ)
 
-test.so: $(OBJ) comprehensive.o
-	$(LD) $(LDOPTS) $(OBJ) comprehensive.o -o test.so -lm
+boost_python_test.so: $(OBJ) comprehensive.o
+	$(LD) $(LDOPTS) $(OBJ) comprehensive.o -o boost_python_test.so -lm
 
 abstract.so: $(OBJ) abstract.o
 	$(LD) $(LDOPTS) $(OBJ) abstract.o -o abstract.so
@@ -146,7 +146,7 @@ test:
 
 clean:
 	rm -f $(OBJ) libbpl.a libbpl.a.input
-	rm -f comprehensive.o test.so
+	rm -f comprehensive.o boost_python_test.so
 	rm -f abstract.o abstract.so
 	rm -f getting_started1.o getting_started1.so
 	rm -f getting_started2.o getting_started2.so
diff --git a/build/Makefile.mingw32 b/build/Makefile.mingw32
index 2d86efcd..7c5f2c52 100644
--- a/build/Makefile.mingw32
+++ b/build/Makefile.mingw32
@@ -31,8 +31,8 @@
 # Could this be fixed with compiler options?
 # -fhuge-objects looks interesting, but requires recompiling the C++ library.
 #                (what exactly does that mean?)
-# -fvtable-thunks eliminates the compiler warning, but "import test" still
-#                 causes a crash.
+# -fvtable-thunks eliminates the compiler warning,
+# but "import boost_python_test" still causes a crash.
 
 BOOST_UNIX= /net/cci/rwgk/boost
 BOOST_WIN= "L:\boost"
@@ -82,7 +82,7 @@ $(BPL_EXA)/test_getting_started4.py \
 $(BPL_EXA)/test_getting_started5.py
 
 DEFS= \
-test \
+boost_python_test \
 abstract \
 getting_started1 \
 getting_started2 \
@@ -96,7 +96,7 @@ OBJ = classes.o conversions.o extension_class.o functions.o \
 
 .SUFFIXES: .o .cpp
 
-all: libbpl.a test.pyd abstract.pyd \
+all: libbpl.a boost_python_test.pyd abstract.pyd \
      getting_started1.pyd getting_started2.pyd getting_started3.pyd \
      getting_started4.pyd getting_started5.pyd
 
@@ -143,10 +143,10 @@ libbpl.a: $(OBJ)
 DLLWRAPOPTS= -s --driver-name g++ -s
              --entry _DllMainCRTStartup@12 --target=i386-mingw32
 
-test.pyd: $(OBJ) comprehensive.o
+boost_python_test.pyd: $(OBJ) comprehensive.o
 	dllwrap $(DLLWRAPOPTS) \
-          --dllname test.pyd \
-          --def test.def \
+          --dllname boost_python_test.pyd \
+          --def boost_python_test.def \
           $(OBJ) comprehensive.o $(PYLIB)
 
 abstract.pyd: $(OBJ) abstract.o
@@ -199,7 +199,7 @@ test:
 
 clean:
 	rm -f $(OBJ) libbpl.a libbpl.a.input
-	rm -f comprehensive.o test.pyd
+	rm -f comprehensive.o boost_python_test.pyd
 	rm -f abstract.o abstract.pyd
 	rm -f getting_started1.o getting_started1.pyd
 	rm -f getting_started2.o getting_started2.pyd
diff --git a/build/Makefile.tru64_cxx b/build/Makefile.tru64_cxx
index 7b932bd3..2b417944 100644
--- a/build/Makefile.tru64_cxx
+++ b/build/Makefile.tru64_cxx
@@ -79,7 +79,7 @@ DEPOBJ= $(OBJ) comprehensive.o abstract.o \
 
 .SUFFIXES: .o .cpp
 
-all: libbpl.a test.so abstract.so \
+all: libbpl.a boost_python_test.so abstract.so \
      getting_started1.so getting_started2.so getting_started3.so \
      getting_started4.so getting_started5.so
 
@@ -115,8 +115,8 @@ libbpl.a: $(OBJ)
 	rm -f libbpl.a.input
 	ar r libbpl.a $(OBJ)
 
-test.so: $(OBJ) comprehensive.o
-	$(LD) $(LDOPTS) $(OBJ) comprehensive.o -o test.so -lm
+boost_python_test.so: $(OBJ) comprehensive.o
+	$(LD) $(LDOPTS) $(OBJ) comprehensive.o -o boost_python_test.so -lm
 
 abstract.so: $(OBJ) abstract.o
 	$(LD) $(LDOPTS) $(OBJ) abstract.o -o abstract.so
@@ -150,7 +150,7 @@ test:
 
 clean:
 	rm -f $(OBJ) libbpl.a libbpl.a.input
-	rm -f comprehensive.o test.so
+	rm -f comprehensive.o boost_python_test.so
 	rm -f abstract.o abstract.so
 	rm -f getting_started1.o getting_started1.so
 	rm -f getting_started2.o getting_started2.so