diff --git a/core/core.services.yml b/core/core.services.yml
index 2308656be0..9b84c1b3d8 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1018,8 +1018,8 @@ services:
     arguments: ['@access_manager', '@current_user']
     parent: router.no_access_checks
     tags:
-      - { name: service_collector, tag: non_lazy_route_enhancer, call: addRouteEnhancer }
-      - { name: service_collector, tag: non_lazy_route_filter, call: addRouteFilter }
+      - { name: service_collector, tag: route_enhancer, call: addRouteEnhancer }
+      - { name: service_collector, tag: route_filter, call: addRouteFilter }
   Drupal\Core\Routing\AccessAwareRouterInterface: '@router'
   router.no_access_checks:
     class: \Drupal\Core\Routing\Router