diff --git a/blocks/hooks/anchor.js b/blocks/hooks/anchor.js
index dafa84d2b6059..3f8ebdb57c631 100644
--- a/blocks/hooks/anchor.js
+++ b/blocks/hooks/anchor.js
@@ -94,7 +94,7 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 }
 
 export default function anchor( { addFilter } ) {
-	addFilter( 'registerBlockType', 'core-anchor-attribute', addAttribute );
-	addFilter( 'BlockEdit', 'core-anchor-inspector-control', addInspectorControl );
-	addFilter( 'getSaveContent.extraProps', 'core-anchor-save-props', addSaveProps );
+	addFilter( 'registerBlockType', 'core/anchor/attribute', addAttribute );
+	addFilter( 'BlockEdit', 'core/anchor/inspector-control', addInspectorControl );
+	addFilter( 'getSaveContent.extraProps', 'core/anchor/save-props', addSaveProps );
 }
diff --git a/blocks/hooks/custom-class-name.js b/blocks/hooks/custom-class-name.js
index 4e0dec0aea773..9191c9b446935 100644
--- a/blocks/hooks/custom-class-name.js
+++ b/blocks/hooks/custom-class-name.js
@@ -83,7 +83,7 @@ export function addSaveProps( extraProps, blockType, attributes ) {
 }
 
 export default function customClassName( { addFilter } ) {
-	addFilter( 'registerBlockType', 'core-custom-class-name-attribute', addAttribute );
-	addFilter( 'BlockEdit', 'core-custom-class-name-inspector-control', addInspectorControl );
-	addFilter( 'getSaveContent.extraProps', 'core-custom-class-name-save-props', addSaveProps );
+	addFilter( 'registerBlockType', 'core/custom-class-name/attribute', addAttribute );
+	addFilter( 'BlockEdit', 'core/custom-class-name/inspector-control', addInspectorControl );
+	addFilter( 'getSaveContent.extraProps', 'core/custom-class-name/save-props', addSaveProps );
 }
diff --git a/blocks/hooks/generated-class-name.js b/blocks/hooks/generated-class-name.js
index dfab31bce7a96..66c08d1e78803 100644
--- a/blocks/hooks/generated-class-name.js
+++ b/blocks/hooks/generated-class-name.js
@@ -31,5 +31,5 @@ export function addGeneratedClassName( extraProps, blockType ) {
 }
 
 export default function generatedClassName( { addFilter } ) {
-	addFilter( 'getSaveContent.extraProps', 'core-generated-class-name-save-props', addGeneratedClassName );
+	addFilter( 'getSaveContent.extraProps', 'core/generated-class-name/save-props', addGeneratedClassName );
 }
diff --git a/blocks/hooks/matchers.js b/blocks/hooks/matchers.js
index a8890cd7e6226..ef3f19859584c 100644
--- a/blocks/hooks/matchers.js
+++ b/blocks/hooks/matchers.js
@@ -92,5 +92,5 @@ export function resolveAttributes( settings ) {
 }
 
 export default function matchers( { addFilter } ) {
-	addFilter( 'registerBlockType', 'core-matchers', resolveAttributes );
+	addFilter( 'registerBlockType', 'core/matchers', resolveAttributes );
 }