diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 84bacf86fa..cf11e01ea6 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -731,7 +731,7 @@ function site_admin_notice() {
 		return false;
 	printf("<div id='update-nag'>" . __("Hi %s! You're logged in as a site administrator.") . "</div>", $current_user->user_login);
 	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
-		echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="wpmu-upgrade-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>";
+		echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-site.php">Upgrade Site</a> page to update all your blogs.' ) . "</div>";
 	}
 }
 add_action( 'admin_notices', 'site_admin_notice' );
@@ -837,7 +837,7 @@ add_action( 'after_plugin_row', 'add_sitewide_activate_row', 9, 3 );
  * be activated as a site wide MU plugin.
  */
 function is_wpmu_sitewide_plugin( $file ) {
-	/* Open the plugin file for reading to check if this is a wpmu-plugin. */
+	/* Open the plugin file for reading to check if this is a ms-plugin. */
 	$fp = @fopen( WP_PLUGIN_DIR . '/' . $file, 'r' );
 	
 	/* Pull only the first 8kiB of the file in. */
@@ -1092,7 +1092,7 @@ function disable_some_pages() {
 
 	if ( strpos( $_SERVER['PHP_SELF'], 'user-new.php' ) && !get_site_option( 'add_new_users' ) ) {
 		if ( is_site_admin() ) {
-			$messages[] = '<div id="message" class="updated fade"><p>' . __( 'Warning! Only site administrators may see this page. Everyone else will see a <em>page disabled</em> message. Enable it again on <a href="wpmu-options.php#addnewusers">the options page</a>.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated fade"><p>' . __( 'Warning! Only site administrators may see this page. Everyone else will see a <em>page disabled</em> message. Enable it again on <a href="ms-options.php#addnewusers">the options page</a>.' ) . '</p></div>';
 		} else {
 			wp_die( __('Page disabled by the administrator') );
 		}
@@ -1253,7 +1253,7 @@ function show_post_thumbnail_warning() {
 	}
 	$mu_media_buttons = get_site_option( 'mu_media_buttons', array() );
 	if ( !$mu_media_buttons[ 'image' ] && current_theme_supports( 'post-thumbnails' ) ) {
-		echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'wpmu-options.php' ) ) . "</div>";
+		echo "<div id='update-nag'>" . sprintf( __( "Warning! The current theme supports post thumbnails. You must enable image uploads on <a href='%s'>the options page</a> for it to work." ), admin_url( 'ms-options.php' ) ) . "</div>";
 	}
 }
 add_action( 'admin_notices', 'show_post_thumbnail_warning' );
diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index 4fc86a027b..f2271b503b 100644
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -5,7 +5,7 @@ if ( !is_multisite() )
 	wp_die( __('Multisite support is not enabled.') );
 
 $title = __('WordPress MU &rsaquo; Admin');
-$parent_file = 'wpmu-admin.php';
+$parent_file = 'ms-admin.php';
 
 function index_css() {
 	wp_admin_css( 'css/dashboard' );
@@ -33,15 +33,15 @@ $title = __( 'WordPress MU : Admin' );
 	<h2><?php echo wp_specialchars( $title ); ?></h2> 
 
 	<ul class="subsubsub">
-	<li><a href="wpmu-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
-	<li><a href="wpmu-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
+	<li><a href="ms-blogs.php#form-add-blog" class="rbutton"><strong><?php _e('Create a New Blog'); ?></strong></a> | </li>
+	<li><a href="ms-users.php#form-add-user" class="rbutton"><?php _e('Create a New User'); ?></a></li>
 	</ul>
 	<br clear='all' />
 
 	<p class="youhave"><?php echo $sentence; ?></p>
 	<?php do_action('wpmuadminresult', ''); ?>
 
-	<form name="searchform" action="wpmu-users.php" method="get">
+	<form name="searchform" action="ms-users.php" method="get">
 		<p>
 			<input type="hidden" name="action" value="users" />
 			<input type="text" name="s" value="" size="17" /> 
@@ -49,7 +49,7 @@ $title = __( 'WordPress MU : Admin' );
 		</p> 
 	</form>
 
-	<form name="searchform" action="wpmu-blogs.php" method="get">
+	<form name="searchform" action="ms-blogs.php" method="get">
 		<p>
 			<input type="hidden" name="action" value="blogs" />
 			<input type="text" name="s" value="" size="17" />
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index 08babdd8d7..983f995139 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -24,7 +24,7 @@ switch( $_GET['action'] ) {
 	case "siteoptions":
 		check_admin_referer('siteoptions');
 		if( empty( $_POST ) )
-			wp_die( __("You probably need to go back to the <a href='wpmu-options.php'>options page</a>") );
+			wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") );
 
 		update_site_option( "WPLANG", $_POST['WPLANG'] );
 
@@ -127,7 +127,7 @@ switch( $_GET['action'] ) {
 		// Update more options here
 		do_action( 'update_wpmu_options' );
 
-		wp_redirect( add_query_arg( "updated", "true", 'wpmu-options.php' ) );
+		wp_redirect( add_query_arg( "updated", "true", 'ms-options.php' ) );
 		exit();
 	break;
 	case "addblog":
@@ -186,7 +186,7 @@ switch( $_GET['action'] ) {
 	case "updateblog":
 		check_admin_referer('editblog');
 		if( empty( $_POST ) )
-			wp_die( __('You probably need to go back to the <a href="wpmu-blogs.php">blogs page</a>') );
+			wp_die( __('You probably need to go back to the <a href="ms-blogs.php">blogs page</a>') );
 
 		// themes
 		if( is_array( $_POST[ 'theme' ] ) ) {
@@ -295,7 +295,7 @@ switch( $_GET['action'] ) {
 		}
 		do_action( 'wpmu_update_blog_options' );
 		restore_current_blog();
-		wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id );
+		wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id );
 	break;
 
 	case "deleteblog":
@@ -467,7 +467,7 @@ switch( $_GET['action'] ) {
 				foreach( $_POST[ 'user' ] as $id )
 					wpmu_delete_user( $id );
 
-			wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'wpmu-users.php' ) );
+			wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'ms-users.php' ) );
 		} else {
 			foreach ( (array) $_POST['allusers'] as $key => $val ) {
 				if( $val == '' || $val == '0' ) {
@@ -533,7 +533,7 @@ switch( $_GET['action'] ) {
 	break;
 
 	default:
-		wpmu_admin_do_redirect( "wpmu-admin.php" );
+		wpmu_admin_do_redirect( "ms-admin.php" );
 	break;
 }
 ?>
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index 2aa1f48ee1..76279a7640 100644
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -5,7 +5,7 @@ if ( !is_multisite() )
 	wp_die( __('Multisite support is not enabled.') );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options');
-$parent_file = 'wpmu-admin.php';
+$parent_file = 'ms-admin.php';
 
 include('admin-header.php');
 
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 4607ceaeeb..8fbffc94af 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -5,7 +5,7 @@ if ( !is_multisite() )
 	wp_die( __('Multisite support is not enabled.') );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
-$parent_file = 'wpmu-admin.php';
+$parent_file = 'ms-admin.php';
 
 wp_enqueue_script( 'admin-forms' );
 
@@ -369,7 +369,7 @@ switch( $_GET['action'] ) {
 		<div class="wrap" style="position:relative;">
 		<h2><?php _e('Blogs') ?></h2>
 
-		<form action="wpmu-blogs.php" method="get" id="wpmu-search">
+		<form action="ms-blogs.php" method="get" id="ms-search">
 			<input type="hidden" name="action" value="blogs" />
 			<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( esc_attr( $s, 1 ) ); ?>" size="17" />
 			<input type="submit" class="button" name="blog_name" value="<?php esc_attr_e('Search blogs by name') ?>" />
@@ -394,7 +394,7 @@ switch( $_GET['action'] ) {
 		<br class="clear" />
 
 		<?php if( isset($_GET['s']) && !empty($_GET['s']) ) : ?>
-			<p><a href="wpmu-users.php?action=users&s=<?php echo urlencode( stripslashes( $s ) ) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes( $s ); ?></strong></a></p>
+			<p><a href="ms-users.php?action=users&s=<?php echo urlencode( stripslashes( $s ) ) ?>"><?php _e('Search Users:') ?> <strong><?php echo stripslashes( $s ); ?></strong></a></p>
 		<?php endif; ?>
 
 		<?php
@@ -426,7 +426,7 @@ switch( $_GET['action'] ) {
 				<tr>
 				<th scope="col" class="check-column"></th>
 				<?php foreach($posts_columns as $column_id => $column_display_name) {
-					$column_link = "<a href='wpmu-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
+					$column_link = "<a href='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
 					if( $_GET['sortby'] == $column_id ) { 
 						$column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
 					}
@@ -470,11 +470,11 @@ switch( $_GET['action'] ) {
  
 							case 'blogname': ?>
 								<td valign="top">
-									<a href="wpmu-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
+									<a href="ms-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
 									<br/>
 									<?php
 									$controlActions	= array();
-									$controlActions[]	= '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
+									$controlActions[]	= '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
 									$controlActions[]	= "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
 									
 									if( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php
index 750c6b5995..4ecf1c7f83 100644
--- a/wp-admin/ms-upgrade-site.php
+++ b/wp-admin/ms-upgrade-site.php
@@ -7,7 +7,7 @@ if ( !is_multisite() )
 require_once( ABSPATH . WPINC . '/http.php' );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site');
-$parent_file = 'wpmu-admin.php';
+$parent_file = 'ms-admin.php';
 require_once('admin-header.php');
 
 if ( is_site_admin() == false ) {
@@ -41,11 +41,11 @@ switch( $_GET['action'] ) {
 				}
 			}
 			echo "</ul>";
-			?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="wpmu-upgrade-site.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Blogs"); ?></a></p>
+			?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-site.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Blogs"); ?></a></p>
 			<script type='text/javascript'>
 			<!--
 			function nextpage() {
-				location.href = "wpmu-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>";
+				location.href = "ms-upgrade-site.php?action=upgrade&n=<?php echo ($n + 5) ?>";
 			}
 			setTimeout( "nextpage()", 250 );
 			//-->
@@ -56,7 +56,7 @@ switch( $_GET['action'] ) {
 	break;
 	default: 
 		?><p><?php _e("You can upgrade all the blogs on your site through this page. It works by calling the upgrade script of each blog automatically. Hit the link below to upgrade."); ?></p>
-		<p><a class="button" href="wpmu-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php
+		<p><a class="button" href="ms-upgrade-site.php?action=upgrade"><?php _e("Upgrade Site"); ?></a></p><?php
 		do_action( 'wpmu_upgrade_page' );
 	break;
 }
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index 17b6d754ab..355b136484 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -5,7 +5,7 @@ if ( !is_multisite() )
 	wp_die( __('Multisite support is not enabled.') );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Users');
-$parent_file = 'wpmu-admin.php';
+$parent_file = 'ms-admin.php';
 
 wp_enqueue_script( 'admin-forms' );
 
@@ -103,7 +103,7 @@ if ( $_GET['updated'] == 'true' ) {
 	?>
 	<div class="wrap">
 	<h2><?php _e( $current_site->site_name ); ?> <?php _e("Users"); ?></h2>
-	<form action="wpmu-users.php" method="get" class="search-form">
+	<form action="ms-users.php" method="get" class="search-form">
 		<p class="search-box">
 		<input type="text" name="s" value="<?php if (isset($_GET['s'])) esc_attr( stripslashes( $s ) ); ?>" class="search-input" id="user-search-input" />
 		<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Search Users') ?>" class="button" />
@@ -125,7 +125,7 @@ if ( $_GET['updated'] == 'true' ) {
 		</div>
 
 		<?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
-			<p><a href="wpmu-blogs.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
+			<p><a href="ms-blogs.php?action=blogs&amp;s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>
 		<?php endif; ?>
 
 		<?php
@@ -149,7 +149,7 @@ if ( $_GET['updated'] == 'true' ) {
 					} elseif( $column_id == 'checkbox') {
 						echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
 					} else { ?>
-						<th scope="col"><a href="wpmu-users.php?sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
+						<th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if( $_GET['sortby'] == $column_id ) { if( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
 					<?php } ?>
 				<?php } ?>
 			</tr>
@@ -220,11 +220,11 @@ if ( $_GET['updated'] == 'true' ) {
 									if( is_array( $blogs ) ) {
 										foreach ( (array) $blogs as $key => $val ) {
 											$path	= ($val->path == '/') ? '' : $val->path;
-											echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
+											echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
 											echo ' <small class="row-actions">';
 											
 											// Edit
-											echo '<a href="wpmu-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
+											echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
 											
 											// View
 											echo '<a '; 
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index f4560f2190..0bf4b9a7b5 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1354,7 +1354,7 @@ function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
 	if( is_email($email) == false )
 		return false;
 	
-	$options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php");
+	$options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
 
 	switch_to_blog( $blog_id );
 	$blogname = get_option( 'blogname' );
@@ -1382,7 +1382,7 @@ function newuser_notify_siteadmin( $user_id ) {
 		return false;
 	$user = new WP_User($user_id);
 
-	$options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/wpmu-options.php");
+	$options_site_url = clean_url("http://{$current_site->domain}{$current_site->path}wp-admin/ms-options.php");
 	$msg = sprintf(__("New User: %1s
 Remote IP: %2s
 
diff --git a/wp-signup.php b/wp-signup.php
index 788ca39b66..519aee80cb 100755
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -375,7 +375,7 @@ if( !$active_signup )
 $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
 
 if( is_site_admin() )
-	echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . '</div>';
+	echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;