diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index abbfdc01cb..0aedbbc7b5 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -107,7 +107,7 @@ if ( post_type_supports($post_type, 'page-attributes') )
 	add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', $post_type, 'side', 'core');
 
 if ( current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports($post_type, 'thumbnail') )
-	add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
+	add_meta_box('postimagediv', sprintf( __('%s Thumbnail'), $post_type_object->singular_label ), 'post_thumbnail_meta_box', $post_type, 'side', 'low');
 
 if ( post_type_supports($post_type, 'excerpt') )
 	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $post_type, 'normal', 'core');
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 203e3453a6..2f3ec853df 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -262,9 +262,9 @@ endif;
 </ul>
 
 <p class="search-box">
-	<label class="screen-reader-text" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
+	<label class="screen-reader-text" for="post-search-input"><?php printf( __( 'Search %s' ), $post_type_object->label ); ?>:</label>
 	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
-	<input type="submit" value="<?php esc_attr_e( 'Search Posts' ); ?>" class="button" />
+	<input type="submit" value="<?php echo esc_attr( sprintf( __( 'Search %s' ), $post_type_object->label ) ); ?>" class="button" />
 </p>
 
 <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_GET['post_status']) ? esc_attr($_GET['post_status']) : 'all'; ?>" />
@@ -410,9 +410,9 @@ if ( $page_links )
 <div class="clear"></div>
 <p><?php
 if ( isset($_GET['post_status']) && 'trash' == $_GET['post_status'] )
-	_e( 'No posts found in the Trash.' );
+	printf( __( 'No %s found in the Trash.' ), $post_type_object->label );
 else
-	_e( 'No posts found.' );
+	printf( __( 'No %s found.' ), $post_type_object->label );
 ?></p>
 <?php } ?>