diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 5dbf8b6b7..b95c7e33d 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -746,41 +746,41 @@ ruby_clean:
 ##################################################################
 
 # -------------------------------------------------------------------
-# Build a PHP4 dynamically loadable module (C)
+# Build a PHP dynamically loadable module (C)
 # -------------------------------------------------------------------
 
-PHP4_INCLUDE = @PHP4INC@
-PHP4_SO      = @PHP4_SO@
+PHP_INCLUDE = @PHPINC@
+PHP_SO      = @PHP_SO@
 
-php4: $(SRCS)
+php: $(SRCS)
 	$(SWIG) -php5 $(SWIGOPT) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE)
-	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE)
+	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
 
 # --------------------------------------------------------------------
-# Build a PHP4 dynamically loadable module (C++)
+# Build a PHP dynamically loadable module (C++)
 # --------------------------------------------------------------------
 
-php4_cpp: $(SRCS)
+php_cpp: $(SRCS)
 	$(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE)
-	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE)
+	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
 
 # -----------------------------------------------------------------
-# Running a PHP4 example
+# Running a PHP example
 # -----------------------------------------------------------------
 
-PHP4=@PHP4@
-PHP4SCRIPT ?= runme.php4
+PHP=@PHP@
+PHPSCRIPT ?= runme.php
 
-php4_run:
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(PHP4SCRIPT)
+php_run:
+	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. $(PHPSCRIPT)
 
 # -----------------------------------------------------------------
-# Cleaning the PHP4 examples
+# Cleaning the PHP examples
 # -----------------------------------------------------------------
 
-php4_clean:
+php_clean:
 	rm -f *_wrap* *~ .~* example.php php_example.h
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
diff --git a/Examples/php/class/Makefile b/Examples/php/class/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/class/Makefile
+++ b/Examples/php/class/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/class/runme.php4 b/Examples/php/class/runme.php
similarity index 100%
rename from Examples/php/class/runme.php4
rename to Examples/php/class/runme.php
diff --git a/Examples/php/constants/Makefile b/Examples/php/constants/Makefile
index aed110eb2..23e2675d7 100644
--- a/Examples/php/constants/Makefile
+++ b/Examples/php/constants/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/constants/runme.php4 b/Examples/php/constants/runme.php
similarity index 100%
rename from Examples/php/constants/runme.php4
rename to Examples/php/constants/runme.php
diff --git a/Examples/php/cpointer/Makefile b/Examples/php/cpointer/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/cpointer/Makefile
+++ b/Examples/php/cpointer/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/cpointer/runme.php4 b/Examples/php/cpointer/runme.php
similarity index 100%
rename from Examples/php/cpointer/runme.php4
rename to Examples/php/cpointer/runme.php
diff --git a/Examples/php/disown/Makefile b/Examples/php/disown/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/disown/Makefile
+++ b/Examples/php/disown/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/disown/runme.php4 b/Examples/php/disown/runme.php
similarity index 100%
rename from Examples/php/disown/runme.php4
rename to Examples/php/disown/runme.php
diff --git a/Examples/php/enum/Makefile b/Examples/php/enum/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/enum/Makefile
+++ b/Examples/php/enum/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/enum/runme.php4 b/Examples/php/enum/runme.php
similarity index 100%
rename from Examples/php/enum/runme.php4
rename to Examples/php/enum/runme.php
diff --git a/Examples/php/funcptr/Makefile b/Examples/php/funcptr/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/funcptr/Makefile
+++ b/Examples/php/funcptr/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/funcptr/runme.php4 b/Examples/php/funcptr/runme.php
similarity index 100%
rename from Examples/php/funcptr/runme.php4
rename to Examples/php/funcptr/runme.php
diff --git a/Examples/php/overloading/Makefile b/Examples/php/overloading/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/overloading/Makefile
+++ b/Examples/php/overloading/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/overloading/runme.php4 b/Examples/php/overloading/runme.php
similarity index 100%
rename from Examples/php/overloading/runme.php4
rename to Examples/php/overloading/runme.php
diff --git a/Examples/php/pointer/Makefile b/Examples/php/pointer/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/pointer/Makefile
+++ b/Examples/php/pointer/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/pointer/runme.php4 b/Examples/php/pointer/runme.php
similarity index 100%
rename from Examples/php/pointer/runme.php4
rename to Examples/php/pointer/runme.php
diff --git a/Examples/php/pragmas/Makefile b/Examples/php/pragmas/Makefile
index aed110eb2..23e2675d7 100644
--- a/Examples/php/pragmas/Makefile
+++ b/Examples/php/pragmas/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/pragmas/runme.php4 b/Examples/php/pragmas/runme.php
similarity index 100%
rename from Examples/php/pragmas/runme.php4
rename to Examples/php/pragmas/runme.php
diff --git a/Examples/php/proxy/Makefile b/Examples/php/proxy/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/proxy/Makefile
+++ b/Examples/php/proxy/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/proxy/runme.php4 b/Examples/php/proxy/runme.php
similarity index 100%
rename from Examples/php/proxy/runme.php4
rename to Examples/php/proxy/runme.php
diff --git a/Examples/php/reference/Makefile b/Examples/php/reference/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/reference/Makefile
+++ b/Examples/php/reference/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/reference/runme.php4 b/Examples/php/reference/runme.php
similarity index 100%
rename from Examples/php/reference/runme.php4
rename to Examples/php/reference/runme.php
diff --git a/Examples/php/simple/Makefile b/Examples/php/simple/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/simple/Makefile
+++ b/Examples/php/simple/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/simple/runme.php4 b/Examples/php/simple/runme.php
similarity index 100%
rename from Examples/php/simple/runme.php4
rename to Examples/php/simple/runme.php
diff --git a/Examples/php/sync/Makefile b/Examples/php/sync/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/sync/Makefile
+++ b/Examples/php/sync/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/sync/runme.php4 b/Examples/php/sync/runme.php
similarity index 100%
rename from Examples/php/sync/runme.php4
rename to Examples/php/sync/runme.php
diff --git a/Examples/php/value/Makefile b/Examples/php/value/Makefile
index cc383ea3f..9e69d00a4 100644
--- a/Examples/php/value/Makefile
+++ b/Examples/php/value/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/value/runme.php4 b/Examples/php/value/runme.php
similarity index 100%
rename from Examples/php/value/runme.php4
rename to Examples/php/value/runme.php
diff --git a/Examples/php/variables/Makefile b/Examples/php/variables/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/variables/Makefile
+++ b/Examples/php/variables/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/variables/runme.php4 b/Examples/php/variables/runme.php
similarity index 100%
rename from Examples/php/variables/runme.php4
rename to Examples/php/variables/runme.php
diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php/Makefile.in
index 9f412bc56..b8aeaaa11 100644
--- a/Examples/test-suite/php/Makefile.in
+++ b/Examples/test-suite/php/Makefile.in
@@ -1,9 +1,9 @@
 #######################################################################
