diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 8eed276a54..6d067ea36b 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -51,19 +51,15 @@ if ( ! is_user_logged_in() ) {
 if ( isset( $_GET['action'] ) ) :
 switch ( $action = $_GET['action'] ) :
 case 'fetch-list' :
-	require_once( ABSPATH . '/wp-admin/includes/default-list-tables.php' );
-	// Temp
-	require_once( ABSPATH . '/wp-admin/includes/list-table-posts.php' );
 
-	$class = $_GET['list_args']['class'];
+	$wp_list_table = get_list_table( $_GET['list_args']['class'] );
+	if ( ! $wp_list_table )
+		die( '0' );
 
-	if ( class_exists( $class ) ) {
-		$current_screen = (object) $_GET['list_args']['screen'];
-		$wp_list_table = new $class;
-		$wp_list_table->ajax_response();
-	}
+	$current_screen = (object) $_GET['list_args']['screen'];
+	$wp_list_table->ajax_response();
 
-	die('0');
+	die( '0' );
 	break;
 case 'ajax-tag-search' :
 	if ( !current_user_can( 'edit_posts' ) )
@@ -558,7 +554,7 @@ case 'add-tag' :
 	if ( isset($_POST['screen']) )
 		set_current_screen($_POST['screen']);
 
-	$wp_list_table = get_list_table('terms');
+	$wp_list_table = get_list_table('WP_Terms_Table');
 
 	$level = 0;
 	if ( is_taxonomy_hierarchical($taxonomy) ) {
@@ -622,7 +618,7 @@ case 'add-comment' :
 	if ( !current_user_can( 'edit_posts' ) )
 		die('-1');
 
-	$wp_list_table = get_list_table('comments');
+	$wp_list_table = get_list_table('WP_Comments_Table');
 	$wp_list_table->from_ajax = true;
 
 	$wp_list_table->prepare_items();
@@ -651,7 +647,7 @@ case 'get-comments' :
 	if ( !current_user_can( 'edit_post', $post_ID ) )
 		die('-1');
 
-	$wp_list_table = get_list_table('post-comments');
+	$wp_list_table = get_list_table('WP_Post_Comments_Table');
 
 	$wp_list_table->prepare_items();
 
@@ -676,7 +672,7 @@ case 'get-comments' :
 case 'replyto-comment' :
 	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
 
-	$wp_list_table = get_list_table('comments');
+	$wp_list_table = get_list_table('WP_Comments_Table');
 	$wp_list_table->checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
 
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
@@ -757,7 +753,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 ? 'comments' : 'post-comments' );
+	$wp_list_table = get_list_table( $checkbox ? 'WP_Comments_Table' : 'WP_Post_Comments_Table' );
 
 	ob_start();
 		$wp_list_table->single_row( get_comment( $comment_id ) );
@@ -905,7 +901,7 @@ case 'add-user' :
 	}
 	$user_object = new WP_User( $user_id );
 
-	$wp_list_table = get_list_table('users');
+	$wp_list_table = get_list_table('WP_Users_Table');
 
 	$x = new WP_Ajax_Response( array(
 		'what' => 'user',
@@ -1204,7 +1200,7 @@ case 'inline-save':
 	// update the post
 	edit_post();
 
-	$wp_list_table = get_list_table('posts');
+	$wp_list_table = get_list_table('WP_Posts_Table');
 
 	$mode = $_POST['post_view'];
 	$wp_list_table->display_rows( array( get_post( $_POST['post_ID'] ) ) );
@@ -1214,7 +1210,7 @@ case 'inline-save':
 case 'inline-save-tax':
 	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
 
-	$wp_list_table = get_list_table('terms');
+	$wp_list_table = get_list_table('WP_Terms_Table');
 
 	$wp_list_table->check_permissions('edit');
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 68abda1f32..fee37b57d4 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('comments');
+$wp_list_table = get_list_table('WP_Comments_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 d240f89168..e0a20fe6c3 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('terms');
+$wp_list_table = get_list_table('WP_Terms_Table');
 $wp_list_table->check_permissions();
 
 $title = $tax->labels->name;
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index fdf92fa76c..659bdafcd8 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('posts');
+$wp_list_table = get_list_table('WP_Posts_Table');
 $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 84ed71f084..ba2489c7ab 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('links');
+$wp_list_table = get_list_table('WP_Links_Table');
 $wp_list_table->check_permissions();
 
 // Handle bulk deletes
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 1ff71c14b1..b838e89574 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('sites');
+$wp_list_table = get_list_table('WP_Sites_Table');
 $wp_list_table->check_permissions();
 
 $title = __( 'Sites' );
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 74e505fff2..fa9f5ad720 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('ms-users');
+$wp_list_table = get_list_table('WP_MS_Users_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 c3dbc5a714..f7b70777cd 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('plugin-install');
+$wp_list_table = get_list_table('WP_Plugin_Install_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 85d506a78b..c7a645442e 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('plugins');
+$wp_list_table = get_list_table('WP_Plugins_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 ac2e0d1124..755e00f6b1 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('theme-install');
+$wp_list_table = get_list_table('WP_Theme_Install_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
 
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 0462029237..f0c34654da 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('themes');
+$wp_list_table = get_list_table('WP_Themes_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 66b9f6f16b..2d9184b6c0 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('media');
+$wp_list_table = get_list_table('WP_Media_Table');
 $wp_list_table->check_permissions();
 
 // Handle bulk actions
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 15816bac8e..215f8a9342 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -12,7 +12,7 @@ require_once( './admin.php' );
 /** WordPress Registration API */
 require_once( ABSPATH . WPINC . '/registration.php');
 
-$wp_list_table = get_list_table('users');
+$wp_list_table = get_list_table('WP_Users_Table');
 $wp_list_table->check_permissions();
 
 $title = __('Users');