diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 858158ad74..c8098094a2 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -38,7 +38,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
 $phpbb_class_loader_ext->register();
 
-$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 $phpbb_container_builder->set_use_extensions(false);
 $phpbb_container_builder->set_dump_container(false);
 
diff --git a/phpBB/common.php b/phpBB/common.php
index a1dfe2a76c..0dfd29dfdb 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -95,7 +95,7 @@ $phpbb_class_loader_ext->register();
 phpbb_load_extensions_autoloaders($phpbb_root_path);
 
 // Set up container
-$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 $phpbb_container = $phpbb_container_builder->get_container();
 
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index 07cc73e5cc..d4e0f04d2b 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -61,7 +61,7 @@ if (isset($_GET['avatar']))
 	$phpbb_class_loader_ext->register();
 
 	// Set up container
-	$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+	$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 	$phpbb_container = $phpbb_container_builder->get_container();
 
 	$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 2b12b965be..fc68235ec8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -86,7 +86,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Set up container (must be done here because extensions table may not exist)
-$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 $phpbb_container_builder->set_use_extensions(false);
 $phpbb_container_builder->set_use_kernel_pass(false);
 $phpbb_container_builder->set_dump_container(false);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 040de1c8f3..d18dbce52a 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -120,7 +120,7 @@ $phpbb_class_loader_ext->register();
 
 // Set up container
 $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
-$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 $phpbb_container_builder->set_use_extensions(false);
 $phpbb_container_builder->set_dump_container(false);
 $phpbb_container_builder->set_use_custom_pass(false);
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index f9985da1ea..1f2b28251e 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -127,7 +127,7 @@ class install_convert extends module
 		// Enable super globals to prevent issues with the new \phpbb\request\request object
 		$request->enable_super_globals();
 		// Create a normal container now
-		$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 		$phpbb_container = $phpbb_container_builder->get_container();
 
 		// Create cache
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 952c647956..b82df84a00 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -104,7 +104,7 @@ class install_install extends module
 				$request->enable_super_globals();
 
 				// Create a normal container now
-				$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+				$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 				$phpbb_container = $phpbb_container_builder->get_container();
 
 				// Sets the global variables
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index bffb2f3365..f8e8c53b2a 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -76,7 +76,7 @@ class install_update extends module
 		$request->enable_super_globals();
 
 		// Create a normal container now
-		$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_file, $phpbb_root_path, $phpEx);
+		$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
 		$phpbb_container_builder->set_dump_container(false);
 		$phpbb_container_builder->set_use_extensions(false);
 		if (file_exists($phpbb_root_path . 'install/update/new/config'))
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 355d975a5f..f78b9e60f8 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -16,7 +16,7 @@ namespace phpbb\di;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 
-class container_factory
+class container_builder
 {
 	/** @var string phpBB Root Path */
 	protected $phpbb_root_path;
diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php
index 221db9e13c..559c0b122c 100644
--- a/tests/di/create_container_test.php
+++ b/tests/di/create_container_test.php
@@ -20,7 +20,7 @@ namespace
 		protected $config_php;
 
 		/**
-		* @var \phpbb\di\container_factory
+		* @var \phpbb\di\container_builder
 		*/
 		protected $builder;
 		protected $phpbb_root_path;
diff --git a/tests/mock/phpbb_di_container_builder.php b/tests/mock/phpbb_di_container_builder.php
index 235fa32b26..59cdf0bb2b 100644
--- a/tests/mock/phpbb_di_container_builder.php
+++ b/tests/mock/phpbb_di_container_builder.php
@@ -11,7 +11,7 @@
 *
 */
 
-class phpbb_mock_phpbb_di_container_builder extends \phpbb\di\container_factory
+class phpbb_mock_phpbb_di_container_builder extends \phpbb\di\container_builder
 {
 	protected function get_container_filename()
 	{