Index: wp-includes/load.php
===================================================================
--- wp-includes/load.php	(revision 13581)
+++ wp-includes/load.php	(working copy)
@@ -12,7 +12,7 @@
  * @since 2.1.0
  * @return null Will return null if register_globals PHP directive was disabled
  */
-function wp_unregister_GLOBALS() {
+function wp_unregister_globals() {
 	if ( !ini_get( 'register_globals' ) )
 		return;
 
@@ -20,12 +20,12 @@
 		die( /*WP_I18N_GLOBALS_OVERWRITE*/'GLOBALS overwrite attempt detected'/*/WP_I18N_GLOBALS_OVERWRITE*/ );
 
 	// Variables that shouldn't be unset
-	$noUnset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
+	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
 
 	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
 	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $noUnset ) && isset( $GLOBALS[$k] ) ) {
-			$GLOBALS[$k] = NULL;
+		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
+			$GLOBALS[$k] = null;
 			unset( $GLOBALS[$k] );
 		}
 }
Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 13581)
+++ wp-settings.php	(working copy)
@@ -32,7 +32,7 @@
 	date_default_timezone_set( 'UTC' );
 
 // Turn register_globals off.
-wp_unregister_GLOBALS();
+wp_unregister_global();
 
 // Ensure these global variables do not exist so they do not interfere with WordPress.
 unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate );