diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index dff628d422..f126d3bc60 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -649,19 +649,19 @@ function add_dashboard_page( $page_title, $menu_title, $access_level, $file, $fu
 }
 
 function add_posts_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'posts-new.php', $page_title, $menu_title, $access_level, $file, $function );
+	return add_submenu_page( 'edit.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
 function add_media_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'media-new.php', $page_title, $menu_title, $access_level, $file, $function );
+	return add_submenu_page( 'upload.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
 function add_links_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'link-add.php', $page_title, $menu_title, $access_level, $file, $function );
+	return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
 function add_pages_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'page-new.php', $page_title, $menu_title, $access_level, $file, $function );
+	return add_submenu_page( 'edit-pages.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
 function add_comments_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 16208217a3..325abfc942 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -29,26 +29,24 @@ $menu[0] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top', 'menu-da
 
 $menu[4] = array( '', 'read', '', '', 'wp-menu-separator' );
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'post-new.php', '', 'wp-menu-open menu-top', 'menu-posts', 'div' );
-	$submenu['post-new.php'][5]  = array( _c('Add New|post'), 'edit_posts', 'post-new.php' );
-	//$submenu['post-new.php'][10]  = array( __('Drafts'), 'edit_posts', 'edit-post-drafts.php' );
-	$submenu['post-new.php'][15]  = array( __('Edit'), 'edit_posts', 'edit.php' );
-	$submenu['post-new.php'][20] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
-	$submenu['post-new.php'][25] = array( __('Categories'), 'manage_categories', 'categories.php' );
+$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'wp-menu-open menu-top', 'menu-posts', 'div' );
+	$submenu['edit.php'][5]  = array( __('Edit'), 'edit_posts', 'edit.php' );
+	$submenu['edit.php'][10]  = array( _c('Add New|post'), 'edit_posts', 'post-new.php' );
+	$submenu['edit.php'][15] = array( __('Tags'), 'manage_categories', 'edit-tags.php' );
+	$submenu['edit.php'][20] = array( __('Categories'), 'manage_categories', 'categories.php' );
 
-$menu[10] = array( __('Media'), 'upload_files', 'media-new.php', '', 'menu-top', 'menu-media', 'div' );
-	$submenu['media-new.php'][5] = array( _c('Add New|file'), 'upload_files', 'media-new.php');
-	$submenu['media-new.php'][10] = array( __('Edit'), 'upload_files', 'upload.php');
+$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top', 'menu-media', 'div' );
+	$submenu['upload.php'][5] = array( __('Edit'), 'upload_files', 'upload.php');
+	$submenu['upload.php'][10] = array( _c('Add New|file'), 'upload_files', 'media-new.php');
 
-$menu[15] = array( __('Links'), 'manage_links', 'link-add.php', '', 'menu-top', 'menu-links', 'div' );
-	$submenu['link-add.php'][5] = array( _c('Add New|links'), 'manage_links', 'link-add.php' );
-	$submenu['link-add.php'][10] = array( __('Edit'), 'manage_links', 'link-manager.php' );
-	$submenu['link-add.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
+$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top', 'menu-links', 'div' );
+	$submenu['link-manager.php'][5] = array( __('Edit'), 'manage_links', 'link-manager.php' );
+	$submenu['link-manager.php'][10] = array( _c('Add New|links'), 'manage_links', 'link-add.php' );
+	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'page-new.php', '', 'menu-top', 'menu-pages', 'div' );
-	$submenu['page-new.php'][5] = array( _c('Add New|page'), 'edit_pages', 'page-new.php' );
-	//$submenu['page-new.php'][10] = array( __('Drafts'), 'edit_pages', 'edit-page-drafts.php' );
-	$submenu['page-new.php'][15] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
+$menu[20] = array( __('Pages'), 'edit_pages', 'edit-pages.php', '', 'menu-top', 'menu-pages', 'div' );
+	$submenu['edit-pages.php'][5] = array( __('Edit'), 'edit_pages', 'edit-pages.php' );
+	$submenu['edit-pages.php'][10] = array( _c('Add New|page'), 'edit_pages', 'page-new.php' );
 
 $menu[25] = array( sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top', 'menu-comments', 'div' );
 
@@ -105,9 +103,9 @@ $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '',
 $menu[55] = array( '', 'read', '', '', 'wp-menu-separator-last' );
 
 // Back-compat for old top-levels
-$_wp_real_parent_file['post.php'] = 'post-new.php'; 
-$_wp_real_parent_file['edit.php'] = 'post-new.php';
-$_wp_real_parent_file['edit-pages.php'] = 'page-new.php';
+$_wp_real_parent_file['post.php'] = 'edit.php'; 
+$_wp_real_parent_file['post-new.php'] = 'edit.php';
+$_wp_real_parent_file['page-new.php'] = 'edit-pages.php';
 
 do_action('_admin_menu');