diff --git a/libraries/classmap.php b/libraries/classmap.php
index fd5677709f942..b433e29d0b720 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -131,3 +131,9 @@
 
 JLoader::registerAlias('JPathway',                          '\\Joomla\\CMS\\Pathway\\Pathway', '4.0');
 JLoader::registerAlias('JPathwaySite',                      '\\Joomla\\CMS\\Pathway\\SitePathway', '4.0');
+
+JLoader::registerAlias('JSchemaChangeitem',                 '\\Joomla\\CMS\\Schema\\ChangeItem', '4.0');
+JLoader::registerAlias('JSchemaChangeset',                  '\\Joomla\\CMS\\Schema\\ChangeSet', '4.0');
+JLoader::registerAlias('JSchemaChangeitemMysql',            '\\Joomla\\CMS\\Schema\\ChangeItem\\MysqlChangeItem', '4.0');
+JLoader::registerAlias('JSchemaChangeitemPostgresql',       '\\Joomla\\CMS\\Schema\\ChangeItem\\PostgresqlChangeItem', '4.0');
+JLoader::registerAlias('JSchemaChangeitemSqlsrv',           '\\Joomla\\CMS\\Schema\\ChangeItem\\SqlsrvChangeItem', '4.0');
diff --git a/libraries/cms/schema/changeitem.php b/libraries/src/Joomla/CMS/Schema/ChangeItem.php
similarity index 79%
rename from libraries/cms/schema/changeitem.php
rename to libraries/src/Joomla/CMS/Schema/ChangeItem.php
index 7beb0636af3dc..670dc23acbd0d 100644
--- a/libraries/cms/schema/changeitem.php
+++ b/libraries/src/Joomla/CMS/Schema/ChangeItem.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Schema
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Schema;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -25,7 +26,7 @@
  *
  * @since  2.5
  */
-abstract class JSchemaChangeitem
+abstract class ChangeItem
 {
 	/**
 	 * Update file: full path file name where query was found
@@ -60,9 +61,9 @@ abstract class JSchemaChangeitem
 	public $checkQueryExpected = 1;
 
 	/**
-	 * JDatabaseDriver object
+	 * \JDatabaseDriver object
 	 *
-	 * @var    JDatabaseDriver
+	 * @var    \JDatabaseDriver
 	 * @since  2.5
 	 */
 	public $db = null;
@@ -78,7 +79,7 @@ abstract class JSchemaChangeitem
 	public $queryType = null;
 
 	/**
-	 * Array with values for use in a JText::sprintf statment indicating what was checked
+	 * Array with values for use in a \JText::sprintf statment indicating what was checked
 	 *
 	 * Tells you what the message should be, based on which elements are defined, as follows:
 	 *     For ADD_TABLE: table
@@ -110,9 +111,9 @@ abstract class JSchemaChangeitem
 	/**
 	 * Constructor: builds check query and message from $updateQuery
 	 *
-	 * @param   JDatabaseDriver  $db     Database connector object
-	 * @param   string           $file   Full path name of the sql file
-	 * @param   string           $query  Text of the sql query (one line of the file)
+	 * @param   \JDatabaseDriver  $db     Database connector object
+	 * @param   string            $file   Full path name of the sql file
+	 * @param   string            $query  Text of the sql query (one line of the file)
 	 *
 	 * @since   2.5
 	 */
@@ -125,16 +126,16 @@ public function __construct($db, $file, $query)
 	}
 
 	/**
-	 * Returns a reference to the JSchemaChangeitem object.
+	 * Returns a reference to the ChangeItem object.
 	 *
-	 * @param   JDatabaseDriver  $db     Database connector object
-	 * @param   string           $file   Full path name of the sql file
-	 * @param   string           $query  Text of the sql query (one line of the file)
+	 * @param   \JDatabaseDriver  $db     Database connector object
+	 * @param   string            $file   Full path name of the sql file
+	 * @param   string            $query  Text of the sql query (one line of the file)
 	 *
-	 * @return  JSchemaChangeitem instance based on the database driver
+	 * @return  ChangeItem  instance based on the database driver
 	 *
 	 * @since   2.5
-	 * @throws  RuntimeException if class for database driver not found
+	 * @throws  \RuntimeException if class for database driver not found
 	 */
 	public static function getInstance($db, $file, $query)
 	{
@@ -147,7 +148,7 @@ public static function getInstance($db, $file, $query)
 			$serverType = 'sqlsrv';
 		}
 
-		$class = 'JSchemaChangeitem' . ucfirst($serverType);
+		$class = '\\Joomla\\CMS\\Schema\\ChangeItem\\' . ucfirst($serverType) . 'ChangeItem';
 
 		// If the class exists, return it.
 		if (class_exists($class))