-# Makefile for php4 test-suite
+# Makefile for php test-suite
 #######################################################################
 
-LANGUAGE     = php4
-SCRIPTSUFFIX = _runme.php4
+LANGUAGE     = php
+SCRIPTSUFFIX = _runme.php
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
@@ -25,19 +25,19 @@ makectests:
 	@bash -ec 'for test in $(C_TEST_CASES) ; do $($(MAKE)) clean && $(MAKE) $${test}.cpptest; done'
 
 runcpptests:
-	@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
+	@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
 
 runctests:
-	@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
+	@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
 
 runtests: runcpptests runctests
 
-# write out tests without a _runme.php4
+# write out tests without a _runme.php
 missingcpptests:
-	@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
+	@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
 
 missingctests:
-	@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
+	@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
 
 missingtests: missingcpptests missingctests
 
@@ -58,10 +58,10 @@ missingtests: missingcpptests missingctests
 	+$(run_testcase)
 
 # Runs the testcase. A testcase is only run if
-# a file is found which has _runme.php4 appended after the testcase name.
+# a file is found which has _runme.php appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP4SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \
 	fi;
 
 # Clean: remove the generated .php file
@@ -69,4 +69,4 @@ run_testcase = \
 	@rm -f $*.php;
 
 clean:
-	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php4_clean
+	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php_clean
diff --git a/Examples/test-suite/php/abstract_inherit_ok_runme.php4 b/Examples/test-suite/php/abstract_inherit_ok_runme.php
similarity index 88%
rename from Examples/test-suite/php/abstract_inherit_ok_runme.php4
rename to Examples/test-suite/php/abstract_inherit_ok_runme.php
index 1182e4cec..c2d86499b 100644
--- a/Examples/test-suite/php/abstract_inherit_ok_runme.php4
+++ b/Examples/test-suite/php/abstract_inherit_ok_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "abstract_inherit_ok.php";
 
 check::classes(array(Foo,Spam));
