diff --git a/wp-content/themes/twentyeleven/blocks.css b/wp-content/themes/twentyeleven/blocks.css
index a0071b0709..e29ddf9ca5 100644
--- a/wp-content/themes/twentyeleven/blocks.css
+++ b/wp-content/themes/twentyeleven/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Eleven
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyeleven/editor-blocks.css b/wp-content/themes/twentyeleven/editor-blocks.css
index b5c6503f23..b9dd850704 100644
--- a/wp-content/themes/twentyeleven/editor-blocks.css
+++ b/wp-content/themes/twentyeleven/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Eleven
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 069f19bf5d..7a0ced08e8 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -287,7 +287,7 @@ function twentyeleven_scripts_styles() {
 add_action( 'wp_enqueue_scripts', 'twentyeleven_scripts_styles' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Eleven 2.9
  */
diff --git a/wp-content/themes/twentyfifteen/css/blocks.css b/wp-content/themes/twentyfifteen/css/blocks.css
index 9c822769ca..82563902c2 100644
--- a/wp-content/themes/twentyfifteen/css/blocks.css
+++ b/wp-content/themes/twentyfifteen/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Fifteen
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyfifteen/css/editor-blocks.css b/wp-content/themes/twentyfifteen/css/editor-blocks.css
index dd8a6f9045..6076cab6bf 100644
--- a/wp-content/themes/twentyfifteen/css/editor-blocks.css
+++ b/wp-content/themes/twentyfifteen/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Fifteen
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index 1acb26c3ee..168bedd985 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -362,7 +362,7 @@ function twentyfifteen_scripts() {
 add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Fifteen 2.1
  */
diff --git a/wp-content/themes/twentyfourteen/css/blocks.css b/wp-content/themes/twentyfourteen/css/blocks.css
index e3c5360f59..425c8dbc21 100644
--- a/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/wp-content/themes/twentyfourteen/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Fourteen
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyfourteen/css/editor-blocks.css b/wp-content/themes/twentyfourteen/css/editor-blocks.css
index c54bece49d..e8fba39546 100644
--- a/wp-content/themes/twentyfourteen/css/editor-blocks.css
+++ b/wp-content/themes/twentyfourteen/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Fourteen
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
index d147558e9d..3babfeb157 100644
--- a/wp-content/themes/twentyfourteen/functions.php
+++ b/wp-content/themes/twentyfourteen/functions.php
@@ -349,7 +349,7 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
 add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Fourteen 2.3
  */
diff --git a/wp-content/themes/twentyseventeen/assets/css/blocks.css b/wp-content/themes/twentyseventeen/assets/css/blocks.css
index c71f1d1e49..d85a17483e 100644
--- a/wp-content/themes/twentyseventeen/assets/css/blocks.css
+++ b/wp-content/themes/twentyseventeen/assets/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Seventeen
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
index 46a4293754..b8b66a68af 100644
--- a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
+++ b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Seventeen
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
@@ -358,12 +358,6 @@ html[lang="th"] .edit-post-visual-editor * {
 	max-width: 674px; /* Based on one-column post width; 644px + 30px to account for padding. */
 }
 
-/* Background color */
-
-.gutenberg-editor-page .editor-block-list__block {
-	background-color: transparent;
-}
-
 /* Alignments */
 
 .edit-post-visual-editor .alignleft {
diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
index 524e4e43f5..ebd65c0f9a 100644
--- a/wp-content/themes/twentyseventeen/functions.php
+++ b/wp-content/themes/twentyseventeen/functions.php
@@ -472,7 +472,7 @@ function twentyseventeen_scripts() {
 add_action( 'wp_enqueue_scripts', 'twentyseventeen_scripts' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Seventeen 1.8
  */
diff --git a/wp-content/themes/twentysixteen/css/blocks.css b/wp-content/themes/twentysixteen/css/blocks.css
index 2013cc8019..ae7422416e 100644
--- a/wp-content/themes/twentysixteen/css/blocks.css
+++ b/wp-content/themes/twentysixteen/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Sixteen
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentysixteen/css/editor-blocks.css b/wp-content/themes/twentysixteen/css/editor-blocks.css
index 47ad227497..802353bfe7 100644
--- a/wp-content/themes/twentysixteen/css/editor-blocks.css
+++ b/wp-content/themes/twentysixteen/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Sixteen
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
index ef8ef088db..1bade4caa0 100644
--- a/wp-content/themes/twentysixteen/functions.php
+++ b/wp-content/themes/twentysixteen/functions.php
@@ -364,7 +364,7 @@ function twentysixteen_scripts() {
 add_action( 'wp_enqueue_scripts', 'twentysixteen_scripts' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Sixteen 1.6
  */
diff --git a/wp-content/themes/twentyten/blocks.css b/wp-content/themes/twentyten/blocks.css
index 25d08e9e1a..6bcc3e8ad3 100644
--- a/wp-content/themes/twentyten/blocks.css
+++ b/wp-content/themes/twentyten/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Ten
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyten/editor-blocks.css b/wp-content/themes/twentyten/editor-blocks.css
index ac79590d42..f4d8e328e7 100644
--- a/wp-content/themes/twentyten/editor-blocks.css
+++ b/wp-content/themes/twentyten/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Ten
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index eea6777bb0..2cb561e124 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -660,7 +660,7 @@ function twentyten_scripts_styles() {
 add_action( 'wp_enqueue_scripts', 'twentyten_scripts_styles' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Ten 2.6
  */
diff --git a/wp-content/themes/twentythirteen/css/blocks.css b/wp-content/themes/twentythirteen/css/blocks.css
index 2a28840ecb..bae2a185e2 100644
--- a/wp-content/themes/twentythirteen/css/blocks.css
+++ b/wp-content/themes/twentythirteen/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Thirteen
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentythirteen/css/editor-blocks.css b/wp-content/themes/twentythirteen/css/editor-blocks.css
index 768ae53c2d..d536ed4986 100644
--- a/wp-content/themes/twentythirteen/css/editor-blocks.css
+++ b/wp-content/themes/twentythirteen/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Thirteen
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index e52bbb67bb..a9861bea07 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -290,7 +290,7 @@ function twentythirteen_resource_hints( $urls, $relation_type ) {
 add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Thirteen 2.5
  */
diff --git a/wp-content/themes/twentytwelve/css/blocks.css b/wp-content/themes/twentytwelve/css/blocks.css
index 554ddd3fe3..a03cef640c 100644
--- a/wp-content/themes/twentytwelve/css/blocks.css
+++ b/wp-content/themes/twentytwelve/css/blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Twelve
-Description: Used to style Gutenberg Blocks.
+Description: Used to style blocks.
 */
 
 /*--------------------------------------------------------------
diff --git a/wp-content/themes/twentytwelve/css/editor-blocks.css b/wp-content/themes/twentytwelve/css/editor-blocks.css
index 142127bc72..99be72d4d5 100644
--- a/wp-content/themes/twentytwelve/css/editor-blocks.css
+++ b/wp-content/themes/twentytwelve/css/editor-blocks.css
@@ -1,6 +1,6 @@
 /*
 Theme Name: Twenty Twelve
-Description: Used to style Gutenberg Blocks in the editor.
+Description: Used to style blocks in the editor.
 */
 
 /*--------------------------------------------------------------
@@ -394,13 +394,13 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Archives */
 
-.gutenberg ul.wp-block-archives {
+.editor-block-list__block ul.wp-block-archives {
 	padding-left: 0;
 }
 
 /* Categories */
 
-.gutenberg .wp-block-categories ul {
+.editor-block-list__block .wp-block-categories ul {
 	padding-left: 0;
 }
 
@@ -448,7 +448,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Latest Posts */
 
-.gutenberg .wp-block-latest-posts {
+.editor-block-list__block .wp-block-latest-posts {
 	padding-left: 0;
 	padding-right: 0;
 }
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index 8df145ab82..39e887028b 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -199,7 +199,7 @@ function twentytwelve_scripts_styles() {
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
 
 /**
- * Enqueue editor styles for Gutenberg
+ * Enqueue styles for the block-based editor.
  *
  * @since Twenty Twelve 2.6
  */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3b7cbbbfdc..3c4d4ef87c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0.2-alpha-44212';
+$wp_version = '5.0.2-alpha-44213';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.