diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 916200eb6..64632e95b 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -9,7 +9,7 @@ if ( get_option('db_version') != $wp_db_version )
     
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 require_once(ABSPATH . 'wp-admin/admin-db.php');
-require_once(ABSPATH . WPINC . '/registration-functions.php');
+require_once(ABSPATH . WPINC . '/registration.php');
 
 auth_redirect();
 
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 2775ec15d..aafc7963c 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -2,7 +2,7 @@
 require_once('admin.php'); 
 $title = __('Dashboard'); 
 require_once('admin-header.php');
-require_once (ABSPATH . WPINC . '/rss-functions.php');
+require_once (ABSPATH . WPINC . '/rss.php');
 
 $today = current_time('mysql', 1);
 ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 70d978cf9..5f5f0269c 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -1,6 +1,6 @@
 <?php
 require_once('admin.php');
-require_once( ABSPATH . WPINC . '/registration-functions.php');
+require_once( ABSPATH . WPINC . '/registration.php');
 
 $title = __('Users');
 if ( current_user_can('edit_users') )
diff --git a/wp-includes/functions-compat.php b/wp-includes/compat.php
similarity index 100%
rename from wp-includes/functions-compat.php
rename to wp-includes/compat.php
diff --git a/wp-includes/feed-functions.php b/wp-includes/feed.php
similarity index 100%
rename from wp-includes/feed-functions.php
rename to wp-includes/feed.php
diff --git a/wp-includes/functions-formatting.php b/wp-includes/formatting.php
similarity index 100%
rename from wp-includes/functions-formatting.php
rename to wp-includes/formatting.php
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index e3dae435f..6bbedf96c 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(dirname(__FILE__).'/functions-compat.php');
+require_once(dirname(__FILE__).'/compat.php');
 
 if ( !function_exists('_') ) {
 	function _($string) {
diff --git a/wp-includes/template-functions-general.php b/wp-includes/general-template.php
similarity index 100%
rename from wp-includes/template-functions-general.php
rename to wp-includes/general-template.php
diff --git a/wp-includes/template-functions-links.php b/wp-includes/link-template.php
similarity index 100%
rename from wp-includes/template-functions-links.php
rename to wp-includes/link-template.php
diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable.php
similarity index 100%
rename from wp-includes/pluggable-functions.php
rename to wp-includes/pluggable.php
diff --git a/wp-includes/registration-functions.php b/wp-includes/registration.php
similarity index 100%
rename from wp-includes/registration-functions.php
rename to wp-includes/registration.php
diff --git a/wp-includes/rss-functions.php b/wp-includes/rss.php
similarity index 100%
rename from wp-includes/rss-functions.php
rename to wp-includes/rss.php
diff --git a/wp-register.php b/wp-register.php
index 1a4dc78e2..7c8adb32a 100644
--- a/wp-register.php
+++ b/wp-register.php
@@ -1,6 +1,6 @@
 <?php
 require('./wp-config.php');
-require_once( ABSPATH . WPINC . '/registration-functions.php');
+require_once( ABSPATH . WPINC . '/registration.php');
 
 $action = $_REQUEST['action'];
 if ( !get_settings('users_can_register') )
diff --git a/wp-settings.php b/wp-settings.php
index 8fb899176..03f07baab 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -123,14 +123,14 @@ if ( !is_blog_installed() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !d
 	die(sprintf(__("It doesn't look like you've installed WP yet. Try running <a href='%s'>install.php</a>."), $link));
 }
 
-require (ABSPATH . WPINC . '/functions-formatting.php');
+require (ABSPATH . WPINC . '/formatting.php');
 require (ABSPATH . WPINC . '/capabilities.php');
 require (ABSPATH . WPINC . '/classes.php');
 require (ABSPATH . WPINC . '/query.php');
 require (ABSPATH . WPINC . '/theme.php');
 require (ABSPATH . WPINC . '/user.php');
-require (ABSPATH . WPINC . '/template-functions-general.php');
-require (ABSPATH . WPINC . '/template-functions-links.php');
+require (ABSPATH . WPINC . '/general-template.php');
+require (ABSPATH . WPINC . '/link-template.php');
 require (ABSPATH . WPINC . '/author-template.php');
 require (ABSPATH . WPINC . '/post.php');
 require (ABSPATH . WPINC . '/post-template.php');
@@ -139,7 +139,7 @@ require (ABSPATH . WPINC . '/category-template.php');
 require (ABSPATH . WPINC . '/comment.php');
 require (ABSPATH . WPINC . '/comment-template.php');
 require (ABSPATH . WPINC . '/rewrite.php');
-require (ABSPATH . WPINC . '/feed-functions.php');
+require (ABSPATH . WPINC . '/feed.php');
 require (ABSPATH . WPINC . '/bookmark.php');
 require (ABSPATH . WPINC . '/bookmark-template.php');
 require (ABSPATH . WPINC . '/kses.php');
@@ -183,7 +183,7 @@ if ( get_settings('active_plugins') ) {
 	}
 }
 
-require (ABSPATH . WPINC . '/pluggable-functions.php');
+require (ABSPATH . WPINC . '/pluggable.php');
 
 if ( defined('WP_CACHE') && function_exists('wp_cache_postload') )
 	wp_cache_postload();