diff --git a/Examples/test-suite/php/abstract_inherit_runme.php4 b/Examples/test-suite/php/abstract_inherit_runme.php
similarity index 93%
rename from Examples/test-suite/php/abstract_inherit_runme.php4
rename to Examples/test-suite/php/abstract_inherit_runme.php
index fbc971711..3554e6fd8 100644
--- a/Examples/test-suite/php/abstract_inherit_runme.php4
+++ b/Examples/test-suite/php/abstract_inherit_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "abstract_inherit.php";
 
 check::classes(array(Foo,Bar,Spam,NRFilter_i,NRRCFilter_i,NRRCFilterpro_i,NRRCFilterpri_i));
diff --git a/Examples/test-suite/php/add_link_runme.php4 b/Examples/test-suite/php/add_link_runme.php
similarity index 95%
rename from Examples/test-suite/php/add_link_runme.php4
rename to Examples/test-suite/php/add_link_runme.php
index b9d5334dd..4d8c31d5e 100644
--- a/Examples/test-suite/php/add_link_runme.php4
+++ b/Examples/test-suite/php/add_link_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "add_link.php";
 
 // No new functions, except the flat functions
diff --git a/Examples/test-suite/php/argout_runme.php4 b/Examples/test-suite/php/argout_runme.php
similarity index 97%
rename from Examples/test-suite/php/argout_runme.php4
rename to Examples/test-suite/php/argout_runme.php
index 1328b0926..1c9026b6c 100644
--- a/Examples/test-suite/php/argout_runme.php4
+++ b/Examples/test-suite/php/argout_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "argout.php";
 
 check::functions(array(incp,incr,inctr,new_intp,copy_intp,delete_intp,intp_assign,intp_value,voidhandle,handle));
diff --git a/Examples/test-suite/php/arrayptr_runme.php4 b/Examples/test-suite/php/arrayptr_runme.php
similarity index 90%
rename from Examples/test-suite/php/arrayptr_runme.php4
rename to Examples/test-suite/php/arrayptr_runme.php
index c057a6772..717c870d9 100644
--- a/Examples/test-suite/php/arrayptr_runme.php4
+++ b/Examples/test-suite/php/arrayptr_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrayptr.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/arrays_global_runme.php4 b/Examples/test-suite/php/arrays_global_runme.php
similarity index 96%
rename from Examples/test-suite/php/arrays_global_runme.php4
rename to Examples/test-suite/php/arrays_global_runme.php
index d6a3955e1..59ff7bf2a 100644
--- a/Examples/test-suite/php/arrays_global_runme.php4
+++ b/Examples/test-suite/php/arrays_global_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_global.php";
 
 check::functions(array(test_a,test_b,new_simplestruct,new_material));
diff --git a/Examples/test-suite/php/arrays_global_twodim_runme.php4 b/Examples/test-suite/php/arrays_global_twodim_runme.php
similarity index 97%
rename from Examples/test-suite/php/arrays_global_twodim_runme.php4
rename to Examples/test-suite/php/arrays_global_twodim_runme.php
index 352ad2568..d9b62de0d 100644
--- a/Examples/test-suite/php/arrays_global_twodim_runme.php4
+++ b/Examples/test-suite/php/arrays_global_twodim_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_global_twodim.php";
 
 check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));
diff --git a/Examples/test-suite/php/arrays_runme.php4 b/Examples/test-suite/php/arrays_runme.php
similarity index 95%
rename from Examples/test-suite/php/arrays_runme.php4
rename to Examples/test-suite/php/arrays_runme.php
index 407c32c31..97ee6bbbf 100644
--- a/Examples/test-suite/php/arrays_runme.php4
+++ b/Examples/test-suite/php/arrays_runme.php
@@ -1,6 +1,6 @@
 <?php
 // Sample test file
-require "tests.php4";
+require "tests.php";
 require "arrays.php";
 
 check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
