diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index 933ef48..36f95d8 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -18,7 +18,7 @@
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass;
 use Drupal\Core\DependencyInjection\Compiler\TaggedHandlersPass;
-use Drupal\Core\DependencyInjection\Compiler\RegisterEventListenersPass;
+use Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass;
 use Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass;
 use Drupal\Core\DependencyInjection\Compiler\RegisterServicesForDestructionPass;
 use Drupal\Core\Plugin\PluginManagerPass;
@@ -69,7 +69,7 @@ public function register(ContainerBuilder $container) {
     $container->addCompilerPass(new RegisterStreamWrappersPass());
 
     // Add a compiler pass for registering event subscribers.
-    $container->addCompilerPass(new RegisterEventListenersPass(), PassConfig::TYPE_AFTER_REMOVING);
+    $container->addCompilerPass(new RegisterEventSubscribersPass(), PassConfig::TYPE_AFTER_REMOVING);
 
     $container->addCompilerPass(new RegisterAccessChecksPass());
     $container->addCompilerPass(new RegisterLazyRouteEnhancers());
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
similarity index 97%
rename from core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php
rename to core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
index 21a3650..3ec145b 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventListenersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterEventListenersPass.
+ * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass.
  */
 
 namespace Drupal\Core\DependencyInjection\Compiler;
@@ -13,7 +13,7 @@
 /**
  * Registers listeners for all services tagged with 'event_subscriber'.
  */
-class RegisterEventListenersPass implements CompilerPassInterface {
+class RegisterEventSubscribersPass implements CompilerPassInterface {
   public function process(ContainerBuilder $container) {
     if (!$container->hasDefinition('event_dispatcher')) {
       return;
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventListenersPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventSubscribersPassTest.php
similarity index 93%
rename from core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventListenersPassTest.php
rename to core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventSubscribersPassTest.php
index a9ef0d4..2e493e8 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventListenersPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/RegisterEventSubscribersPassTest.php
@@ -2,33 +2,32 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\Core\DependencyInjection\Compiler\RegisterEventListenersPassTest.
+ * Contains \Drupal\Tests\Core\DependencyInjection\Compiler\RegisterEventSubscribersPassTest.
  */
 
 namespace Drupal\Tests\Core\DependencyInjection\Compiler {
 
-use Drupal\Core\DependencyInjection\Compiler\RegisterEventListenersPass;
+use Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * @coversDefaultClass \Drupal\Core\DependencyInjection\Compiler\RegisterEventListenersPass
+ * @coversDefaultClass \Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass
  * @group DependencyInjection
  */
-class RegisterEventListenersPassTest extends UnitTestCase {
+class RegisterEventSubscribersPassTest extends UnitTestCase {
 
   /**
    * The tested compiler pass.
    *
-   * @var \Drupal\Core\DependencyInjection\Compiler\RegisterEventListenersPass
+   * @var \Drupal\Core\DependencyInjection\Compiler\RegisterEventSubscribersPass
    */
   protected $pass;
 
   protected function setUp() {
     parent::setUp();
 
-    $this->pass = new RegisterEventListenersPass();
+    $this->pass = new RegisterEventSubscribersPass();
   }
 
   /**
@@ -86,8 +85,6 @@ public function testProcessWithSubscriberWithPriorities() {
    * We register the subscribers ascending in the module name.
    */
   public function testProcessWithMultipleSubscribersWithModuleWeightAndSamePriorities() {
-    // @FIXME Introduce the weight of the modules.
-
     $builder = new ContainerBuilder();
     $event_dispatcher_definition = $builder->register('event_dispatcher', 'Symfony\Component\EventDispatcher\EventDispatcher');
     $builder->setParameter('container.modules', [