4 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index 9ffc8d229f..5ef278d493 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -23,7 +23,7 @@ define('IN_PHPBB', true);
 require(dirname(__FILE__) . '/../includes/db/schema_data.php');
 require(dirname(__FILE__) . '/../phpbb/db/tools.php');
 
-$dbms_type_map = phpbb_db_tools::get_dbms_type_map();
+$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
 
 // A list of types being unsigned for better reference in some db's
 $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php
index 3decee306a..eb34034826 100644
--- a/phpBB/develop/mysql_upgrader.php
+++ b/phpBB/develop/mysql_upgrader.php
@@ -59,7 +59,7 @@ echo "USE $dbname;$newline$newline";
 require($phpbb_root_path . 'includes/db/schema_data.' . $phpEx);
 require($phpbb_root_path . 'phpbb/db/tools.' . $phpEx);
 
-$dbms_type_map = phpbb_db_tools::get_dbms_type_map();
+$dbms_type_map = phpbb\db\tools::get_dbms_type_map();
 
 foreach ($schema_data as $table_name => $table_data)
 {
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e905375f4a..acf4800849 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5671,7 +5671,7 @@ function phpbb_to_numeric($input)
 * Convert either 3.0 dbms or 3.1 db driver class name to 3.1 db driver class name.
 *
 * If $dbms is a valid 3.1 db driver class name, returns it unchanged.
-* Otherwise prepends phpbb_db_driver_ to the dbms to convert a 3.0 dbms
+* Otherwise prepends phpbb\db\driver\ to the dbms to convert a 3.0 dbms
 * to 3.1 db driver class name.
 *
 * @param string $dbms dbms parameter
diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index cd960bc65a..53d39e9127 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -84,7 +84,7 @@ class driver
 
 		// Fill default sql layer based on the class being called.
 		// This can be changed by the specified layer itself later if needed.
-		$this->sql_layer = substr(get_class($this), strlen('phpbb_db_driver_'));
+		$this->sql_layer = substr(get_class($this), strlen('phpbb\db\driver\\'));
 
 		// Do not change this please! This variable is used to easy the use of it - and is hardcoded.
 		$this->any_char = chr(0) . '%';