diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index f45ea5e5c8..c68ae7821f 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -86,7 +86,7 @@
 	<p>To use any methods contained with the <code>auth</code> class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:</p>
 
 	<div class="codebox"><pre>
-$auth = new phpbb_auth();
+$auth = new phpbb\auth\auth();
 	</pre></div>
 
 	<p>Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the <code>auth_admin</code> methods you will need to instantiate this separately but in the same way.</p>
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php
index 62559fbf36..667d27fd20 100644
--- a/phpBB/includes/functions_container.php
+++ b/phpBB/includes/functions_container.php
@@ -152,12 +152,12 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path)
 	return phpbb_create_compiled_container(
 		$config_file,
 		array(
-			new phpbb_di_extension_config($config_file),
-			new phpbb_di_extension_core($config_path),
+			new phpbb\di\extension\config($config_file),
+			new phpbb\di\extension\core($config_path),
 		),
 		array(
-			new phpbb_di_pass_collection_pass(),
-			new phpbb_di_pass_kernel_pass(),
+			new phpbb\di\pass\collection_pass(),
+			new phpbb\di\pass\kernel_pass(),
 		),
 		$phpbb_root_path,
 		$php_ext