diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index 95b8301..5c30b07 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -8,7 +8,6 @@
  * @access private
  */
 class WP_Posts_List_Table extends WP_List_Table {
-
 	/**
 	 * Whether the items should be displayed hierarchically or linearly
 	 *
@@ -86,7 +85,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	function prepare_items() {
-		global $post_type_object, $post_type, $avail_post_stati, $wp_query, $per_page, $mode;
+		global $post_type_object, $avail_post_stati, $wp_query, $per_page, $mode;
 
 		$avail_post_stati = wp_edit_posts_query();
 
@@ -94,8 +93,8 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
 
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+		$per_page = $this->get_items_per_page( 'edit_' . $post_type_object->name . '_per_page' );
+		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type_object->name );
 
 		if ( $this->hierarchical_display )
 			$total_pages = ceil( $total_items / $per_page );
@@ -127,7 +126,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	function get_views() {
-		global $post_type, $post_type_object, $locked_post_status, $avail_post_stati;
+		global $post_type_object, $locked_post_status, $avail_post_stati;
+
+		$post_type = $post_type_object->name;
 
 		if ( !empty($locked_post_status) )
 			return array();
@@ -202,7 +203,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	function extra_tablenav( $which ) {
-		global $post_type, $post_type_object, $cat;
+		global $post_type_object, $cat;
+
+		$post_type = $post_type_object->name;
+
 ?>
 		<div class="alignleft actions">
 <?php
@@ -857,7 +861,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 	<?php
 			endif; // hierarchical
-	
+
 			if ( !$bulk ) : ?>
 
 			<label>