@@ -155,7 +156,7 @@ public static function getInstance($db, $file, $query)
 			return new $class($db, $file, $query);
 		}
 
-		throw new RuntimeException(sprintf('JSchemaChangeitem child class not found for the %s database driver', $serverType), 500);
+		throw new \RuntimeException(sprintf('ChangeItem child class not found for the %s database driver', $serverType), 500);
 	}
 
 	/**
@@ -197,12 +198,12 @@ public function check()
 			{
 				$rows = $this->db->loadObject();
 			}
-			catch (RuntimeException $e)
+			catch (\RuntimeException $e)
 			{
 				$rows = false;
 
 				// Still render the error message from the Exception object
-				JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+				\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 			}
 
 			if ($rows !== false)
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/src/Joomla/CMS/Schema/ChangeItem/MysqlChangeItem.php
similarity index 96%
rename from libraries/cms/schema/changeitem/mysql.php
rename to libraries/src/Joomla/CMS/Schema/ChangeItem/MysqlChangeItem.php
index 1bb3ddf89c6dc..83e67af49e7f0 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/src/Joomla/CMS/Schema/ChangeItem/MysqlChangeItem.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Schema
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Schema\ChangeItem;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Schema\ChangeItem;
+
 /**
  * Checks the database schema against one MySQL DDL query to see if it has been run.
  *
  * @since  2.5
  */
