diff --git a/wp-includes/post.php b/wp-includes/post.php
index 0312f6457e..c2b60a83e9 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -1292,7 +1292,7 @@ function register_post_type( $post_type, $args = array() ) {
 		}
 
 		if ( $args->hierarchical )
-			add_rewrite_tag( "%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=" );
+			add_rewrite_tag( "%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&pagename=" );
 		else
 			add_rewrite_tag( "%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=" );