diff --git a/phpBB/common.php b/phpBB/common.php
index 986f0a8839..b0bc281b45 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -93,6 +93,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
 	),
 	array(
 		new phpbb_di_pass_collection_pass(),
+		new phpbb_di_pass_kernel(),
 	),
 	$phpbb_root_path,
 	$phpEx
diff --git a/phpBB/includes/event/kernel_compiler_pass.php b/phpBB/includes/di/pass/kernel.php
similarity index 96%
rename from phpBB/includes/event/kernel_compiler_pass.php
rename to phpBB/includes/di/pass/kernel.php
index 9a650bc404..7b190a6236 100644
--- a/phpBB/includes/event/kernel_compiler_pass.php
+++ b/phpBB/includes/di/pass/kernel.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
-class phpbb_event_kernel_compiler_pass implements CompilerPassInterface
+class phpbb_di_pass_kernel implements CompilerPassInterface
 {
 	/**
 	* Modify the container before it is passed to the rest of the code