diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 9f09b1c5d2..3306c9125b 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -22,7 +22,7 @@ if ( ! defined( 'WP_ADMIN' ) ) {
  * @global string    $update_title
  * @global int       $total_update_count
  * @global string    $parent_file
- * @global string    $typenow
+ * @global string    $typenow            The post type of the current screen.
  */
 global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
 	$update_title, $total_update_count, $parent_file, $typenow;
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index e48b6959e7..40154857a1 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -124,7 +124,7 @@ wp_enqueue_script( 'common' );
  * @global array  $wp_importers
  * @global string $hook_suffix
  * @global string $plugin_page
- * @global string $typenow
+ * @global string $typenow      The post type of the current screen.
  * @global string $taxnow
  */
 global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow;
diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
index fdc9c2a05f..0760e436b7 100644
--- a/wp-admin/includes/class-wp-screen.php
+++ b/wp-admin/includes/class-wp-screen.php
@@ -402,14 +402,15 @@ final class WP_Screen {
 	 * @since 3.3.0
 	 *
 	 * @global WP_Screen $current_screen WordPress current screen object.
+	 * @global string    $typenow        The post type of the current screen.
 	 * @global string    $taxnow
-	 * @global string    $typenow
 	 */
 	public function set_current_screen() {
 		global $current_screen, $taxnow, $typenow;
+
 		$current_screen = $this;
-		$taxnow         = $this->taxonomy;
 		$typenow        = $this->post_type;
+		$taxnow         = $this->taxonomy;
 
 		/**
 		 * Fires after the current screen has been set.
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 4473110a8f..22c5fb9b4d 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -1859,7 +1859,7 @@ function menu_page_url( $menu_slug, $echo = true ) {
  * @global array  $menu
  * @global array  $submenu
  * @global string $pagenow              The filename of the current screen.
- * @global string $typenow
+ * @global string $typenow              The post type of the current screen.
  * @global string $plugin_page
  * @global array  $_wp_real_parent_file
  * @global array  $_wp_menu_nopriv
@@ -1947,16 +1947,16 @@ function get_admin_page_parent( $parent = '' ) {
  * @since 1.5.0
  *
  * @global string $title
- * @global array $menu
- * @global array $submenu
+ * @global array  $menu
+ * @global array  $submenu
  * @global string $pagenow     The filename of the current screen.
+ * @global string $typenow     The post type of the current screen.
  * @global string $plugin_page
- * @global string $typenow
  *
  * @return string The title of the current admin page.
  */
 function get_admin_page_title() {
-	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
+	global $title, $menu, $submenu, $pagenow, $typenow, $plugin_page;
 
 	if ( ! empty( $title ) ) {
 		return $title;
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index db13845c97..691aa9547e 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -59,7 +59,7 @@ get_admin_page_parent();
  * @global string $parent_file
  * @global string $submenu_file
  * @global string $plugin_page
- * @global string $typenow
+ * @global string $typenow      The post type of the current screen.
  *
  * @param array $menu
  * @param array $submenu
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f6d5de6701..d1eb527787 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-53060';
+$wp_version = '6.0-alpha-53061';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.