diff --git a/blocks/library/gallery/editor.scss b/blocks/library/gallery/editor.scss
index 4a69cd818927c3..c6a8d2fa6933b7 100644
--- a/blocks/library/gallery/editor.scss
+++ b/blocks/library/gallery/editor.scss
@@ -11,14 +11,14 @@
 	}
 }
 
-.blocks-gallery-image__inline-menu {
+.blocks-gallery-item__inline-menu {
 	padding: 2px;
 	position: absolute;
 	top: 0;
 	right: 0;
 	background-color: $blue-medium-500;
 	display: inline-flex;
-	z-index: z-index( '.blocks-gallery-image__inline-menu' );
+	z-index: z-index( '.blocks-gallery-item__inline-menu' );
 
 	.components-button {
 		color: $white;
@@ -29,6 +29,6 @@
 	}
 }
 
-.blocks-gallery-image__remove {
+.blocks-gallery-item__remove {
 	padding: 0;
 }
diff --git a/blocks/library/gallery/gallery-image.js b/blocks/library/gallery/gallery-image.js
index a4316cfe1ec6c8..78b538c9d14e1e 100644
--- a/blocks/library/gallery/gallery-image.js
+++ b/blocks/library/gallery/gallery-image.js
@@ -45,11 +45,11 @@ class GalleryImage extends Component {
 		return (
 			<figure className={ className } onClick={ onClick }>
 				{ isSelected &&
-					<div className="blocks-gallery-image__inline-menu">
+					<div className="blocks-gallery-item__inline-menu">
 						<IconButton
 							icon="no-alt"
 							onClick={ onRemove }
-							className="blocks-gallery-image__remove"
+							className="blocks-gallery-item__remove"
 							label={ __( 'Remove Image' ) }
 						/>
 					</div>
diff --git a/blocks/library/gallery/index.js b/blocks/library/gallery/index.js
index 2235bb97cbe17d..63e4875d3fa945 100644
--- a/blocks/library/gallery/index.js
+++ b/blocks/library/gallery/index.js
@@ -33,7 +33,7 @@ registerBlockType( 'core/gallery', {
 			type: 'array',
 			default: [],
 			source: 'query',
-			selector: 'ul.wp-block-gallery .blocks-gallery-image img',
+			selector: 'ul.wp-block-gallery .blocks-gallery-item img',
 			query: {
 				url: {
 					source: 'attribute',
@@ -167,7 +167,7 @@ registerBlockType( 'core/gallery', {
 					const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } />;
 
 					return (
-						<li key={ image.id || image.url } className="blocks-gallery-image">
+						<li key={ image.id || image.url } className="blocks-gallery-item">
 							<figure>
 								{ href ? <a href={ href }>{ img }</a> : img }
 							</figure>
@@ -199,7 +199,7 @@ registerBlockType( 'core/gallery', {
 							const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } />;
 
 							return (
-								<li key={ image.id || image.url } className="blocks-gallery-image">
+								<li key={ image.id || image.url } className="blocks-gallery-item">
 									<figure>
 										{ href ? <a href={ href }>{ img }</a> : img }
 									</figure>
diff --git a/blocks/test/fixtures/core__gallery.html b/blocks/test/fixtures/core__gallery.html
index 04de21e2d9e31a..ec923b2a360432 100644
--- a/blocks/test/fixtures/core__gallery.html
+++ b/blocks/test/fixtures/core__gallery.html
@@ -1,11 +1,11 @@
 <!-- wp:core/gallery -->
 <ul class="wp-block-gallery alignnone columns-2 is-cropped">
-	<li class="blocks-gallery-image">
+	<li class="blocks-gallery-item">
 		<figure>
 			<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" />
 		</figure>
 	</li>
-	<li class="blocks-gallery-image">
+	<li class="blocks-gallery-item">
 		<figure>
 			<img src="http://google.com/hi.png" alt="title" />
 		</figure>
diff --git a/blocks/test/fixtures/core__gallery.serialized.html b/blocks/test/fixtures/core__gallery.serialized.html
index 1e5052940c3784..3d20c8641b1c89 100644
--- a/blocks/test/fixtures/core__gallery.serialized.html
+++ b/blocks/test/fixtures/core__gallery.serialized.html
@@ -1,11 +1,11 @@
 <!-- wp:gallery -->
 <ul class="wp-block-gallery alignnone columns-2 is-cropped">
-    <li class="blocks-gallery-image">
+    <li class="blocks-gallery-item">
 		<figure>
 			<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" />
 		</figure>
 	</li>
-    <li class="blocks-gallery-image">
+    <li class="blocks-gallery-item">
 		<figure>
 			<img src="http://google.com/hi.png" alt="title" />
 		</figure>
diff --git a/editor/assets/stylesheets/_z-index.scss b/editor/assets/stylesheets/_z-index.scss
index f218da7a81da5f..6ddcf087abb80a 100644
--- a/editor/assets/stylesheets/_z-index.scss
+++ b/editor/assets/stylesheets/_z-index.scss
@@ -22,7 +22,7 @@ $z-layers: (
 	'.editor-block-switcher__menu': 2,
 	'.components-popover__close': 2,
 	'.editor-block-mover': 1,
-	'.blocks-gallery-image__inline-menu': 20,
+	'.blocks-gallery-item__inline-menu': 20,
 	'.editor-block-settings-menu__popover': 20, // Below the header
 	'.editor-header': 30,
 	'.editor-text-editor__formatting': 30,
diff --git a/phpunit/fixtures/long-content.html b/phpunit/fixtures/long-content.html
index 35194ee4770307..d4b935b510513f 100644
--- a/phpunit/fixtures/long-content.html
+++ b/phpunit/fixtures/long-content.html
@@ -67,9 +67,9 @@ <h2>Visual Editing</h2>
 <!-- /wp:paragraph -->
 <!-- wp:gallery {"columns":2} -->
 <div class="wp-block-gallery alignnone columns-2 is-cropped">
-<figure class="blocks-gallery-image"><img src="https://cldup.com/n0g6ME5VKC.jpg" alt="" /></figure>
-<figure class="blocks-gallery-image"><img src="https://cldup.com/ZjESfxPI3R.jpg" alt="" /></figure>
-<figure class="blocks-gallery-image"><img src="https://cldup.com/EKNF8xD2UM.jpg" alt="" /></figure>
+<figure class="blocks-gallery-item"><img src="https://cldup.com/n0g6ME5VKC.jpg" alt="" /></figure>
+<figure class="blocks-gallery-item"><img src="https://cldup.com/ZjESfxPI3R.jpg" alt="" /></figure>
+<figure class="blocks-gallery-item"><img src="https://cldup.com/EKNF8xD2UM.jpg" alt="" /></figure>
 </div>
 <!-- /wp:gallery -->
 <!-- wp:paragraph -->
@@ -89,8 +89,8 @@ <h2>Media Rich</h2>
 <!-- /wp:paragraph -->
 <!-- wp:gallery {"align":"wide"} -->
 <div class="wp-block-gallery alignwide columns-2 is-cropped">
-<figure class="blocks-gallery-image"><img src="https://cldup.com/_rSwtEeDGD.jpg" alt="" /></figure>
-<figure class="blocks-gallery-image"><img src="https://cldup.com/L-cC3qX2DN.jpg" alt="" /></figure>
+<figure class="blocks-gallery-item"><img src="https://cldup.com/_rSwtEeDGD.jpg" alt="" /></figure>
+<figure class="blocks-gallery-item"><img src="https://cldup.com/L-cC3qX2DN.jpg" alt="" /></figure>
 </div>
 <!-- /wp:gallery -->
 <!-- wp:paragraph -->
diff --git a/post-content.js b/post-content.js
index 9d7ae5a55d6f18..7c3cd133ea6f4c 100644
--- a/post-content.js
+++ b/post-content.js
@@ -85,9 +85,9 @@ window._wpGutenbergPost.content = {
 
 		'<!-- wp:gallery {"columns":2} -->',
 		'<ul class="wp-block-gallery alignnone columns-2 is-cropped">',
-		'<li class="blocks-gallery-image"><figure><img src="https://cldup.com/n0g6ME5VKC.jpg" alt="" /></figure></li>',
-		'<li class="blocks-gallery-image"><figure><img src="https://cldup.com/ZjESfxPI3R.jpg" alt="" /></figure></li>',
-		'<li class="blocks-gallery-image"><figure><img src="https://cldup.com/EKNF8xD2UM.jpg" alt="" /></figure></li>',
+		'<li class="blocks-gallery-item"><figure><img src="https://cldup.com/n0g6ME5VKC.jpg" alt="" /></figure></li>',
+		'<li class="blocks-gallery-item"><figure><img src="https://cldup.com/ZjESfxPI3R.jpg" alt="" /></figure></li>',
+		'<li class="blocks-gallery-item"><figure><img src="https://cldup.com/EKNF8xD2UM.jpg" alt="" /></figure></li>',
 		'</ul>',
 		'<!-- /wp:gallery -->',