diff --git a/Examples/test-suite/php/arrays_scope_runme.php4 b/Examples/test-suite/php/arrays_scope_runme.php
similarity index 92%
rename from Examples/test-suite/php/arrays_scope_runme.php4
rename to Examples/test-suite/php/arrays_scope_runme.php
index 75c7ccf27..92de96920 100644
--- a/Examples/test-suite/php/arrays_scope_runme.php4
+++ b/Examples/test-suite/php/arrays_scope_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_scope.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/casts_runme.php4 b/Examples/test-suite/php/casts_runme.php
similarity index 93%
rename from Examples/test-suite/php/casts_runme.php4
rename to Examples/test-suite/php/casts_runme.php
index c3d19e29e..03ee6829c 100644
--- a/Examples/test-suite/php/casts_runme.php4
+++ b/Examples/test-suite/php/casts_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "casts.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/class_ignore_runme.php4 b/Examples/test-suite/php/class_ignore_runme.php
similarity index 93%
rename from Examples/test-suite/php/class_ignore_runme.php4
rename to Examples/test-suite/php/class_ignore_runme.php
index 5da23e502..861576026 100644
--- a/Examples/test-suite/php/class_ignore_runme.php4
+++ b/Examples/test-suite/php/class_ignore_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "class_ignore.php";
 
 check::functions(array(do_blah,new_bar,bar_blah,new_boo,boo_away,new_far,new_hoo));
diff --git a/Examples/test-suite/php/conversion_namespace_runme.php4 b/Examples/test-suite/php/conversion_namespace_runme.php
similarity index 90%
rename from Examples/test-suite/php/conversion_namespace_runme.php4
rename to Examples/test-suite/php/conversion_namespace_runme.php
index ae49d2002..e6866f871 100644
--- a/Examples/test-suite/php/conversion_namespace_runme.php4
+++ b/Examples/test-suite/php/conversion_namespace_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "conversion_namespace.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/conversion_ns_template_runme.php4 b/Examples/test-suite/php/conversion_ns_template_runme.php
similarity index 89%
rename from Examples/test-suite/php/conversion_ns_template_runme.php4
rename to Examples/test-suite/php/conversion_ns_template_runme.php
index e799cdd48..9702eedb7 100644
--- a/Examples/test-suite/php/conversion_ns_template_runme.php4
+++ b/Examples/test-suite/php/conversion_ns_template_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "conversion_ns_template.php";
 
 check::classes(array("conversion_ns_template","Foo_One","Bar_One","Hi"));
diff --git a/Examples/test-suite/php/conversion_runme.php4 b/Examples/test-suite/php/conversion_runme.php
similarity index 90%
rename from Examples/test-suite/php/conversion_runme.php4
rename to Examples/test-suite/php/conversion_runme.php
index 7941a7bbe..69ade46db 100644
--- a/Examples/test-suite/php/conversion_runme.php4
+++ b/Examples/test-suite/php/conversion_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "conversion.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/cpp_static_runme.php4 b/Examples/test-suite/php/cpp_static_runme.php
similarity index 91%
rename from Examples/test-suite/php/cpp_static_runme.php4
rename to Examples/test-suite/php/cpp_static_runme.php
index b7f987505..54dbfc7d8 100644
--- a/Examples/test-suite/php/cpp_static_runme.php4
+++ b/Examples/test-suite/php/cpp_static_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "cpp_static.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/enum_scope_template_runme.php4 b/Examples/test-suite/php/enum_scope_template_runme.php
similarity index 96%
rename from Examples/test-suite/php/enum_scope_template_runme.php4
rename to Examples/test-suite/php/enum_scope_template_runme.php
index 40efc5743..7cea23911 100644
--- a/Examples/test-suite/php/enum_scope_template_runme.php4
+++ b/Examples/test-suite/php/enum_scope_template_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "enum_scope_template.php";
 
 check::classes(array("enum_scope_template", "TreeInt"));
diff --git a/Examples/test-suite/php/evil_diamond_ns_runme.php4 b/Examples/test-suite/php/evil_diamond_ns_runme.php
similarity index 94%
rename from Examples/test-suite/php/evil_diamond_ns_runme.php4
rename to Examples/test-suite/php/evil_diamond_ns_runme.php
index 29e8cd520..b76d1443f 100644
--- a/Examples/test-suite/php/evil_diamond_ns_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_ns_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond_ns.php";
 
 check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/evil_diamond_prop_runme.php4 b/Examples/test-suite/php/evil_diamond_prop_runme.php
similarity index 97%
rename from Examples/test-suite/php/evil_diamond_prop_runme.php4
rename to Examples/test-suite/php/evil_diamond_prop_runme.php
index c0b157fca..6f66d01c5 100644
--- a/Examples/test-suite/php/evil_diamond_prop_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_prop_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond_prop.php";
 
 check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/evil_diamond_runme.php4 b/Examples/test-suite/php/evil_diamond_runme.php
