diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 4dc0b89640c8e..ff38401d57ee7 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -119,7 +119,7 @@ export default function TemplatePartEdit( {
 								<ToolbarButton
 									aria-expanded={ isOpen }
 									icon={ isOpen ? chevronUp : chevronDown }
-									label={ __( 'Choose another' ) }
+									label={ __( 'Switch template part' ) }
 									onClick={ onToggle }
 									// Disable when open to prevent odd FireFox bug causing reopening.
 									// As noted in https://github.com/WordPress/gutenberg/pull/24990#issuecomment-689094119 .
diff --git a/packages/block-library/src/template-part/edit/name-panel.js b/packages/block-library/src/template-part/edit/name-panel.js
index 7f8ad5dec4a98..e0ebc8854c5f0 100644
--- a/packages/block-library/src/template-part/edit/name-panel.js
+++ b/packages/block-library/src/template-part/edit/name-panel.js
@@ -2,46 +2,25 @@
  * WordPress dependencies
  */
 import { useEntityProp } from '@wordpress/core-data';
-import { TextControl } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { cleanForSlug } from '@wordpress/url';
+import { __experimentalText as Text } from '@wordpress/components';
 
-export default function TemplatePartNamePanel( { postId, setAttributes } ) {
-	const [ title, setTitle ] = useEntityProp(
+export default function TemplatePartNamePanel( { postId } ) {
+	const [ title ] = useEntityProp(
 		'postType',
 		'wp_template_part',
 		'title',
 		postId
 	);
-	const [ slug, setSlug ] = useEntityProp(
+	const [ slug ] = useEntityProp(
 		'postType',
 		'wp_template_part',
 		'slug',
 		postId
 	);
-	const [ status, setStatus ] = useEntityProp(
-		'postType',
-		'wp_template_part',
-		'status',
-		postId
-	);
 
 	return (
 		<div className="wp-block-template-part__name-panel">
-			<TextControl
-				label={ __( 'Name' ) }
-				value={ title || slug }
-				onChange={ ( value ) => {
-					setTitle( value );
-					const newSlug = cleanForSlug( value );
-					setSlug( newSlug );
-					if ( status !== 'publish' ) {
-						setStatus( 'publish' );
-					}
-					setAttributes( { slug: newSlug, postId } );
-				} }
-				onFocus={ ( event ) => event.target.select() }
-			/>
+			<Text variant="body">{ title || slug }</Text>
 		</div>
 	);
 }
diff --git a/packages/block-library/src/template-part/editor.scss b/packages/block-library/src/template-part/editor.scss
index aed32baffd118..b21c068ce2918 100644
--- a/packages/block-library/src/template-part/editor.scss
+++ b/packages/block-library/src/template-part/editor.scss
@@ -67,7 +67,9 @@
 
 	.wp-block-template-part__name-panel {
 		outline: 1px solid transparent;
-		padding: $grid-unit-10 0 $grid-unit-10 $grid-unit-15;
+		padding: $grid-unit-10 0 $grid-unit-10 $grid-unit-20;
+		display: flex;
+		align-items: center;
 
 		.components-base-control__field {
 			align-items: center;
@@ -89,3 +91,13 @@
 		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color);
 	}
 }
+
+.block-editor-block-toolbar__slot {
+	.components-toolbar-group {
+		order: 1;
+	}
+
+	.wp-block-template-part__block-control-group {
+		order: 0;
+	}
+}