Index: src/wp-includes/post.php
===================================================================
--- src/wp-includes/post.php	(revision 25175)
+++ src/wp-includes/post.php	(working copy)
@@ -1292,7 +1292,7 @@
 		}
 
 		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=" );