diff --git a/core-blocks/embed/index.js b/core-blocks/embed/index.js
index 0d59971257b3a..2004bc7b01274 100644
--- a/core-blocks/embed/index.js
+++ b/core-blocks/embed/index.js
@@ -87,7 +87,7 @@ function getEmbedBlockSettings( { title, description, icon, category = 'embed',
 				const { url } = ownProps.attributes;
 				// Preview is undefined if we don't know the status of it, false if it failed,
 				// otherwise it will be an object containing the embed response.
-				const preview = url ? select( 'core/blocks' ).getPreview( url ) : undefined;
+				const preview = url ? select( 'core/block-data' ).getPreview( url ) : undefined;
 				return {
 					preview,
 				};
diff --git a/core-blocks/store/index.js b/core-blocks/store/index.js
index 2906e23f7f2ff..409648c58f965 100644
--- a/core-blocks/store/index.js
+++ b/core-blocks/store/index.js
@@ -11,7 +11,7 @@ import * as selectors from './selectors';
 import * as actions from './actions';
 import * as resolvers from './resolvers';
 
-const store = registerStore( 'core/blocks', {
+const store = registerStore( 'core/block-data', {
 	reducer,
 	actions,
 	selectors,
diff --git a/core-blocks/store/selectors.js b/core-blocks/store/selectors.js
index b29d06580cf2b..10f90024501b4 100644
--- a/core-blocks/store/selectors.js
+++ b/core-blocks/store/selectors.js
@@ -13,7 +13,7 @@ export function getPreview( state, url ) {
 		return preview;
 	}
 
-	const oEmbedLinkCheck = '<a href="' + url +'">' + url + '</a>';
+	const oEmbedLinkCheck = '<a href="' + url + '">' + url + '</a>';
 
 	if ( oEmbedLinkCheck === preview.html ) {
 		// just a link to the url, it's oEmbed being helpful and creating a link for us, not actually embedding content