diff --git a/core/modules/system/src/Entity/DateFormat.php b/core/modules/system/src/Entity/DateFormat.php
index a7d689d..2a0cce6 100644
--- a/core/modules/system/src/Entity/DateFormat.php
+++ b/core/modules/system/src/Entity/DateFormat.php
@@ -33,8 +33,8 @@
  *   },
  *   admin_permission = "administer site configuration",
  *   links = {
- *     "delete-form" = "system.date_format_delete",
- *     "edit-form" = "system.date_format_edit"
+ *     "delete-form" = "entity.date_format.delete_form",
+ *     "edit-form" = "entity.date_format.edit_form"
  *   }
  * )
  */
diff --git a/core/modules/system/system.links.task.yml b/core/modules/system/system.links.task.yml
index 02fe18b..3d55647 100644
--- a/core/modules/system/system.links.task.yml
+++ b/core/modules/system/system.links.task.yml
@@ -59,10 +59,10 @@ system.date_format_list:
   route_name: system.date_format_list
   base_route: system.date_format_list
   title: 'List'
-system.date_format_edit:
+entity.date_format.edit_form:
   title: 'Edit'
-  route_name: system.date_format_edit
-  base_route: system.date_format_edit
+  route_name: entity.date_format.edit_form
+  base_route: entity.date_format.edit_form
 
 system.admin_content:
   title: Content
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index c22d93b..f9343a9 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -220,7 +220,7 @@ system.date_format_add:
   requirements:
     _permission: 'administer site configuration'
 
-system.date_format_edit:
+entity.date_format.edit_form:
   path: '/admin/config/regional/date-time/formats/manage/{date_format}'
   defaults:
     _entity_form: 'date_format.edit'
@@ -228,7 +228,7 @@ system.date_format_edit:
   requirements:
     _entity_access: 'date_format.update'
 
-system.date_format_delete:
+entity.date_format.delete_form:
   path: '/admin/config/regional/date-time/formats/manage/{date_format}/delete'
   defaults:
     _entity_form: 'date_format.delete'