diff --git a/core/modules/filter/filter.links.task.yml b/core/modules/filter/filter.links.task.yml
index 166132b5eee7baf9d6e7132a0fc5ce49128923f2..95146f63d4c46fe1a544ac2abacc7592185cba13 100644
--- a/core/modules/filter/filter.links.task.yml
+++ b/core/modules/filter/filter.links.task.yml
@@ -1,7 +1,7 @@
-filter.format_edit_tab:
-  route_name: filter.format_edit
+entity.filter_format.edit_form_tab:
+  route_name: entity.filter_format.edit_form
   title: 'Configure'
-  base_route: filter.format_edit
+  base_route: entity.filter_format.edit_form
   weight: -10
 
 filter.admin_overview:
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 68b445e8d96c66e0bef14fa0ce8b59354e55fd8b..204c0cb4946746269fd63a82b913d799f099ae76 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -48,7 +48,7 @@ function filter_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('Text formats are presented on content editing pages in the order defined on this page. The first format available to a user will be selected by default.') . '</p>';
       return $output;
 
-    case 'filter.format_edit':
+    case 'entity.filter_format.edit_form':
       $output = '<p>' . t('A text format contains filters that change the user input, for example stripping out malicious HTML or making URLs clickable. Filters are executed from top to bottom and the order is important, since one filter may prevent another filter from doing its job. For example, when URLs are converted into links before disallowed HTML tags are removed, all links may be removed. When this happens, the order of filters may need to be re-arranged.') . '</p>';
       return $output;
   }
diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml
index 1017e2c5ed284aea594a9db25992666c04b2ebc1..6bcf6484a6ee4b1f97d132d2940e69eff083d186 100644
--- a/core/modules/filter/filter.routing.yml
+++ b/core/modules/filter/filter.routing.yml
@@ -31,7 +31,7 @@ filter.format_add:
   requirements:
     _entity_create_access: 'filter_format'
 
-filter.format_edit:
+entity.filter_format.edit_form:
   path: '/admin/config/content/formats/manage/{filter_format}'
   defaults:
     _entity_form: filter_format.edit
@@ -39,7 +39,7 @@ filter.format_edit:
   requirements:
     _entity_access: 'filter_format.update'
 
-filter.admin_disable:
+entity.filter_format.disable:
   path: '/admin/config/content/formats/manage/{filter_format}/disable'
   defaults:
     _entity_form: 'filter_format.disable'
diff --git a/core/modules/filter/src/Entity/FilterFormat.php b/core/modules/filter/src/Entity/FilterFormat.php
index 6f2be4de250a3acd10c5ae015df035d5860b2d43..c8c1942043ba78cadd82b52a15c6858cd2341295 100644
--- a/core/modules/filter/src/Entity/FilterFormat.php
+++ b/core/modules/filter/src/Entity/FilterFormat.php
@@ -38,8 +38,8 @@
  *     "status" = "status"
  *   },
  *   links = {
- *     "edit-form" = "filter.format_edit",
- *     "disable" = "filter.admin_disable"
+ *     "edit-form" = "entity.filter_format.edit_form",
+ *     "disable" = "entity.filter_format.disable"
  *   }
  * )
  */