similarity index 93%
rename from Examples/test-suite/php/evil_diamond_runme.php4
rename to Examples/test-suite/php/evil_diamond_runme.php
index 677813bfa..a6ef211b1 100644
--- a/Examples/test-suite/php/evil_diamond_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond.php";
 
 check::classes(array("evil_diamond","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/extend_template_ns_runme.php4 b/Examples/test-suite/php/extend_template_ns_runme.php
similarity index 91%
rename from Examples/test-suite/php/extend_template_ns_runme.php4
rename to Examples/test-suite/php/extend_template_ns_runme.php
index 16a6434bf..604e0470e 100644
--- a/Examples/test-suite/php/extend_template_ns_runme.php4
+++ b/Examples/test-suite/php/extend_template_ns_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "extend_template_ns.php";
 
 check::classes(array("extend_template_ns","Foo_One"));
diff --git a/Examples/test-suite/php/extend_template_runme.php4 b/Examples/test-suite/php/extend_template_runme.php
similarity index 90%
rename from Examples/test-suite/php/extend_template_runme.php4
rename to Examples/test-suite/php/extend_template_runme.php
index c12f330a5..bf77e9b1c 100644
--- a/Examples/test-suite/php/extend_template_runme.php4
+++ b/Examples/test-suite/php/extend_template_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "extend_template.php";
 
 check::classes(array("Foo_0"));
diff --git a/Examples/test-suite/php/grouping_runme.php4 b/Examples/test-suite/php/grouping_runme.php
similarity index 96%
rename from Examples/test-suite/php/grouping_runme.php4
rename to Examples/test-suite/php/grouping_runme.php
index 45e321fd3..8a2a88fa9 100644
--- a/Examples/test-suite/php/grouping_runme.php4
+++ b/Examples/test-suite/php/grouping_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "grouping.php";
 
 check::functions(array("test1","test2","do_unary","negate"));
diff --git a/Examples/test-suite/php/ignore_parameter_runme.php4 b/Examples/test-suite/php/ignore_parameter_runme.php
similarity index 98%
rename from Examples/test-suite/php/ignore_parameter_runme.php4
rename to Examples/test-suite/php/ignore_parameter_runme.php
index 8a2bf899e..745720c3c 100644
--- a/Examples/test-suite/php/ignore_parameter_runme.php4
+++ b/Examples/test-suite/php/ignore_parameter_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "ignore_parameter.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/li_carrays_runme.php4 b/Examples/test-suite/php/li_carrays_runme.php
similarity index 92%
rename from Examples/test-suite/php/li_carrays_runme.php4
rename to Examples/test-suite/php/li_carrays_runme.php
index b0b93dafe..babf8443b 100644
--- a/Examples/test-suite/php/li_carrays_runme.php4
+++ b/Examples/test-suite/php/li_carrays_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "li_carrays.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/li_std_string_runme.php4 b/Examples/test-suite/php/li_std_string_runme.php
similarity index 98%
rename from Examples/test-suite/php/li_std_string_runme.php4
rename to Examples/test-suite/php/li_std_string_runme.php
index fb3da3598..c7270df3d 100644
--- a/Examples/test-suite/php/li_std_string_runme.php4
+++ b/Examples/test-suite/php/li_std_string_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "li_std_string.php";
 
 // Global variables
diff --git a/Examples/test-suite/php/rename_scope_runme.php4 b/Examples/test-suite/php/rename_scope_runme.php
similarity index 96%
rename from Examples/test-suite/php/rename_scope_runme.php4
rename to Examples/test-suite/php/rename_scope_runme.php
index ad86321d3..33925a6db 100644
--- a/Examples/test-suite/php/rename_scope_runme.php4
+++ b/Examples/test-suite/php/rename_scope_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "rename_scope.php";
 
 check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
diff --git a/Examples/test-suite/php/skel.php4 b/Examples/test-suite/php/skel.php
similarity index 90%
rename from Examples/test-suite/php/skel.php4
rename to Examples/test-suite/php/skel.php
index d6f33758d..780a999ed 100644
--- a/Examples/test-suite/php/skel.php4
+++ b/Examples/test-suite/php/skel.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "____.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/smart_pointer_rename_runme.php4 b/Examples/test-suite/php/smart_pointer_rename_runme.php
similarity index 97%
rename from Examples/test-suite/php/smart_pointer_rename_runme.php4
rename to Examples/test-suite/php/smart_pointer_rename_runme.php
index 5f21b6dda..a1759cb95 100644
--- a/Examples/test-suite/php/smart_pointer_rename_runme.php4
+++ b/Examples/test-suite/php/smart_pointer_rename_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "smart_pointer_rename.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/sym_runme.php4 b/Examples/test-suite/php/sym_runme.php
similarity index 95%
rename from Examples/test-suite/php/sym_runme.php4
rename to Examples/test-suite/php/sym_runme.php
index ce89ea4b2..a6d2a6c74 100644
--- a/Examples/test-suite/php/sym_runme.php4
+++ b/Examples/test-suite/php/sym_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "sym.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/template_arg_typename_runme.php4 b/Examples/test-suite/php/template_arg_typename_runme.php
similarity index 94%
rename from Examples/test-suite/php/template_arg_typename_runme.php4
rename to Examples/test-suite/php/template_arg_typename_runme.php
index 7062c674e..58835eafe 100644
--- a/Examples/test-suite/php/template_arg_typename_runme.php4
+++ b/Examples/test-suite/php/template_arg_typename_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "template_arg_typename.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/template_construct_runme.php4 b/Examples/test-suite/php/template_construct_runme.php
similarity index 88%
rename from Examples/test-suite/php/template_construct_runme.php4
rename to Examples/test-suite/php/template_construct_runme.php
index d0fbc9bb7..3a3986f7e 100644
--- a/Examples/test-suite/php/template_construct_runme.php4
+++ b/Examples/test-suite/php/template_construct_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "template_construct.php";
 
 check::classes(array(Foo_int));
diff --git a/Examples/test-suite/php/tests.php4 b/Examples/test-suite/php/tests.php
similarity index 100%
rename from Examples/test-suite/php/tests.php4
rename to Examples/test-suite/php/tests.php
diff --git a/Examples/test-suite/php/typedef_reference_runme.php4 b/Examples/test-suite/php/typedef_reference_runme.php
similarity index 93%
rename from Examples/test-suite/php/typedef_reference_runme.php4
rename to Examples/test-suite/php/typedef_reference_runme.php
index 2c64efce6..88a70f8d3 100644
--- a/Examples/test-suite/php/typedef_reference_runme.php4
+++ b/Examples/test-suite/php/typedef_reference_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "typedef_reference.php";
 
 check::functions(array(somefunc,otherfunc,new_intp,copy_intp,delete_intp,intp_assign,intp_value));
diff --git a/Examples/test-suite/php/typemap_ns_using_runme.php4 b/Examples/test-suite/php/typemap_ns_using_runme.php
similarity index 89%
rename from Examples/test-suite/php/typemap_ns_using_runme.php4
rename to Examples/test-suite/php/typemap_ns_using_runme.php
index 44403d138..6a599f008 100644
--- a/Examples/test-suite/php/typemap_ns_using_runme.php4
+++ b/Examples/test-suite/php/typemap_ns_using_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "typemap_ns_using.php";
 if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
 if (! 3==spam(3)) die("spam function not working right\n");
diff --git a/Examples/test-suite/php/using1_runme.php4 b/Examples/test-suite/php/using1_runme.php
similarity index 88%
rename from Examples/test-suite/php/using1_runme.php4
rename to Examples/test-suite/php/using1_runme.php
index ed7e32b06..51841bc78 100644
--- a/Examples/test-suite/php/using1_runme.php4
+++ b/Examples/test-suite/php/using1_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "using1.php";
 if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
 if (! 3==spam(3)) die("spam function not working right\n");
diff --git a/Examples/test-suite/php/using2_runme.php4 b/Examples/test-suite/php/using2_runme.php
similarity index 88%
rename from Examples/test-suite/php/using2_runme.php4
rename to Examples/test-suite/php/using2_runme.php
index e57f0ce9a..391a98f52 100644
--- a/Examples/test-suite/php/using2_runme.php4
+++ b/Examples/test-suite/php/using2_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "using2.php";
 if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
 if (! 3==spam(3)) die("spam function not working right\n");
diff --git a/Examples/test-suite/php/valuewrapper_base_runme.php4 b/Examples/test-suite/php/valuewrapper_base_runme.php
similarity index 91%
rename from Examples/test-suite/php/valuewrapper_base_runme.php4
rename to Examples/test-suite/php/valuewrapper_base_runme.php
index 355bb41c5..aff88486e 100644
--- a/Examples/test-suite/php/valuewrapper_base_runme.php4
+++ b/Examples/test-suite/php/valuewrapper_base_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "valuewrapper_base.php";
 
 check::classes(array("valuewrapper_base","Base","Interface_BP"));
diff --git a/Makefile.in b/Makefile.in
index 3c41c0394..5fa9e55ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ skip-guilescm   = test -n "@SKIP_GUILESCM@"
 skip-guile	= test -n "@SKIP_GUILE@"
 skip-mzscheme	= test -n "@SKIP_MZSCHEME@"
 skip-ruby	= test -n "@SKIP_RUBY@"
-skip-php	= test -n "@SKIP_PHP4@"
+skip-php	= test -n "@SKIP_PHP@"
 skip-ocaml      = test -n "@SKIP_OCAML@"
 skip-octave     = test -n "@SKIP_OCTAVE@"
 skip-pike       = test -n "@SKIP_PIKE@"
diff --git a/configure.in b/configure.in
index 16ed08374..749d95197 100644
--- a/configure.in
+++ b/configure.in
@@ -243,10 +243,10 @@ case $host in
    *) GUILE_SO=$SO;;
 esac
 
-AC_SUBST(PHP4_SO)
+AC_SUBST(PHP_SO)
 case $host in
-   *-*-darwin*) PHP4_SO=.so;;
-   *) PHP4_SO=$SO;;
+   *-*-darwin*) PHP_SO=.so;;
+   *) PHP_SO=$SO;;
 esac
 
 AC_SUBST(MZSCHEME_SO)
