diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index a783fb3f1..17a45c0fb 100644
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -32,7 +32,7 @@ $title = __( 'Site Admin' );
 	<h2><?php echo wp_specialchars( $title ); ?></h2>
 
 	<ul class="subsubsub">
-	<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-sites.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' />
@@ -48,7 +48,7 @@ $title = __( 'Site Admin' );
 		</p>
 	</form>
 
-	<form name="searchform" action="ms-blogs.php" method="get">
+	<form name="searchform" action="ms-sites.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 22ba6a85d..043a5824d 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -185,7 +185,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="ms-blogs.php">blogs page</a>') );
+			wp_die( __('You probably need to go back to the <a href="ms-sites.php">sites page</a>') );
 
 		// themes
 		if( is_array( $_POST[ 'theme' ] ) ) {
@@ -294,7 +294,7 @@ switch( $_GET['action'] ) {
 		}
 		do_action( 'wpmu_update_blog_options' );
 		restore_current_blog();
-		wpmu_admin_do_redirect( "ms-blogs.php?action=editblog&updated=true&id=".$id );
+		wpmu_admin_do_redirect( "ms-sites.php?action=editblog&updated=true&id=".$id );
 	break;
 
 	case "deleteblog":
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 013123cb2..8f1826da3 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -145,7 +145,7 @@ switch( $_GET['action'] ) {
 			</div></div>
 
 			<div id="blogedit_blogoptions" class="postbox " >
-			<h3 class='hndle'><span><?php printf( __('Blog options (%s_options)'), $blog_prefix ); ?></span></h3>
+			<h3 class='hndle'><span><?php printf( __('Blog options (%soptions)'), $blog_prefix ); ?></span></h3>
 			<div class="inside">
 				<table class="form-table">
 							<?php
@@ -371,7 +371,7 @@ switch( $_GET['action'] ) {
 		<div class="wrap" style="position:relative;">
 		<h2><?php _e('Blogs') ?></h2>
 
-		<form action="ms-blogs.php" method="get" id="ms-search">
+		<form action="ms-sites.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') ?>" />
@@ -428,7 +428,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='ms-blogs.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
+					$column_link = "<a href='ms-sites.php?{$sortby_url}&amp;sortby={$column_id}&amp;";
 					if( $_GET['sortby'] == $column_id ) {
 						$column_link .= $_GET[ 'order' ] == 'DESC' ? 'order=ASC&amp;' : 'order=DESC&amp;';
 					}
@@ -472,11 +472,11 @@ switch( $_GET['action'] ) {
 
 							case 'blogname': ?>
 								<td valign="top">
-									<a href="ms-blogs.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
+									<a href="ms-sites.php?action=editblog&amp;id=<?php echo $blog['blog_id'] ?>" class="edit"><?php echo $blogname; ?></a>
 									<br/>
 									<?php
 									$controlActions	= array();
-									$controlActions[]	= '<a href="ms-blogs.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
+									$controlActions[]	= '<a href="ms-sites.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-users.php b/wp-admin/ms-users.php
index acc9a9bbe..4cf6b1207 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -124,7 +124,7 @@ if ( $_GET['updated'] == 'true' ) {
 		</div>
 
 		<?php if( isset($_GET['s']) && $_GET['s'] != '' ) : ?>
-			<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>
+			<p><a href="ms-sites.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
@@ -219,11 +219,11 @@ if ( $_GET['updated'] == 'true' ) {
 									if( is_array( $blogs ) ) {
 										foreach ( (array) $blogs as $key => $val ) {
 											$path	= ($val->path == '/') ? '' : $val->path;
-											echo '<a href="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
+											echo '<a href="ms-sites.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="ms-blogs.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
+											echo '<a href="ms-sites.php?action=editblog&amp;id=' . $val->userblog_id . '">' . __('Edit') . '</a> | ';
 
 											// View
 											echo '<a ';