diff --git a/core/modules/comment/comment.links.task.yml b/core/modules/comment/comment.links.task.yml
index ecf92e9..e2f7cc7 100644
--- a/core/modules/comment/comment.links.task.yml
+++ b/core/modules/comment/comment.links.task.yml
@@ -1,16 +1,16 @@
-comment.permalink_tab:
-  route_name: comment.permalink
+comment.canonical_tab:
+  route_name: entity.comment.canonical
   title: 'View comment'
-  base_route: comment.permalink
-comment.edit_page_tab:
-  route_name: comment.edit_page
+  base_route: entity.comment.canonical
+comment.edit_form_tab:
+  route_name: entity.comment.edit_form
   title: 'Edit'
-  base_route: comment.permalink
+  base_route: entity.comment.canonical
   weight: 0
-comment.confirm_delete_tab:
-  route_name: comment.confirm_delete
+comment.delete_form_tab:
+  route_name: entity.comment.delete_form
   title: 'Delete'
-  base_route: comment.permalink
+  base_route: entity.comment.canonical
   weight: 10
 
 comment.admin:
@@ -31,7 +31,7 @@ comment.admin_approval:
   weight: 1
 
 # Default tab for comment type editing.
-comment.type_edit:
+comment.admin_form:
   title: 'Edit'
-  route_name: comment.type_edit
-  base_route: comment.type_edit
+  route_name: entity.comment.admin_form
+  base_route: entity.comment.admin_form
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index e29f49a..2746a2d 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -97,7 +97,7 @@ function comment_help($route_name, RouteMatchInterface $route_match) {
  */
 function comment_uri(CommentInterface $comment) {
   return new Url(
-    'comment.permalink',
+    'entity.comment.canonical',
     array(
       'comment' => $comment->id(),
     ),
diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml
index 04b4b7e..20cf8af 100644
--- a/core/modules/comment/comment.routing.yml
+++ b/core/modules/comment/comment.routing.yml
@@ -16,7 +16,7 @@ comment.admin_approval:
   requirements:
     _permission: 'administer comments'
 
-comment.edit_page:
+entity.comment.edit_form:
   path: '/comment/{comment}/edit'
   defaults:
     _title: 'Edit'
@@ -34,7 +34,7 @@ comment.approve:
     _entity_access: 'comment.approve'
     _csrf_token: 'TRUE'
 
-comment.permalink:
+entity.comment.canonical:
   path: '/comment/{comment}'
   defaults:
     _title: 'Comment permalink'
@@ -42,7 +42,7 @@ comment.permalink:
   requirements:
     _entity_access: 'comment.view'
 
-comment.confirm_delete:
+entity.comment.delete_form:
   path: '/comment/{comment}/delete'
   defaults:
     _title: 'Delete'
@@ -104,7 +104,7 @@ comment.type_add:
   options:
     _admin_route: TRUE
 
-comment.type_edit:
+entity.comment.admin_form:
   path: '/admin/structure/comment/manage/{comment_type}'
   defaults:
     _entity_form: 'comment_type.edit'
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index e4964bc..65800d0 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -45,10 +45,10 @@
  *     "uuid" = "uuid"
  *   },
  *   links = {
- *     "canonical" = "comment.permalink",
- *     "delete-form" = "comment.confirm_delete",
- *     "edit-form" = "comment.edit_page",
- *     "admin-form" = "comment.type_edit"
+ *     "canonical" = "comment/{comment}",
+ *     "delete-form" = "comment/{comment}/delete",
+ *     "edit-form" = "comment/{comment}/edit",
+ *     "admin-form" = "admin/structure/comment/manage/{comment_type}"
  *   },
  *   bundle_entity_type = "comment_type"
  * )