-class JSchemaChangeitemMysql extends JSchemaChangeitem
+class MysqlChangeItem extends ChangeItem
 {
 	/**
 	 * Checks a DDL query to see if it is a known type
diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/src/Joomla/CMS/Schema/ChangeItem/PostgresqlChangeItem.php
similarity index 95%
rename from libraries/cms/schema/changeitem/postgresql.php
rename to libraries/src/Joomla/CMS/Schema/ChangeItem/PostgresqlChangeItem.php
index 3bddc974e7627..cf9359b7f200d 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/src/Joomla/CMS/Schema/ChangeItem/PostgresqlChangeItem.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Schema
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Schema\ChangeItem;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Schema\ChangeItem;
+
 /**
  * Checks the database schema against one PostgreSQL DDL query to see if it has been run.
  *
  * @since  3.0
  */
-class JSchemaChangeitemPostgresql extends JSchemaChangeitem
+class PostgresqlChangeItem extends ChangeItem
 {
 	/**
 	 * Checks a DDL query to see if it is a known type
diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/src/Joomla/CMS/Schema/ChangeItem/SqlsrvChangeItem.php
similarity index 93%
rename from libraries/cms/schema/changeitem/sqlsrv.php
rename to libraries/src/Joomla/CMS/Schema/ChangeItem/SqlsrvChangeItem.php
index 7e3ccbc7c4be9..0f92df1012f9c 100644
--- a/libraries/cms/schema/changeitem/sqlsrv.php
+++ b/libraries/src/Joomla/CMS/Schema/ChangeItem/SqlsrvChangeItem.php
@@ -1,20 +1,23 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Schema
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Schema\ChangeItem;
+
 defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Schema\ChangeItem;
+
 /**
  * Checks the database schema against one SQL Server DDL query to see if it has been run.
  *
  * @since  2.5
  */
-class JSchemaChangeitemSqlsrv extends JSchemaChangeitem
+class SqlsrvChangeItem extends ChangeItem
 {
 	/**
 	 * Checks a DDL query to see if it is a known type
diff --git a/libraries/cms/schema/changeset.php b/libraries/src/Joomla/CMS/Schema/ChangeSet.php
similarity index 81%
rename from libraries/cms/schema/changeset.php
rename to libraries/src/Joomla/CMS/Schema/ChangeSet.php
index a4302ec9e0cde..efbf8e4a53317 100644
--- a/libraries/cms/schema/changeset.php
+++ b/libraries/src/Joomla/CMS/Schema/ChangeSet.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Libraries
- * @subpackage  Schema
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+namespace Joomla\CMS\Schema;
+
 defined('JPATH_PLATFORM') or die;
 
 jimport('joomla.filesystem.folder');
@@ -19,20 +20,20 @@
  *
  * @since  2.5
  */
-class JSchemaChangeset
+class ChangeSet
 {
 	/**
-	 * Array of JSchemaChangeitem objects
+	 * Array of ChangeItem objects
 	 *
-	 * @var    JSchemaChangeitem[]
+	 * @var    ChangeItem[]
 	 * @since  2.5
 	 */
 	protected $changeItems = array();
 
 	/**
-	 * JDatabaseDriver object
+	 * \JDatabaseDriver object
 	 *
-	 * @var    JDatabaseDriver
+	 * @var    \JDatabaseDriver
 	 * @since  2.5
 	 */
 	protected $db = null;
@@ -48,7 +49,7 @@ class JSchemaChangeset
 	/**
 	 * The singleton instance of this object
 	 *
-	 * @var    JSchemaChangeset
+	 * @var    ChangeSet
 	 * @since  3.5.1
 	 */
 	protected static $instance;
@@ -57,8 +58,8 @@ class JSchemaChangeset
 	 * Constructor: builds array of $changeItems by processing the .sql files in a folder.
 	 * The folder for the Joomla core updates is `administrator/components/com_admin/sql/updates/<database>`.
 	 *
-	 * @param   JDatabaseDriver  $db      The current database object
-	 * @param   string           $folder  The full path to the folder containing the update queries
+	 * @param   \JDatabaseDriver  $db      The current database object
+	 * @param   string            $folder  The full path to the folder containing the update queries
 	 *
 	 * @since   2.5
 	 */
@@ -71,7 +72,7 @@ public function __construct($db, $folder = null)
 
 		foreach ($updateQueries as $obj)
 		{
-			$changeItem = JSchemaChangeitem::getInstance($db, $obj->file, $obj->updateQuery);
+			$changeItem = ChangeItem::getInstance($db, $obj->file, $obj->updateQuery);
 
 			if ($changeItem->queryType === 'UTF8CNV')
 			{
@@ -80,9 +81,9 @@ public function __construct($db, $folder = null)
 				{
 					$this->db->setQuery($changeItem->updateQuery)->execute();
 				}
-				catch (RuntimeException $e)
+				catch (\RuntimeException $e)
 				{
-					JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+					\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
 				}
 			}
 			else
@@ -96,7 +97,7 @@ public function __construct($db, $folder = null)
 		if ($this->db->getServerType() == 'mysql')
 		{
 			// Let the update query be something harmless which should always succeed
-			$tmpSchemaChangeItem = JSchemaChangeitem::getInstance(
+			$tmpSchemaChangeItem = ChangeItem::getInstance(
 				$db,
 				'database.php',
 				'UPDATE ' . $this->db->quoteName('#__utf8_conversion')
@@ -132,12 +133,12 @@ public function __construct($db, $folder = null)
 	}
 
 	/**
-	 * Returns a reference to the JSchemaChangeset object, only creating it if it doesn't already exist.
+	 * Returns a reference to the ChangeSet object, only creating it if it doesn't already exist.
 	 *
-	 * @param   JDatabaseDriver  $db      The current database object
-	 * @param   string           $folder  The full path to the folder containing the update queries
+	 * @param   \JDatabaseDriver  $db      The current database object
+	 * @param   string            $folder  The full path to the folder containing the update queries
 	 *
-	 * @return  JSchemaChangeset
+	 * @return  ChangeSet
 	 *
 	 * @since   2.5
 	 */
@@ -145,7 +146,7 @@ public static function getInstance($db, $folder = null)
 	{
 		if (!is_object(static::$instance))
 		{
-			static::$instance = new JSchemaChangeset($db, $folder);
+			static::$instance = new ChangeSet($db, $folder);
 		}
 
 		return static::$instance;
@@ -239,7 +240,7 @@ public function getStatus()
 	public function getSchema()
 	{
 		$updateFiles = $this->getUpdateFiles();
-		$result = new SplFileInfo(array_pop($updateFiles));
+		$result = new \SplFileInfo(array_pop($updateFiles));
 
 		return $result->getBasename('.sql');
 	}
@@ -268,7 +269,7 @@ private function getUpdateFiles()
 			$this->folder = JPATH_ADMINISTRATOR . '/components/com_admin/sql/updates/';
 		}
 
-		return JFolder::files(
+		return \JFolder::files(
 			$this->folder . '/' . $sqlFolder, '\.sql$', 1, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX'), array('^\..*', '.*~'), true
 		);
 	}
@@ -278,7 +279,7 @@ private function getUpdateFiles()
 	 *
 	 * @param   array  $sqlfiles  Array of .sql update filenames.
 	 *
-	 * @return  array  Array of stdClass objects where:
+	 * @return  array  Array of \stdClass objects where:
 	 *                    file=filename,
 	 *                    update_query = text of SQL update query
 	 *
@@ -294,11 +295,11 @@ private function getUpdateQueries(array $sqlfiles)
 			$buffer = file_get_contents($file);
 
 			// Create an array of queries from the sql file
-			$queries = JDatabaseDriver::splitSql($buffer);
+			$queries = \JDatabaseDriver::splitSql($buffer);
 
 			foreach ($queries as $query)
 			{
-				$fileQueries = new stdClass;
+				$fileQueries = new \stdClass;
 				$fileQueries->file = $file;
 				$fileQueries->updateQuery = $query;
 				$result[] = $fileQueries;