diff --git a/phpBB/phpbb/auth/provider/apache.php b/phpBB/phpbb/auth/provider/apache.php
index 4da0ec8637..1f3a9f86eb 100644
--- a/phpBB/phpbb/auth/provider/apache.php
+++ b/phpBB/phpbb/auth/provider/apache.php
@@ -21,7 +21,7 @@ use phpbb\request\type_cast_helper;
 use phpbb\user;
 
 /**
-* Apache authentication provider for phpBB3
+* Apache authentication provider for phpBB
 */
 class apache extends base
 {
diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php
index 5f8ebd6ac3..2666a4768d 100644
--- a/phpBB/phpbb/auth/provider/db.php
+++ b/phpBB/phpbb/auth/provider/db.php
@@ -21,7 +21,7 @@ use phpbb\passwords\manager;
 use phpbb\user;
 
 /**
- * Database authentication provider for phpBB3
+ * Database authentication provider for phpBB
  * This is for authentication via the integrated user table
  */
 class db extends base
diff --git a/phpBB/phpbb/auth/provider/ldap.php b/phpBB/phpbb/auth/provider/ldap.php
index 69c0952f1d..ce23714036 100644
--- a/phpBB/phpbb/auth/provider/ldap.php
+++ b/phpBB/phpbb/auth/provider/ldap.php
@@ -20,7 +20,7 @@ use phpbb\language\language;
 use phpbb\user;
 
 /**
- * Database authentication provider for phpBB3
+ * Database authentication provider for phpBB
  * This is for authentication via the integrated user table
  */
 class ldap extends base
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index a9fd2783b6..ef98c2aad8 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -31,7 +31,7 @@ use phpbb\request\request_interface;
 use phpbb\user;
 
 /**
- * OAuth authentication provider for phpBB3
+ * OAuth authentication provider for phpBB
  */
 class oauth extends base
 {
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index 9a90a4594c..402764104e 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -37,7 +37,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
 		// Test for driver support, to avoid suppressed fatal error
 		if (!function_exists('sqlsrv_connect'))
 		{
-			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB3. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
+			$this->connect_error = 'Native MS SQL Server driver for PHP is missing or needs to be updated. Version 1.1 or later is required to install phpBB. You can download the driver from: http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx';
 			return $this->sql_error('');
 		}
 
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index cc86f6f3ce..5a1c2e872f 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -125,10 +125,10 @@ class session
 			$page .= '?' . $query_string;
 		}
 
-		// The script path from the webroot to the current directory (for example: /phpBB3/adm/) : always prefixed with / and ends in /
+		// The script path from the webroot to the current directory (for example: /phpBB/adm/) : always prefixed with / and ends in /
 		$script_path = $symfony_request->getBasePath();
 
-		// The script path from the webroot to the phpBB root (for example: /phpBB3/)
+		// The script path from the webroot to the phpBB root (for example: /phpBB/)
 		$script_dirs = explode('/', $script_path);
 		array_splice($script_dirs, -count($page_dirs));
 		$root_script_path = implode('/', $script_dirs) . (count($root_dirs) ? '/' . implode('/', $root_dirs) : '');