diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 5dfd33bdd8..38f7dd97d7 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -518,7 +518,7 @@ case 'add-tag' :
 	if ( isset($_POST['screen']) )
 		set_current_screen($_POST['screen']);
 
-	$wp_list_table = get_list_table('WP_List_Table_Terms');
+	$wp_list_table = get_list_table('WP_Terms_List_Table');
 
 	$level = 0;
 	if ( is_taxonomy_hierarchical($taxonomy) ) {
@@ -582,7 +582,7 @@ case 'add-comment' :
 	if ( !current_user_can( 'edit_posts' ) )
 		die('-1');
 
-	$wp_list_table = get_list_table('WP_List_Table_Comments');
+	$wp_list_table = get_list_table('WP_Comments_List_Table');
 	$wp_list_table->from_ajax = true;
 
 	$wp_list_table->prepare_items();
@@ -611,7 +611,7 @@ case 'get-comments' :
 	if ( !current_user_can( 'edit_post', $post_ID ) )
 		die('-1');
 
-	$wp_list_table = get_list_table('WP_List_Table_Post_Comments');
+	$wp_list_table = get_list_table('WP_Post_Comments_List_Table');
 
 	$wp_list_table->prepare_items();
 
@@ -636,7 +636,7 @@ case 'get-comments' :
 case 'replyto-comment' :
 	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
 
-	$wp_list_table = get_list_table('WP_List_Table_Comments');
+	$wp_list_table = get_list_table('WP_Comments_List_Table');
 	$wp_list_table->checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
@@ -717,7 +717,7 @@ case 'edit-comment' :
 	$comments_status = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
 
 	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
-	$wp_list_table = get_list_table( $checkbox ? 'WP_List_Table_Comments' : 'WP_List_Table_Post_Comments' );
+	$wp_list_table = get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table' );
 
 	ob_start();
 		$wp_list_table->single_row( get_comment( $comment_id ) );
@@ -894,7 +894,7 @@ case 'add-user' :
 	}
 	$user_object = new WP_User( $user_id );
 
