diff -Naurp php-5.4.6/sapi/apache2handler/config.m4 php-5.4.6.oden/sapi/apache2handler/config.m4
--- php-5.4.6/sapi/apache2handler/config.m4	2012-08-15 06:26:05.000000000 +0200
+++ php-5.4.6.oden/sapi/apache2handler/config.m4	2012-09-11 16:30:53.312701887 +0200
@@ -70,20 +70,20 @@ if test "$PHP_APXS2" != "no"; then
   if test -z `$APXS -q SYSCONFDIR`; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                       -i -n php5"
+                       -i -n php"
   else
     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                       -i -a -n php5"
+                       -i -a -n php"
   fi
 
   case $host_alias in
   *aix*)
     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-    PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
+    PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 
     ;;
   *darwin*)
@@ -99,19 +99,19 @@ if test "$PHP_APXS2" != "no"; then
     fi
     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
     PHP_SUBST(MH_BUNDLE_FLAGS)
-    PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
-    SAPI_SHARED=libs/libphp5.so
+    PHP_SELECT_SAPI(apache2handler, bundle, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
+    SAPI_SHARED=libs/mod_php.so
     INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
     ;;
   *beos*)
     if test -f _APP_; then `rm _APP_`; fi
     `ln -s $APXS_BINDIR/httpd _APP_`
     EXTRA_LIBS="$EXTRA_LIBS _APP_"
-    PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
+    PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   *)
-    PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) 
+    PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) 
     INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
     ;;
   esac
diff -Naurp php-5.4.6/sapi/apache2handler/mod_php5.c php-5.4.6.oden/sapi/apache2handler/mod_php5.c
--- php-5.4.6/sapi/apache2handler/mod_php5.c	2012-08-15 06:26:05.000000000 +0200
+++ php-5.4.6.oden/sapi/apache2handler/mod_php5.c	2012-09-11 16:10:58.858635105 +0200
@@ -25,7 +25,7 @@
 #include "php.h"
 #include "php_apache.h"
 
-AP_MODULE_DECLARE_DATA module php5_module = {
+AP_MODULE_DECLARE_DATA module php_module = {
 	STANDARD20_MODULE_STUFF,
 	create_php_config,		/* create per-directory config structure */
 	merge_php_config,		/* merge per-directory config structures */
diff -Naurp php-5.4.6/sapi/apache2handler/php_apache.h php-5.4.6.oden/sapi/apache2handler/php_apache.h
--- php-5.4.6/sapi/apache2handler/php_apache.h	2012-08-15 06:26:05.000000000 +0200
+++ php-5.4.6.oden/sapi/apache2handler/php_apache.h	2012-09-11 16:10:58.858635105 +0200
@@ -26,7 +26,7 @@
 #include "http_core.h"
 
 /* Declare this so we can get to it from outside the sapi_apache2.c file */
-extern module AP_MODULE_DECLARE_DATA php5_module;
+extern module AP_MODULE_DECLARE_DATA php_module;
 
 /* A way to specify the location of the php.ini dir in an apache directive */
 extern char *apache2_php_ini_path_override;
diff -Naurp php-5.4.6/sapi/apache2handler/php.sym php-5.4.6.oden/sapi/apache2handler/php.sym
--- php-5.4.6/sapi/apache2handler/php.sym	2012-08-15 06:26:05.000000000 +0200
+++ php-5.4.6.oden/sapi/apache2handler/php.sym	2012-09-11 16:10:58.860635093 +0200
@@ -1 +1 @@
-php5_module
+php_module
diff -Naurp php-5.4.6/sapi/apache2handler/sapi_apache2.c php-5.4.6.oden/sapi/apache2handler/sapi_apache2.c
--- php-5.4.6/sapi/apache2handler/sapi_apache2.c	2012-08-15 06:26:05.000000000 +0200
+++ php-5.4.6.oden/sapi/apache2handler/sapi_apache2.c	2012-09-11 16:10:58.860635093 +0200
@@ -517,7 +517,7 @@ typedef struct {
 } php_conf_rec;
 		char *str;
 		uint str_len;
-		php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php5_module);
+		php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php_module);
 
 		for (zend_hash_internal_pointer_reset(&c->config);
 			zend_hash_get_current_key_ex(&c->config, &str, &str_len, NULL, 0,  NULL) == HASH_KEY_IS_STRING;
@@ -545,7 +545,7 @@ static int php_handler(request_rec *r)
 
 #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
 
-	conf = ap_get_module_config(r->per_dir_config, &php5_module);
+	conf = ap_get_module_config(r->per_dir_config, &php_module);
 
 	/* apply_config() needs r in some cases, so allocate server_context early */
 	ctx = SG(server_context);