@@ -1329,37 +1329,37 @@ AC_SUBST(RUBYDYNAMICLINKING)
 # Look for PHP
 #-------------------------------------------------------------------------
 
-PHP4BIN=
+PHPBIN=
 
 AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP])
-AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHP4BIN="$withval"], [PHP4BIN=yes])
+AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN=yes])
 
 # First, check for "--without-php" or "--with-php=no".
-if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then 
+if test x"${PHPBIN}" = xno -o x"${with_alllang}" = xno ; then 
     AC_MSG_NOTICE([Disabling PHP])
-    PHP4=
+    PHP=
 else
 
-    if test "x$PHP4BIN" = xyes; then
-      AC_CHECK_PROGS(PHP4, [php5 php])
+    if test "x$PHPBIN" = xyes; then
+      AC_CHECK_PROGS(PHP, [php5 php])
     else
-      PHP4=$PHP4BIN
+      PHP=$PHPBIN
     fi
 
     AC_MSG_CHECKING(for PHP header files)
     dnl /usr/bin/php5 -> /usr/bin/php-config5
-    case $PHP4 in
+    case $PHP in
       *5)
-	PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;;
+	PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;;
       *)
-	PHP4CONFIG=$PHP4-config ;;
+	PHPCONFIG=$PHP-config ;;
     esac
