diff --git a/phpBB/common.php b/phpBB/common.php
index b435970692..6dc018c5c2 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -106,7 +106,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
 	array(
-		new phpbb_di_pass_collection('cron.task_collection', 'cron.task'),
+		new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
 	),
 	$phpbb_root_path,
 	$phpEx
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 5ef64e6ecc..ac0f87eb3a 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -65,7 +65,7 @@ if (isset($_GET['avatar']))
 			new phpbb_di_extension_core($phpbb_root_path),
 		),
 		array(
-			new phpbb_di_pass_collection('cron.task_collection', 'cron.task'),
+			new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
 		),
 		$phpbb_root_path,
 		$phpEx
diff --git a/phpBB/includes/di/pass/collection.php b/phpBB/includes/di/pass/collection_pass.php
similarity index 93%
rename from phpBB/includes/di/pass/collection.php
rename to phpBB/includes/di/pass/collection_pass.php
index 09e4b08f62..70a44d1d51 100644
--- a/phpBB/includes/di/pass/collection.php
+++ b/phpBB/includes/di/pass/collection_pass.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
-class phpbb_di_pass_collection implements CompilerPassInterface
+class phpbb_di_pass_collection_pass implements CompilerPassInterface
 {
 	private $collection_service;
 	private $service_tag;
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index add59b3c85..1940daf334 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -123,7 +123,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 		new phpbb_di_extension_core($phpbb_root_path),
 	),
 	array(
-		new phpbb_di_pass_collection('cron.task_collection', 'cron.task'),
+		new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
 	),
 	$phpbb_root_path,
 	$phpEx