diff --git a/packages/block-library/src/post-comment-author-avatar/block.json b/packages/block-library/src/post-comment-author-avatar/block.json
index 0d17f2b23e8475..ef532165b66a5b 100644
--- a/packages/block-library/src/post-comment-author-avatar/block.json
+++ b/packages/block-library/src/post-comment-author-avatar/block.json
@@ -2,9 +2,9 @@
 	"apiVersion": 2,
 	"name": "core/post-comment-author-avatar",
 	"title": "Comment Author Avatar",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
-	"description": "Comment Author Avatar.",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
+	"description": "Add the avatar of this comment's author.",
 	"textdomain": "default",
 	"attributes": {
 		"width": {
diff --git a/packages/block-library/src/post-comment-author/block.json b/packages/block-library/src/post-comment-author/block.json
index 61d9f2caec9303..e9083116bd8819 100644
--- a/packages/block-library/src/post-comment-author/block.json
+++ b/packages/block-library/src/post-comment-author/block.json
@@ -1,10 +1,10 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment-author",
-	"title": "Post Comment Author",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
-	"description": "Post comment author.",
+	"title": "Comment Author",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
+	"description": "Add the author of this comment.",
 	"textdomain": "default",
 	"attributes": {
 		"isLink": {
diff --git a/packages/block-library/src/post-comment-author/edit.js b/packages/block-library/src/post-comment-author/edit.js
index 88ba6f86e5cd86..f9dc9eaf3248ba 100644
--- a/packages/block-library/src/post-comment-author/edit.js
+++ b/packages/block-library/src/post-comment-author/edit.js
@@ -97,7 +97,7 @@ export default function Edit( {
 				{ inspectorControls }
 				{ blockControls }
 				<div { ...blockProps }>
-					<p>{ _x( 'Post Comment Author', 'block title' ) }</p>
+					<p>{ _x( 'Comment Author', 'block title' ) }</p>
 				</div>
 			</>
 		);
diff --git a/packages/block-library/src/post-comment-content/block.json b/packages/block-library/src/post-comment-content/block.json
index 551780a3a4ac16..4a9a24615ab9a2 100644
--- a/packages/block-library/src/post-comment-content/block.json
+++ b/packages/block-library/src/post-comment-content/block.json
@@ -1,10 +1,10 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment-content",
-	"title": "Post Comment Content",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
-	"description": "Post comment content",
+	"title": "Comment Content",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
+	"description": "Displays the contents of a comment.",
 	"textdomain": "default",
 	"usesContext": [ "commentId" ],
 	"attributes": {
diff --git a/packages/block-library/src/post-comment-content/edit.js b/packages/block-library/src/post-comment-content/edit.js
index 3c93ec3da690ef..e9501e459962ff 100644
--- a/packages/block-library/src/post-comment-content/edit.js
+++ b/packages/block-library/src/post-comment-content/edit.js
@@ -61,7 +61,7 @@ export default function Edit( {
 			<>
 				{ blockControls }
 				<div { ...blockProps }>
-					<p>{ _x( 'Post Comment Content', 'block title' ) }</p>
+					<p>{ _x( 'Comment Content', 'block title' ) }</p>
 				</div>
 			</>
 		);
diff --git a/packages/block-library/src/post-comment-date/block.json b/packages/block-library/src/post-comment-date/block.json
index c162fbf901ff4b..f8e6e97d22f19b 100644
--- a/packages/block-library/src/post-comment-date/block.json
+++ b/packages/block-library/src/post-comment-date/block.json
@@ -1,10 +1,10 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment-date",
-	"title": "Post Comment Date",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
-	"description": "Post comment date.",
+	"title": "Comment Date",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
+	"description": "Add the date of this comment.",
 	"textdomain": "default",
 	"attributes": {
 		"format": {
diff --git a/packages/block-library/src/post-comment-date/edit.js b/packages/block-library/src/post-comment-date/edit.js
index feafb0d0a098a7..2059d49e8354d7 100644
--- a/packages/block-library/src/post-comment-date/edit.js
+++ b/packages/block-library/src/post-comment-date/edit.js
@@ -14,23 +14,22 @@ import { __, _x } from '@wordpress/i18n';
 /**
  * Renders the `core/post-comment-date` block on the editor.
  *
- * @param {Object} props                      React props.
- * @param {Object} props.setAttributes        Callback for updating block attributes.
- * @param {Object} props.attributes           Block attributes.
- * @param {string} props.attributes.className Block class name.
- * @param {string} props.attributes.format    Format of the date.
- * @param {string} props.attributes.isLink    Whether the author name should be linked.
- * @param {Object} props.context              Inherited context.
- * @param {string} props.context.commentId    The comment ID.
+ * @param {Object} props                   React props.
+ * @param {Object} props.setAttributes     Callback for updating block attributes.
+ * @param {Object} props.attributes        Block attributes.
+ * @param {string} props.attributes.format Format of the date.
+ * @param {string} props.attributes.isLink Whether the author name should be linked.
+ * @param {Object} props.context           Inherited context.
+ * @param {string} props.context.commentId The comment ID.
  *
  * @return {JSX.Element} React element.
  */
 export default function Edit( {
-	attributes: { className, format, isLink },
+	attributes: { format, isLink },
 	context: { commentId },
 	setAttributes,
 } ) {
-	const blockProps = useBlockProps( { className } );
+	const blockProps = useBlockProps();
 	const [ date ] = useEntityProp( 'root', 'comment', 'date', commentId );
 	const [ siteDateFormat ] = useEntityProp( 'root', 'site', 'date_format' );
 
@@ -75,7 +74,7 @@ export default function Edit( {
 			<>
 				{ inspectorControls }
 				<div { ...blockProps }>
-					<p>{ _x( 'Post Comment Date', 'block title' ) }</p>
+					<p>{ _x( 'Comment Date', 'block title' ) }</p>
 				</div>
 			</>
 		);
diff --git a/packages/block-library/src/post-comment-edit/block.json b/packages/block-library/src/post-comment-edit/block.json
index b5fc5d5f92e88e..5c77fc22390134 100644
--- a/packages/block-library/src/post-comment-edit/block.json
+++ b/packages/block-library/src/post-comment-edit/block.json
@@ -1,9 +1,9 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment-edit",
-	"title": "Post Comment Edit Link",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
+	"title": "Comment Edit Link",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
 	"description": "Displays a link to edit the comment in the WordPress Dashboard. This link is only visible to users with the edit comment capability.",
 	"textdomain": "default",
 	"usesContext": [ "commentId" ],
diff --git a/packages/block-library/src/post-comment-reply-link/block.json b/packages/block-library/src/post-comment-reply-link/block.json
index ddfdc540e70a64..6b71d371259314 100644
--- a/packages/block-library/src/post-comment-reply-link/block.json
+++ b/packages/block-library/src/post-comment-reply-link/block.json
@@ -1,9 +1,9 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment-reply-link",
-	"title": "Post Comment Reply Link",
-	"category": "design",
-	"parent": [ "core/post-comment" ],
+	"title": "Comment Reply Link",
+	"category": "theme",
+	"parent": [ "core/comment-template" ],
 	"description": "Displays a link to reply to a comment.",
 	"textdomain": "default",
 	"usesContext": [ "commentId" ],
diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json
index 695b56df4288bd..899e5cc6422466 100644
--- a/packages/block-library/src/post-comment/block.json
+++ b/packages/block-library/src/post-comment/block.json
@@ -1,9 +1,9 @@
 {
 	"apiVersion": 2,
 	"name": "core/post-comment",
-	"title": "Post Comment",
+	"title": "Post Comment (deprecated)",
 	"category": "theme",
-	"description": "Post comment.",
+	"description": "This block is deprecated. Please use the Comments Query Loop block instead.",
 	"textdomain": "default",
 	"attributes": {
 		"commentId": {
@@ -14,6 +14,7 @@
 		"commentId": "commentId"
 	},
 	"supports": {
-		"html": false
+		"html": false,
+		"inserter": false
 	}
 }