-    php_version=`$PHP4CONFIG --version 2>/dev/null`
+    php_version=`$PHPCONFIG --version 2>/dev/null`
     case $php_version in
     5*) 
-	PHP4INC=`$PHP4CONFIG --includes 2>/dev/null`
-	if test -n "$PHP4INC"; then
-	  AC_MSG_RESULT($PHP4INC)
+	PHPINC=`$PHPCONFIG --includes 2>/dev/null`
+	if test -n "$PHPINC"; then
+	  AC_MSG_RESULT($PHPINC)
 	else
 	  AC_MSG_RESULT(not found)
 	fi
@@ -1368,8 +1368,8 @@ else
 	AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;;
     esac
 fi
-AC_SUBST(PHP4)
-AC_SUBST(PHP4INC)
+AC_SUBST(PHP)
+AC_SUBST(PHPINC)
 
 #----------------------------------------------------------------
 # Look for ocaml
@@ -2003,11 +2003,11 @@ fi
 AC_SUBST(SKIP_RUBY)
 
 
-SKIP_PHP4=
-if test -z "$PHP4" || test -z "$PHP4INC" ; then
-    SKIP_PHP4="1"
+SKIP_PHP=
+if test -z "$PHP" || test -z "$PHPINC" ; then
+    SKIP_PHP="1"
 fi
-AC_SUBST(SKIP_PHP4)
+AC_SUBST(SKIP_PHP)
 
 
 SKIP_OCAML=