diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 38f7dd97d7..5dfd33bdd8 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_Terms_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Terms');
 
 	$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_Comments_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Comments');
 	$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_Post_Comments_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Post_Comments');
 
 	$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_Comments_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Comments');
 	$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_Comments_List_Table' : 'WP_Post_Comments_List_Table' );
+	$wp_list_table = get_list_table( $checkbox ? 'WP_List_Table_Comments' : 'WP_List_Table_Post_Comments' );
 
 	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_Users_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Users');
 
 	$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_Posts_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Posts');
 
 	$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_Terms_List_Table');
+	$wp_list_table = get_list_table('WP_List_Table_Terms');
 
 	$wp_list_table->check_permissions('edit');
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 7805a3da6a..892c16a72b 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_Comments_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Comments');
 $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 c685452b97..80a6e597ee 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_Terms_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Terms');
 $wp_list_table->check_permissions();
 
 $title = $tax->labels->name;
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index dae0333465..1d99f7479a 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_Posts_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Posts');
 $wp_list_table->check_permissions();
 
 // Back-compat for viewing comments of an entry
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 752ccb1fb9..c933571803 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_Links_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Links');
 $wp_list_table->check_permissions();
 
 // Handle bulk deletes
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 3805d2347d..a116889f1f 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_MS_Sites_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_MS_Sites');
 $wp_list_table->check_permissions();
 
 $title = __( 'Sites' );
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index db96add706..5a8edc9b05 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_MS_Themes_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_MS_Themes');
 $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 db49a92590..5c8fb0565e 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_MS_Users_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_MS_Users');
 $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 f4fd7f2b86..04b4057631 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_Plugin_Install_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Plugin_Install');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index e4b48b0e2d..13707e3aae 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_Plugins_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Plugins');
 $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 7100bd9a98..6e12a76cdc 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_Theme_Install_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Theme_Install');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 80d969c47a..bb6250492e 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_Themes_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Themes');
 $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 9f45bc6f54..45658a0e2f 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_Media_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Media');
 $wp_list_table->check_permissions();
 
 // Handle bulk actions
diff --git a/wp-admin/users.php b/wp-admin/users.php
index fbaa7201ff..7be2a72877 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_Users_List_Table');
+$wp_list_table = get_list_table('WP_List_Table_Users');
 $wp_list_table->check_permissions();
 
 $title = __('Users');