diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml
index 41373fc83f..9e83bbd918 100644
--- a/phpBB/config/passwords.yml
+++ b/phpBB/config/passwords.yml
@@ -3,7 +3,7 @@ parameters:
 
 services:
     passwords.driver.bcrypt:
-        class: phpbb_passwords_driver_bcrypt
+        class: phpbb\passwords\driver\bcrypt
         arguments:
             - @config
             - @passwords.driver_helper
@@ -13,7 +13,7 @@ services:
             - { name: passwords.driver }
 
     passwords.driver.bcrypt_2y:
-        class: phpbb_passwords_driver_bcrypt_2y
+        class: phpbb\passwords\driver\bcrypt_2y
         arguments:
             - @config
             - @passwords.driver_helper
@@ -23,7 +23,7 @@ services:
             - { name: passwords.driver }
 
     passwords.driver.salted_md5:
-        class: phpbb_passwords_driver_salted_md5
+        class: phpbb\passwords\driver\salted_md5
         arguments:
             - @config
             - @passwords.driver_helper
@@ -33,7 +33,7 @@ services:
             - { name: passwords.driver }
 
     passwords.driver.phpass:
-        class: phpbb_passwords_driver_phpass
+        class: phpbb\passwords\driver\phpass
         arguments:
             - @config
             - @passwords.driver_helper
@@ -43,17 +43,17 @@ services:
             - { name: passwords.driver }
 
     passwords.driver_collection:
-        class: phpbb_di_service_collection
+        class: phpbb\di\service_collection
         arguments:
             - @service_container
         tags:
             - { name: service_collection, tag: passwords.driver }
 
     passwords.driver_helper:
-        class: phpbb_passwords_driver_helper
+        class: phpbb\passwords\driver\helper
 
     passwords.manager:
-        class: phpbb_passwords_manager
+        class: phpbb\passwords\manager
         arguments:
             - @config
             - @passwords.driver_collection
@@ -61,4 +61,4 @@ services:
             - %passwords.algorithm%
 
     passwords.helper:
-        class: phpbb_passwords_helper
+        class: phpbb\passwords\helper
diff --git a/phpBB/phpbb/db/migration/data/310/passwords.php b/phpBB/phpbb/db/migration/data/v310/passwords.php
similarity index 79%
rename from phpBB/phpbb/db/migration/data/310/passwords.php
rename to phpBB/phpbb/db/migration/data/v310/passwords.php
index 0611abb79d..c422f681ba 100644
--- a/phpBB/phpbb/db/migration/data/310/passwords.php
+++ b/phpBB/phpbb/db/migration/data/v310/passwords.php
@@ -7,11 +7,13 @@
 *
 */
 
-class phpbb_db_migration_data_310_passwords extends phpbb_db_migration
+namespace phpbb\db\migration\data\v310;
+
+class passwords extends \phpbb\db\migration\migration
 {
 	static public function depends_on()
 	{
-		return array('phpbb_db_migration_data_30x_3_0_11');
+		return array('\phpbb\db\migration\data\v30x\release_3_0_11');
 	}
 
 	public function update_schema()