diff --git src/wp-includes/blocks/archives.php src/wp-includes/blocks/archives.php
index adcc61c233..012270eb7b 100644
--- src/wp-includes/blocks/archives.php
+++ src/wp-includes/blocks/archives.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/archives` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
@@ -30,7 +30,7 @@ function render_block_core_archives( $attributes ) {
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 
 		$dropdown_id = esc_attr( uniqid( 'wp-block-archives-' ) );
-		$title       = __( 'Archives', 'gutenberg' );
+		$title       = __( 'Archives' );
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
 		$dropdown_args = apply_filters(
@@ -48,19 +48,19 @@ function render_block_core_archives( $attributes ) {
 
 		switch ( $dropdown_args['type'] ) {
 			case 'yearly':
-				$label = __( 'Select Year', 'gutenberg' );
+				$label = __( 'Select Year' );
 				break;
 			case 'monthly':
-				$label = __( 'Select Month', 'gutenberg' );
+				$label = __( 'Select Month' );
 				break;
 			case 'daily':
-				$label = __( 'Select Day', 'gutenberg' );
+				$label = __( 'Select Day' );
 				break;
 			case 'weekly':
-				$label = __( 'Select Week', 'gutenberg' );
+				$label = __( 'Select Week' );
 				break;
 			default:
-				$label = __( 'Select Post', 'gutenberg' );
+				$label = __( 'Select Post' );
 				break;
 		}
 
@@ -97,7 +97,7 @@ function render_block_core_archives( $attributes ) {
 			$block_content = sprintf(
 				'<div class="%1$s">%2$s</div>',
 				$classnames,
-				__( 'No archives to show.', 'gutenberg' )
+				__( 'No archives to show.' )
 			);
 		} else {
 
diff --git src/wp-includes/blocks/block.php src/wp-includes/blocks/block.php
index bc33929ac5..77a281802c 100644
--- src/wp-includes/blocks/block.php
+++ src/wp-includes/blocks/block.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/block` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
diff --git src/wp-includes/blocks/categories.php src/wp-includes/blocks/categories.php
index bd1175733b..db621ab8e6 100644
--- src/wp-includes/blocks/categories.php
+++ src/wp-includes/blocks/categories.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/categories` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
@@ -32,7 +32,7 @@ function render_block_core_categories( $attributes ) {
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 		$id                       = 'wp-block-categories-' . $block_id;
 		$args['id']               = $id;
-		$args['show_option_none'] = __( 'Select Category', 'gutenberg' );
+		$args['show_option_none'] = __( 'Select Category' );
 		$wrapper_markup           = '<div class="%1$s">%2$s</div>';
 		$items_markup             = wp_dropdown_categories( $args );
 		$type                     = 'dropdown';
diff --git src/wp-includes/blocks/latest-comments.php src/wp-includes/blocks/latest-comments.php
index dd310028ce..39d90494e8 100644
--- src/wp-includes/blocks/latest-comments.php
+++ src/wp-includes/blocks/latest-comments.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/latest-comments` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
@@ -28,7 +28,7 @@
 function gutenberg_draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
 	if ( empty( $title ) ) {
-		$title = __( '(no title)', 'gutenberg' );
+		$title = __( '(no title)' );
 	}
 	return esc_html( $title );
 }
@@ -96,7 +96,7 @@ function gutenberg_render_block_core_latest_comments( $attributes = array() ) {
 
 			$list_items_markup .= sprintf(
 				/* translators: 1: author name (inside <a> or <span> tag, based on if they have a URL), 2: post title related to this comment */
-				__( '%1$s on %2$s', 'gutenberg' ),
+				__( '%1$s on %2$s' ),
 				$author_markup,
 				$post_title
 			);
@@ -141,7 +141,7 @@ function gutenberg_render_block_core_latest_comments( $attributes = array() ) {
 	) : sprintf(
 		'<div class="%1$s">%2$s</div>',
 		$classnames,
-		__( 'No comments to show.', 'gutenberg' )
+		__( 'No comments to show.' )
 	);
 
 	return $block_content;
diff --git src/wp-includes/blocks/latest-posts.php src/wp-includes/blocks/latest-posts.php
index 070abafeb4..2d9b3b6407 100644
--- src/wp-includes/blocks/latest-posts.php
+++ src/wp-includes/blocks/latest-posts.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/latest-posts` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**
@@ -30,7 +30,7 @@ function render_block_core_latest_posts( $attributes ) {
 
 		$title = get_the_title( $post_id );
 		if ( ! $title ) {
-			$title = __( '(Untitled)', 'gutenberg' );
+			$title = __( '(Untitled)' );
 		}
 		$list_items_markup .= sprintf(
 			'<li><a href="%1$s">%2$s</a>',
diff --git src/wp-includes/blocks/shortcode.php src/wp-includes/blocks/shortcode.php
index d18dd4f582..1c0761250d 100644
--- src/wp-includes/blocks/shortcode.php
+++ src/wp-includes/blocks/shortcode.php
@@ -2,7 +2,7 @@
 /**
  * Server-side rendering of the `core/shortcode` block.
  *
- * @package gutenberg
+ * @package WordPress
  */
 
 /**