diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3036e5cf70..97d21a2a00 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -63,7 +63,7 @@ function inline_edit_term_row($type, $taxonomy) {
 
 	<p class="inline-edit-save submit">
 		<a accesskey="c" href="#inline-edit" title="<?php _e('Cancel'); ?>" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></a>
-		<?php $update_text = ( 'post_tag' == $taxonomy ) ? __( 'Update Tag' ) : __( 'Update Category' ); ?>
+		<?php $update_text = sprintf( __('Update %s'), $tax->singular_label ); ?>
 		<a accesskey="s" href="#inline-edit" title="<?php echo esc_attr( $update_text ); ?>" class="save button-primary alignright"><?php echo $update_text; ?></a>
 		<img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
 		<span class="error" style="display:none;"></span>
diff --git a/wp-includes/post.php b/wp-includes/post.php
index b26d038186..50647f5a8d 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -674,11 +674,11 @@ function get_post_stati( $args = array(), $output = 'names', $operator = 'or' )
 function is_post_type_hierarchical( $post = false ) {
 	if ( is_string($post) && $is_post_type = get_post_type_object($post) )
 		return $is_post_type->hierarchical;
-	
+
 	$ptype = get_post( $post );
 	if ( $ptype && $is_post_type = get_post_type_object($ptype->post_type) )
 		return $is_post_type->hierarchical;
-		
+
 	return false;
 }