diff --git a/core/modules/contact/contact.links.task.yml b/core/modules/contact/contact.links.task.yml
index e613a8395ee30f6019eecdb6255c40c6e946ce82..687ade5f016736750213de5ab57b38f324acb9c3 100644
--- a/core/modules/contact/contact.links.task.yml
+++ b/core/modules/contact/contact.links.task.yml
@@ -1,7 +1,7 @@
-contact.category_edit:
+entity.contact_category.edit_form:
   title: 'Edit'
-  route_name: contact.category_edit
-  base_route: contact.category_edit
+  route_name: entity.contact_category.edit_form
+  base_route: entity.contact_category.edit_form
 
 contact.personal_page:
   title: 'Contact'
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index 45d800d4871fe4885c83f344d24a264a885510ba..c6cfef6dc6b9fb3354a8e39b106468c7d94e5a29 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -1,4 +1,4 @@
-contact.category_delete:
+entity.contact_category.delete_form:
   path: '/admin/structure/contact/manage/{contact_category}/delete'
   defaults:
     _entity_form: 'contact_category.delete'
@@ -22,7 +22,7 @@ contact.category_add:
   requirements:
     _permission: 'administer contact forms'
 
-contact.category_edit:
+entity.contact_category.edit_form:
   path: '/admin/structure/contact/manage/{contact_category}'
   defaults:
     _entity_form: 'contact_category.edit'
diff --git a/core/modules/contact/src/Entity/Category.php b/core/modules/contact/src/Entity/Category.php
index cc0e6d879401869dea4ff2f528aa7fcedcea2a4e..021456d6786446573c329bb3d506b6de35b86032 100644
--- a/core/modules/contact/src/Entity/Category.php
+++ b/core/modules/contact/src/Entity/Category.php
@@ -35,8 +35,8 @@
  *     "label" = "label"
  *   },
  *   links = {
- *     "delete-form" = "contact.category_delete",
- *     "edit-form" = "contact.category_edit"
+ *     "delete-form" = "entity.contact_category.delete_form",
+ *     "edit-form" = "entity.contact_category.edit_form"
  *   }
  * )
  */
diff --git a/core/modules/contact/src/Entity/Message.php b/core/modules/contact/src/Entity/Message.php
index 2f5e1409a3f3b8a4c23b068d2b1a6fee58216c05..b52b32acbd2180e75b60ba494c00eedb2202ed81 100644
--- a/core/modules/contact/src/Entity/Message.php
+++ b/core/modules/contact/src/Entity/Message.php
@@ -32,7 +32,7 @@
  *   bundle_entity_type = "contact_category",
  *   fieldable = TRUE,
  *   links = {
- *     "admin-form" = "contact.category_edit"
+ *     "admin-form" = "entity.contact_category.edit_form"
  *   }
  * )
  */