diff --git a/css/blocks.css b/css/blocks.css
index 554ddd3fe..a03cef640 100644
--- a/css/blocks.css
+++ b/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/css/editor-blocks.css b/css/editor-blocks.css
index 142127bc7..99be72d4d 100644
--- a/css/editor-blocks.css
+++ b/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/functions.php b/functions.php
index 9fedeecd5..c76d661e6 100644
--- a/functions.php
+++ b/functions.php
@@ -209,7 +209,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
  */