diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index deec56a5d0..796d91fad3 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -18,7 +18,7 @@ function wp_admin_bar_init() {
 		return false;
 
 	/* Load the admin bar class code ready for instantiation */
-	require( ABSPATH . WPINC . '/admin-bar/admin-bar-class.php' );
+	require( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
 
 	/* Instantiate the admin bar */
 	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
diff --git a/wp-includes/admin-bar/admin-bar-class.php b/wp-includes/class-wp-admin-bar.php
similarity index 99%
rename from wp-includes/admin-bar/admin-bar-class.php
rename to wp-includes/class-wp-admin-bar.php
index ec4b5d98b5..7debb96724 100644
--- a/wp-includes/admin-bar/admin-bar-class.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -9,7 +9,7 @@ class WP_Admin_Bar {
 	function initialize() {
 		/* Only load super admin menu code if the logged in user is a super admin */
 		if ( is_super_admin() ) {
-			require( ABSPATH . WPINC . '/admin-bar/admin-bar-superadmin.php' );
+			require( ABSPATH . WPINC . '/ms-admin-bar.php' );
 		}
 
 		/* Set the protocol used throughout this code */
diff --git a/wp-includes/admin-bar/admin-bar-superadmin.php b/wp-includes/ms-admin-bar.php
similarity index 100%
rename from wp-includes/admin-bar/admin-bar-superadmin.php
rename to wp-includes/ms-admin-bar.php