-	$wp_list_table = get_list_table('WP_List_Table_Users');
+	$wp_list_table = get_list_table('WP_Users_List_Table');
 
 	$x = new WP_Ajax_Response( array(
 		'what' => 'user',
@@ -1193,7 +1193,7 @@ case 'inline-save':
 	// update the post
 	edit_post();
 
-	$wp_list_table = get_list_table('WP_List_Table_Posts');
+	$wp_list_table = get_list_table('WP_Posts_List_Table');
 
 	$mode = $_POST['post_view'];
 	$wp_list_table->display_rows( array( get_post( $_POST['post_ID'] ) ) );
@@ -1203,7 +1203,7 @@ case 'inline-save':
 case 'inline-save-tax':
 	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
 
-	$wp_list_table = get_list_table('WP_List_Table_Terms');
+	$wp_list_table = get_list_table('WP_Terms_List_Table');
 
 	$wp_list_table->check_permissions('edit');
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 892c16a72b..7805a3da6a 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Comments');
+$wp_list_table = get_list_table('WP_Comments_List_Table');
 $wp_list_table->check_permissions();
 
 $doaction = $wp_list_table->current_action();
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 80a6e597ee..c685452b97 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Terms');
+$wp_list_table = get_list_table('WP_Terms_List_Table');
 $wp_list_table->check_permissions();
 
 $title = $tax->labels->name;
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 1d99f7479a..dae0333465 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
-$wp_list_table = get_list_table('WP_List_Table_Posts');
+$wp_list_table = get_list_table('WP_Posts_List_Table');
 $wp_list_table->check_permissions();
 
 // Back-compat for viewing comments of an entry
diff --git a/wp-admin/includes/class-wp-list-table-comments.php b/wp-admin/includes/class-wp-comments-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-comments.php
rename to wp-admin/includes/class-wp-comments-list-table.php
index 125b585011..ec7711d882 100644
--- a/wp-admin/includes/class-wp-list-table-comments.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -14,14 +14,14 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Comments extends WP_List_Table {
+class WP_Comments_List_Table extends WP_List_Table {
 
 	var $checkbox = true;
 	var $from_ajax = false;
 
 	var $pending_count = array();
 
-	function WP_List_Table_Comments() {
+	function WP_Comments_List_Table() {
 		global $mode;
 
 		$mode = ( empty( $_REQUEST['mode'] ) ) ? 'detail' : $_REQUEST['mode'];
@@ -502,7 +502,7 @@ class WP_List_Table_Comments extends WP_List_Table {
  *
  * @see WP_Comments_Table
  */
-class WP_List_Table_Post_Comments extends WP_List_Table_Comments {
+class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 
 	function get_columns() {
 		return array(
diff --git a/wp-admin/includes/class-wp-list-table-links.php b/wp-admin/includes/class-wp-links-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-links.php
rename to wp-admin/includes/class-wp-links-list-table.php
index d78d0e7abf..cfff1bffda 100644
--- a/wp-admin/includes/class-wp-list-table-links.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Links extends WP_List_Table {
+class WP_Links_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Links() {
+	function WP_Links_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'link-manager',
 			'plural' => 'bookmarks',
diff --git a/wp-admin/includes/class-wp-list-table-media.php b/wp-admin/includes/class-wp-media-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-media.php
rename to wp-admin/includes/class-wp-media-list-table.php
index b5bf2738a0..5b0b7f7d9b 100644
--- a/wp-admin/includes/class-wp-list-table-media.php
+++ b/wp-admin/includes/class-wp-media-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Media extends WP_List_Table {
+class WP_Media_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Media() {
+	function WP_Media_List_Table() {
 		global $detached;
 
 		$detached = isset( $_REQUEST['detached'] ) || isset( $_REQUEST['find_detached'] );
diff --git a/wp-admin/includes/class-wp-list-table-ms-sites.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-ms-sites.php
rename to wp-admin/includes/class-wp-ms-sites-list-table.php
index 28cf3b5326..6297501174 100644
--- a/wp-admin/includes/class-wp-list-table-ms-sites.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_MS_Sites extends WP_List_Table {
+class WP_MS_Sites_List_Table extends WP_List_Table {
 
-	function WP_List_Table_MS_Sites() {
+	function WP_MS_Sites_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'sites-network',
 			'plural' => 'sites',
diff --git a/wp-admin/includes/class-wp-list-table-ms-themes.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-ms-themes.php
rename to wp-admin/includes/class-wp-ms-themes-list-table.php
index e9aa1eb5eb..3b421e883e 100644
--- a/wp-admin/includes/class-wp-list-table-ms-themes.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_MS_Themes extends WP_List_Table {
+class WP_MS_Themes_List_Table extends WP_List_Table {
 
-	function WP_List_Table_MS_Themes() {
+	function WP_MS_Themes_List_Table() {
 		global $status, $page;
 
 		$default_status = get_user_option( 'themes_last_view' );
diff --git a/wp-admin/includes/class-wp-list-table-ms-users.php b/wp-admin/includes/class-wp-ms-users-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-ms-users.php
rename to wp-admin/includes/class-wp-ms-users-list-table.php
index 9d7ac02f97..45abc6541c 100644
--- a/wp-admin/includes/class-wp-list-table-ms-users.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_MS_Users extends WP_List_Table {
+class WP_MS_Users_List_Table extends WP_List_Table {
 
-	function WP_List_Table_MS_Users() {
+	function WP_MS_Users_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'users-network',
 		) );
diff --git a/wp-admin/includes/class-wp-list-table-plugin-install.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-plugin-install.php
rename to wp-admin/includes/class-wp-plugin-install-list-table.php
index 263ddd63f9..9ba365bcc9 100644
--- a/wp-admin/includes/class-wp-list-table-plugin-install.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Plugin_Install extends WP_List_Table {
+class WP_Plugin_Install_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Plugin_Install() {
+	function WP_Plugin_Install_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'plugin-install',
 		) );
diff --git a/wp-admin/includes/class-wp-list-table-plugins.php b/wp-admin/includes/class-wp-plugins-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-plugins.php
rename to wp-admin/includes/class-wp-plugins-list-table.php
index ad1f32cd81..c3b16a04a1 100644
--- a/wp-admin/includes/class-wp-list-table-plugins.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Plugins extends WP_List_Table {
+class WP_Plugins_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Plugins() {
+	function WP_Plugins_List_Table() {
 		global $status, $page;
 
 		$default_status = get_user_option( 'plugins_last_view' );
diff --git a/wp-admin/includes/class-wp-list-table-posts.php b/wp-admin/includes/class-wp-posts-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-posts.php
rename to wp-admin/includes/class-wp-posts-list-table.php
index 496b3a8b63..1c89534fc6 100644
--- a/wp-admin/includes/class-wp-list-table-posts.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -6,7 +6,7 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Posts extends WP_List_Table {
+class WP_Posts_List_Table extends WP_List_Table {
 
 	/**
 	 * Whether the items should be displayed hierarchically or linearly
@@ -44,7 +44,7 @@ class WP_List_Table_Posts extends WP_List_Table {
 	 */
 	var $sticky_posts_count = 0;
 
-	function WP_List_Table_Posts() {
+	function WP_Posts_List_Table() {
 		global $post_type_object, $post_type, $current_screen, $wpdb;
 
 		if ( !isset( $_REQUEST['post_type'] ) )
diff --git a/wp-admin/includes/class-wp-list-table-terms.php b/wp-admin/includes/class-wp-terms-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-terms.php
rename to wp-admin/includes/class-wp-terms-list-table.php
index b909524a7c..d355491bc7 100644
--- a/wp-admin/includes/class-wp-list-table-terms.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -6,11 +6,11 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Terms extends WP_List_Table {
+class WP_Terms_List_Table extends WP_List_Table {
 
 	var $callback_args;
 
-	function WP_List_Table_Terms() {
+	function WP_Terms_List_Table() {
 		global $post_type, $taxonomy, $tax, $current_screen;
 
 		wp_reset_vars( array( 'action', 'taxonomy', 'post_type' ) );
diff --git a/wp-admin/includes/class-wp-list-table-theme-install.php b/wp-admin/includes/class-wp-theme-install-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-theme-install.php
rename to wp-admin/includes/class-wp-theme-install-list-table.php
index 25371607f1..a034552b17 100644
--- a/wp-admin/includes/class-wp-list-table-theme-install.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Theme_Install extends WP_List_Table {
+class WP_Theme_Install_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Theme_Install() {
+	function WP_Theme_Install_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'theme-install',
 		) );
diff --git a/wp-admin/includes/class-wp-list-table-themes.php b/wp-admin/includes/class-wp-themes-list-table.php
similarity index 98%
rename from wp-admin/includes/class-wp-list-table-themes.php
rename to wp-admin/includes/class-wp-themes-list-table.php
index b375449683..c39df5aa67 100644
--- a/wp-admin/includes/class-wp-list-table-themes.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -6,12 +6,12 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Themes extends WP_List_Table {
+class WP_Themes_List_Table extends WP_List_Table {
 
 	var $search = array();
 	var $features = array();
 
-	function WP_List_Table_Themes() {
+	function WP_Themes_List_Table() {
 		parent::__construct( array(
 			'screen' => 'themes',
 		) );
diff --git a/wp-admin/includes/class-wp-list-table-users.php b/wp-admin/includes/class-wp-users-list-table.php
similarity index 99%
rename from wp-admin/includes/class-wp-list-table-users.php
rename to wp-admin/includes/class-wp-users-list-table.php
index 6877ad042a..f2a80dd04f 100644
--- a/wp-admin/includes/class-wp-list-table-users.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -6,9 +6,9 @@
  * @subpackage List_Table
  * @since 3.1.0
  */
-class WP_List_Table_Users extends WP_List_Table {
+class WP_Users_List_Table extends WP_List_Table {
 
-	function WP_List_Table_Users() {
+	function WP_Users_List_Table() {
 		parent::WP_List_Table( array(
 			'screen' => 'users',
 			'plural' => 'users'
diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index 14fcaeab09..bde883c304 100644
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -38,25 +38,25 @@ function get_list_table( $class ) {
 function require_list_table( $class ) {
 	$core_classes = array(
 		//Site Admin
-		'WP_List_Table_Posts' => 'posts',
-		'WP_List_Table_Media' => 'media',
-		'WP_List_Table_Terms' => 'terms',
-		'WP_List_Table_Users' => 'users',
-		'WP_List_Table_Comments' => 'comments',
-		'WP_List_Table_Post_Comments' => 'comments',
-		'WP_List_Table_Links' => 'links',
-		'WP_List_Table_Plugin_Install' => 'plugin-install',
-		'WP_List_Table_Themes' => 'themes',
-		'WP_List_Table_Theme_Install' => 'theme-install',
-		'WP_List_Table_Plugins' => 'plugins',
+		'WP_Posts_List_Table' => 'posts',
+		'WP_Media_List_Table' => 'media',
+		'WP_Terms_List_Table' => 'terms',
+		'WP_Users_List_Table' => 'users',
+		'WP_Comments_List_Table' => 'comments',
+		'WP_Post_Comments_List_Table' => 'comments',
+		'WP_Links_List_Table' => 'links',
+		'WP_Plugin_Install_List_Table' => 'plugin-install',
+		'WP_Themes_List_Table' => 'themes',
+		'WP_Theme_Install_List_Table' => 'theme-install',
+		'WP_Plugins_List_Table' => 'plugins',
 		// Network Admin
-		'WP_List_Table_MS_Sites' => 'ms-sites',
-		'WP_List_Table_MS_Users' => 'ms-users',
-		'WP_List_Table_MS_Themes' => 'ms-themes',
+		'WP_MS_Sites_List_Table' => 'ms-sites',
+		'WP_MS_Users_List_Table' => 'ms-users',
+		'WP_MS_Themes_List_Table' => 'ms-themes',
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		require_once( ABSPATH . '/wp-admin/includes/class-wp-list-table-' . $core_classes[ $class ] . '.php' );
+		require_once( ABSPATH . '/wp-admin/includes/class-wp-' . $core_classes[ $class ] . '-list-table.php' );
 		return true;
 	}
 
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 8055981fbc..16224a0d00 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -488,7 +488,7 @@ function post_comment_meta_box($post) {
 
 	wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
 
-	$wp_list_table = get_list_table('WP_List_Table_Post_Comments');
+	$wp_list_table = get_list_table('WP_Post_Comments_List_Table');
 ?>
 
 <table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index c643e2736c..8a243334a7 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -329,7 +329,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 		return;
 	}
 
-	$wp_list_table = get_list_table('WP_List_Table_Comments');
+	$wp_list_table = get_list_table('WP_Comments_List_Table');
 
 	list ( $columns, $hidden ) = $wp_list_table->get_column_info();
 	$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index c933571803..752ccb1fb9 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -9,7 +9,7 @@
 /** Load WordPress Administration Bootstrap */
 require_once ('admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Links');
+$wp_list_table = get_list_table('WP_Links_List_Table');
 $wp_list_table->check_permissions();
 
 // Handle bulk deletes
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index a116889f1f..3805d2347d 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -12,7 +12,7 @@ require_once( './admin.php' );
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
-$wp_list_table = get_list_table('WP_List_Table_MS_Sites');
+$wp_list_table = get_list_table('WP_MS_Sites_List_Table');
 $wp_list_table->check_permissions();
 
 $title = __( 'Sites' );
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 5a8edc9b05..db96add706 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -9,7 +9,7 @@
 
 require_once( './admin.php' );
 
-$wp_list_table = get_list_table('WP_List_Table_MS_Themes');
+$wp_list_table = get_list_table('WP_MS_Themes_List_Table');
 $wp_list_table->check_permissions();
 
 $action = $wp_list_table->current_action();
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 5c8fb0565e..db49a92590 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -9,7 +9,7 @@
 
 require_once( './admin.php' );
 
-$wp_list_table = get_list_table('WP_List_Table_MS_Users');
+$wp_list_table = get_list_table('WP_MS_Users_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 04b4057631..f4fd7f2b86 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Plugin_Install');
+$wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 13707e3aae..e4b48b0e2d 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Plugins');
+$wp_list_table = get_list_table('WP_Plugins_List_Table');
 $wp_list_table->check_permissions();
 
 $action = $wp_list_table->current_action();
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 6e12a76cdc..7100bd9a98 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Theme_Install');
+$wp_list_table = get_list_table('WP_Theme_Install_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index bb6250492e..80d969c47a 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-$wp_list_table = get_list_table('WP_List_Table_Themes');
+$wp_list_table = get_list_table('WP_Themes_List_Table');
 $wp_list_table->check_permissions();
 
 if ( current_user_can('switch_themes') && isset($_GET['action']) ) {
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 45658a0e2f..9f45bc6f54 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
-$wp_list_table = get_list_table('WP_List_Table_Media');
+$wp_list_table = get_list_table('WP_Media_List_Table');
 $wp_list_table->check_permissions();
 
 // Handle bulk actions
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 7be2a72877..fbaa7201ff 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -9,7 +9,7 @@
 /** WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
-$wp_list_table = get_list_table('WP_List_Table_Users');
+$wp_list_table = get_list_table('WP_Users_List_Table');
 $wp_list_table->check_permissions();
 
 $title = __('Users');