diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
index 9c544e8f95c4f4..29eafa0b24d154 100644
--- a/packages/block-library/src/heading/block.json
+++ b/packages/block-library/src/heading/block.json
@@ -61,7 +61,8 @@
 				"textTransform": true
 			}
 		},
-		"__experimentalSlashInserter": true
+		"__experimentalSlashInserter": true,
+		"__experimentalMetadata": true
 	},
 	"editorStyle": "wp-block-heading-editor",
 	"style": "wp-block-heading"
diff --git a/packages/block-library/src/heading/index.js b/packages/block-library/src/heading/index.js
index 4ff1203df33fcc..3752ca70bc7142 100644
--- a/packages/block-library/src/heading/index.js
+++ b/packages/block-library/src/heading/index.js
@@ -29,10 +29,12 @@ export const settings = {
 	__experimentalLabel( attributes, { context } ) {
 		const { content, level } = attributes;
 
+		const customName = attributes?.metadata?.name;
+
 		// In the list view, use the block's content as the label.
 		// If the content is empty, fall back to the default label.
-		if ( context === 'list-view' && content ) {
-			return content;
+		if ( context === 'list-view' && ( customName || content ) ) {
+			return attributes?.metadata?.name || content;
 		}
 
 		if ( context === 'accessibility' ) {
diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index 85f56f4a838f50..639d45b2976eeb 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -66,7 +66,8 @@
 			}
 		},
 		"__experimentalSelector": "p",
-		"__unstablePasteTextInline": true
+		"__unstablePasteTextInline": true,
+		"__experimentalMetadata": true
 	},
 	"editorStyle": "wp-block-paragraph-editor",
 	"style": "wp-block-paragraph"
diff --git a/packages/block-library/src/paragraph/index.js b/packages/block-library/src/paragraph/index.js
index bceff881367074..e94df94a3c849c 100644
--- a/packages/block-library/src/paragraph/index.js
+++ b/packages/block-library/src/paragraph/index.js
@@ -28,6 +28,12 @@ export const settings = {
 		},
 	},
 	__experimentalLabel( attributes, { context } ) {
+		const customName = attributes?.metadata?.name;
+
+		if ( context === 'list-view' && customName ) {
+			return attributes?.metadata?.name;
+		}
+
 		if ( context === 'accessibility' ) {
 			const { content } = attributes;
 			return ! content || content.length === 0 ? __( 'Empty' ) : content;
diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json
index d30eccf3765792..59e736c3a3a189 100644
--- a/packages/block-library/src/query/block.json
+++ b/packages/block-library/src/query/block.json
@@ -49,7 +49,8 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
-		"layout": true
+		"layout": true,
+		"__experimentalMetadata": true
 	},
 	"editorStyle": "wp-block-query-editor",
 	"style": "wp-block-query",