diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
index c076183cdc..f6a3063aad 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -131,7 +131,7 @@ return static function (ContainerConfigurator $container) {
 
         ->set('console.command.event_dispatcher_debug', EventDispatcherDebugCommand::class)
             ->args([
-                tagged_locator('event_dispatcher.dispatcher'),
+                tagged_locator('event_dispatcher.dispatcher', 'name'),
             ])
             ->tag('console.command')
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
index d649364f19..c78faddba2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
@@ -69,7 +69,7 @@ return static function (ContainerConfigurator $container) {
         ->set('event_dispatcher', EventDispatcher::class)
             ->public()
             ->tag('container.hot_path')
-            ->tag('event_dispatcher.dispatcher')
+            ->tag('event_dispatcher.dispatcher', ['name' => 'event_dispatcher'])
         ->alias(EventDispatcherInterfaceComponentAlias::class, 'event_dispatcher')
         ->alias(EventDispatcherInterface::class, 'event_dispatcher')
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index a2cd2d13b5..1d9a2a6647 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -385,7 +385,7 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
         // Register Firewall-specific event dispatcher
         $firewallEventDispatcherId = 'security.event_dispatcher.'.$id;
         $container->register($firewallEventDispatcherId, EventDispatcher::class)
-            ->addTag('event_dispatcher.dispatcher');
+            ->addTag('event_dispatcher.dispatcher', ['name' => $firewallEventDispatcherId]);
 
         // Register listeners
         $listeners = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/debug_console.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/debug_console.php
index 242722f724..74fa434926 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/config/debug_console.php
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/debug_console.php
@@ -19,7 +19,7 @@ return static function (ContainerConfigurator $container) {
             ->args([
                 param('security.firewalls'),
                 service('security.firewall.context_locator'),
-                tagged_locator('event_dispatcher.dispatcher'),
+                tagged_locator('event_dispatcher.dispatcher', 'name'),
                 [],
                 false,
             ])