diff --git a/libraries/classmap.php b/libraries/classmap.php
index faa6a67c50e48..a744ef3e5add4 100644
--- a/libraries/classmap.php
+++ b/libraries/classmap.php
@@ -148,3 +148,6 @@
 
 JLoader::registerAlias('JVersion',                          '\\Joomla\\CMS\\Version', '4.0');
 
+JLoader::registerAlias('JAuthentication',                   '\\Joomla\\CMS\\Authentication\\Authentication', '4.0');
+JLoader::registerAlias('JAuthenticationResponse',           '\\Joomla\\CMS\\Authentication\\AuthenticationResponse', '4.0');
+
diff --git a/libraries/joomla/authentication/authentication.php b/libraries/src/Joomla/CMS/Authentication/Authentication.php
similarity index 80%
rename from libraries/joomla/authentication/authentication.php
rename to libraries/src/Joomla/CMS/Authentication/Authentication.php
index 062645965237b..3909b3f215770 100644
--- a/libraries/joomla/authentication/authentication.php
+++ b/libraries/src/Joomla/CMS/Authentication/Authentication.php
@@ -1,12 +1,15 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Authentication
+ * 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\Authentication;
+
+use Joomla\CMS\Plugin\PluginHelper;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +17,7 @@
  *
  * @since  11.1
  */
-class JAuthentication extends JObject
+class Authentication extends \JObject
 {
 	// Shared success status
 	/**
@@ -86,7 +89,7 @@ class JAuthentication extends JObject
 	protected $methods = array();
 
 	/**
-	 * @var    JAuthentication  JAuthentication instances container.
+	 * @var    Authentication  Authentication instances container.
 	 * @since  11.3
 	 */
 	protected static $instance;
@@ -98,11 +101,11 @@ class JAuthentication extends JObject
 	 */
 	public function __construct()
 	{
-		$isLoaded = JPluginHelper::importPlugin('authentication');
+		$isLoaded = PluginHelper::importPlugin('authentication');
 
 		if (!$isLoaded)
 		{
-			JLog::add(JText::_('JLIB_USER_ERROR_AUTHENTICATION_LIBRARIES'), JLog::WARNING, 'jerror');
+			\JLog::add(\JText::_('JLIB_USER_ERROR_AUTHENTICATION_LIBRARIES'), \JLog::WARNING, 'jerror');
 		}
 	}
 
@@ -110,7 +113,7 @@ public function __construct()
 	 * Returns the global authentication object, only creating it
 	 * if it doesn't already exist.
 	 *
-	 * @return  JAuthentication  The global JAuthentication object
+	 * @return  Authentication  The global Authentication object
 	 *
 	 * @since   11.1
 	 */
@@ -118,14 +121,14 @@ public static function getInstance()
 	{
 		if (empty(self::$instance))
 		{
-			self::$instance = new JAuthentication;
+			self::$instance = new Authentication;
 		}
 
 		return self::$instance;
 	}
 
 	/**
-	 * Get the state of the JAuthentication object
+	 * Get the state of the Authentication object
 	 *
 	 * @return  mixed    The state of the object.
 	 *
@@ -169,7 +172,7 @@ public function attach($observer)
 		}
 		else
 		{
-			if (!($observer instanceof JAuthentication))
+			if (!($observer instanceof Authentication))
 			{
 				return;
 			}
@@ -186,7 +189,7 @@ public function attach($observer)
 			}
 
 			$this->observers[] = $observer;
-			$methods = array_diff(get_class_methods($observer), get_class_methods('JPlugin'));
+			$methods = array_diff(get_class_methods($observer), get_class_methods('\\JPlugin'));
 		}
 
 		$key = key($this->observers);
@@ -245,24 +248,24 @@ public function detach($observer)
 	 * @param   array  $credentials  Array holding the user credentials.
 	 * @param   array  $options      Array holding user options.
 	 *
-	 * @return  JAuthenticationResponse  Response object with status variable filled in for last plugin or first successful plugin.
+	 * @return  AuthenticationResponse  Response object with status variable filled in for last plugin or first successful plugin.
 	 *
-	 * @see     JAuthenticationResponse
+	 * @see     AuthenticationResponse
 	 * @since   11.1
 	 */
 	public function authenticate($credentials, $options = array())
 	{
 		// Get plugins
-		$plugins = JPluginHelper::getPlugin('authentication');
+		$plugins = PluginHelper::getPlugin('authentication');
 
 		// Create authentication response
-		$response = new JAuthenticationResponse;
+		$response = new AuthenticationResponse;
 
 		/*
 		 * Loop through the plugins and check if the credentials can be used to authenticate
 		 * the user
 		 *
-		 * Any errors raised in the plugin should be returned via the JAuthenticationResponse
+		 * Any errors raised in the plugin should be returned via the AuthenticationResponse
 		 * and handled appropriately.
 		 */
 		foreach ($plugins as $plugin)
@@ -276,7 +279,7 @@ public function authenticate($credentials, $options = array())
 			else
 			{
 				// Bail here if the plugin can't be created
-				JLog::add(JText::sprintf('JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN', $className), JLog::WARNING, 'jerror');
+				\JLog::add(\JText::sprintf('JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN', $className), \JLog::WARNING, 'jerror');
 				continue;
 			}
 
@@ -316,20 +319,20 @@ public function authenticate($credentials, $options = array())
 	/**
 	 * Authorises that a particular user should be able to login
 	 *
-	 * @param   JAuthenticationResponse  $response  response including username of the user to authorise
-	 * @param   array                    $options   list of options
+	 * @param   AuthenticationResponse  $response  response including username of the user to authorise
+	 * @param   array                   $options   list of options
 	 *
-	 * @return  array[JAuthenticationResponse]  results of authorisation
+	 * @return  array[AuthenticationResponse]  results of authorisation
 	 *
 	 * @since  11.2
 	 */
 	public static function authorise($response, $options = array())
 	{
 		// Get plugins in case they haven't been imported already
-		JPluginHelper::importPlugin('user');
+		PluginHelper::importPlugin('user');
 
-		JPluginHelper::importPlugin('authentication');
-		$dispatcher = JEventDispatcher::getInstance();
+		PluginHelper::importPlugin('authentication');
+		$dispatcher = \JEventDispatcher::getInstance();
 		$results = $dispatcher->trigger('onUserAuthorisation', array($response, $options));
 
 		return $results;
diff --git a/libraries/joomla/authentication/response.php b/libraries/src/Joomla/CMS/Authentication/AuthenticationResponse.php
similarity index 87%
rename from libraries/joomla/authentication/response.php
rename to libraries/src/Joomla/CMS/Authentication/AuthenticationResponse.php
index 3deab4d9806b1..90b0a859a6139 100644
--- a/libraries/joomla/authentication/response.php
+++ b/libraries/src/Joomla/CMS/Authentication/AuthenticationResponse.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Authentication
+ * 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\Authentication;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -14,7 +15,7 @@
  *
  * @since  11.1
  */
-class JAuthenticationResponse
+class AuthenticationResponse
 {
 	/**
 	 * Response status (see status codes)
@@ -22,7 +23,7 @@ class JAuthenticationResponse
 	 * @var    string
 	 * @since  11.1
 	 */
-	public $status = JAuthentication::STATUS_FAILURE;
+	public $status = Authentication::STATUS_FAILURE;
 
 	/**
 	 * The type of authentication that was successful