diff --git a/db_qbe.php b/db_qbe.php
index 52071b3daf..b31f84ff93 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\SavedSearches;
-use PMA\libraries\Sql;
+use PhpMyAdmin\SavedSearches;
+use PhpMyAdmin\Sql;
 use PMA\libraries\URL;
 
 /**
diff --git a/export.php b/export.php
index a5940fcf73..60c91fcac2 100644
--- a/export.php
+++ b/export.php
@@ -10,7 +10,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Get the variables sent or posted to this script and a core script
diff --git a/import.php b/import.php
index d47f9adbc6..9a963a7db0 100644
--- a/import.php
+++ b/import.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\Encoding;
 use PhpMyAdmin\File;
 use PMA\libraries\plugins\ImportPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\URL;
 
 /* Enable LOAD DATA LOCAL INFILE for LDI plugin */
diff --git a/index.php b/index.php
index c2948b4d43..1759ec0ec0 100644
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\ThemeManager;
 use PMA\libraries\URL;
 
diff --git a/js/messages.php b/js/messages.php
index dc9d64a9ad..aecf237699 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -26,7 +26,7 @@ if (!defined('TESTSUITE')) {
 }
 
 // But this one is needed for Sanitize::escapeJsString()
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 
 $buffer = PhpMyAdmin\OutputBuffering::getInstance();
diff --git a/libraries/Util.php b/libraries/Util.php
index 7afb7d3648..a3033febd6 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ImportPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Lexer;
 use PhpMyAdmin\SqlParser\Parser;
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 1f42732bcf..87c8c47f95 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -12,7 +12,7 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\Template;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 101b4e2efb..3feaa45e68 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -12,7 +12,7 @@ use PMA\libraries\dbi\DBIExtension;
 use PhpMyAdmin\Error;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\LanguageManager;
-use PMA\libraries\SystemDatabase;
+use PhpMyAdmin\SystemDatabase;
 use PMA\libraries\Table;
 use PMA\libraries\Tracker;
 use PMA\libraries\URL;
diff --git a/libraries/classes/DbSearch.php b/libraries/classes/DbSearch.php
index e1b70009e8..34546618f3 100644
--- a/libraries/classes/DbSearch.php
+++ b/libraries/classes/DbSearch.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
 
diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php
index dc313264af..e4d5a711b9 100644
--- a/libraries/classes/DisplayResults.php
+++ b/libraries/classes/DisplayResults.php
@@ -13,8 +13,8 @@ use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Sql;
 use PhpMyAdmin\SqlParser\Utils\Query;
 use PMA\libraries\Table;
 use PMA\libraries\Template;
diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php
index 3b045b636b..5077493223 100644
--- a/libraries/classes/Footer.php
+++ b/libraries/classes/Footer.php
@@ -11,8 +11,8 @@ use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
-use PMA\libraries\Scripts;
+use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Scripts;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
 use Traversable;
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 816ae7815e..4eab447e43 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -14,8 +14,8 @@ use PhpMyAdmin\Menu;
 use PhpMyAdmin\Message;
 use PMA\libraries\navigation\Navigation;
 use PhpMyAdmin\RecentFavoriteTable;
-use PMA\libraries\Sanitize;
-use PMA\libraries\Scripts;
+use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Scripts;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
 
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index 1e11ea5b94..c2d6d57170 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -9,7 +9,7 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\IndexColumn;
 use PhpMyAdmin\Message;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
 
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index 79988d3842..212d5636e4 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\Util;
 
 /**
diff --git a/libraries/classes/Partition.php b/libraries/classes/Partition.php
index 6006cb3041..7f721199eb 100644
--- a/libraries/classes/Partition.php
+++ b/libraries/classes/Partition.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\SubPartition;
+use PhpMyAdmin\SubPartition;
 
 /**
  * base Partition Class
diff --git a/libraries/Sanitize.php b/libraries/classes/Sanitize.php
similarity index 95%
rename from libraries/Sanitize.php
rename to libraries/classes/Sanitize.php
index e05340a5ca..b71705d42b 100644
--- a/libraries/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\Core;
 use PMA\libraries\Util;
@@ -91,7 +91,7 @@ class Sanitize
     public static function replaceBBLink($found)
     {
         /* Check for valid link */
-        if (! Sanitize::checkLink($found[1])) {
+        if (! self::checkLink($found[1])) {
             return $found[0];
         }
         /* a-z and _ allowed in target */
@@ -197,14 +197,14 @@ class Sanitize
 
         /* Find and replace all links */
         $message = preg_replace_callback($pattern, function($match){
-            return Sanitize::replaceBBLink($match);
+            return self::replaceBBLink($match);
         }, $message);
 
         /* Replace documentation links */
         $message = preg_replace_callback(
             '/\[doc@([a-zA-Z0-9_-]+)(@([a-zA-Z0-9_-]*))?\]/',
             function($match){
-                return Sanitize::replaceDocLink($match);
+                return self::replaceDocLink($match);
             },
                 $message
             );
@@ -262,7 +262,7 @@ class Sanitize
     public static function jsFormat($a_string = '', $add_backquotes = true)
     {
         $a_string = htmlspecialchars($a_string);
-        $a_string = Sanitize::escapeJsString($a_string);
+        $a_string = self::escapeJsString($a_string);
         // Needed for inline javascript to prevent some browsers
         // treating it as a anchor
         $a_string = str_replace('#', '\\#', $a_string);
@@ -270,7 +270,7 @@ class Sanitize
         return $add_backquotes
             ? Util::backquote($a_string)
             : $a_string;
-    } // end of the 'Sanitize::jsFormat()' function
+    } // end of the 'jsFormat' function
 
     /**
      * escapes a string to be inserted as string a JavaScript block
@@ -323,7 +323,7 @@ class Sanitize
             return (int)$value;
         }
 
-        return '"' . Sanitize::escapeJsString($value) . '"';
+        return '"' . self::escapeJsString($value) . '"';
     }
 
     /**
@@ -345,11 +345,11 @@ class Sanitize
         } elseif (is_array($value)) {
             $result .= '[';
             foreach ($value as $val) {
-                $result .= Sanitize::formatJsVal($val) . ",";
+                $result .= self::formatJsVal($val) . ",";
             }
             $result .= "];\n";
         } else {
-            $result .= Sanitize::formatJsVal($value) . ";\n";
+            $result .= self::formatJsVal($value) . ";\n";
         }
         return $result;
     }
@@ -365,7 +365,7 @@ class Sanitize
      */
     public static function printJsValue($key, $value)
     {
-        echo Sanitize::getJsValue($key, $value);
+        echo self::getJsValue($key, $value);
     }
 
     /**
@@ -385,7 +385,7 @@ class Sanitize
         if ($addOn) {
             $result .= '$.validator.format(';
         }
-        $result .= Sanitize::formatJsVal($value);
+        $result .= self::formatJsVal($value);
         if ($addOn) {
             $result .= ')';
         }
@@ -408,7 +408,7 @@ class Sanitize
      */
     public static function printJsValueForFormValidation($key, $value, $addOn=false, $comma=true)
     {
-        echo Sanitize::getJsValueForFormValidation($key, $value, $addOn, $comma);
+        echo self::getJsValueForFormValidation($key, $value, $addOn, $comma);
     }
 
     /**
diff --git a/libraries/SavedSearches.php b/libraries/classes/SavedSearches.php
similarity index 99%
rename from libraries/SavedSearches.php
rename to libraries/classes/SavedSearches.php
index 9cd652afaa..221da4f725 100644
--- a/libraries/SavedSearches.php
+++ b/libraries/classes/SavedSearches.php
@@ -5,7 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
+use PhpMyAdmin\Message;
+use PhpMyAdmin\Response;
+use PMA\libraries\Util;
 
 /**
  * Saved searches managing
diff --git a/libraries/Scripts.php b/libraries/classes/Scripts.php
similarity index 99%
rename from libraries/Scripts.php
rename to libraries/classes/Scripts.php
index 551d0102b3..66283bcdd3 100644
--- a/libraries/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -5,11 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\Header;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
 
 /**
  * Collects information about which JavaScript
diff --git a/libraries/ServerStatusData.php b/libraries/classes/ServerStatusData.php
similarity index 99%
rename from libraries/ServerStatusData.php
rename to libraries/classes/ServerStatusData.php
index 52ddf19283..4fa649a61e 100644
--- a/libraries/ServerStatusData.php
+++ b/libraries/classes/ServerStatusData.php
@@ -6,7 +6,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PMA\libraries\URL;
 
@@ -477,7 +477,7 @@ class ServerStatusData
      */
     public static function getHtmlForRefreshList($name,
         $defaultRate = 5,
-        $refreshRates = Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)
+        $refreshRates = array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)
     ) {
         $return = '<select name="' . $name . '" id="id_' . $name
             . '" class="refreshRate">';
@@ -500,4 +500,3 @@ class ServerStatusData
         return $return;
     }
 }
-
diff --git a/libraries/Sql.php b/libraries/classes/Sql.php
similarity index 99%
rename from libraries/Sql.php
rename to libraries/classes/Sql.php
index aa68d5e1c0..5d8c349dc0 100644
--- a/libraries/Sql.php
+++ b/libraries/classes/Sql.php
@@ -5,12 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use PhpMyAdmin\SqlParser\Statements\AlterStatement;
-use PhpMyAdmin\SqlParser\Statements\DropStatement;
-use PhpMyAdmin\SqlParser\Statements\SelectStatement;
-use PhpMyAdmin\SqlParser\Utils\Query;
 use PhpMyAdmin\Bookmark;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
@@ -18,6 +14,10 @@ use PhpMyAdmin\DisplayResults;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\SqlParser\Statements\AlterStatement;
+use PhpMyAdmin\SqlParser\Statements\DropStatement;
+use PhpMyAdmin\SqlParser\Statements\SelectStatement;
+use PhpMyAdmin\SqlParser\Utils\Query;
 use PMA\libraries\Table;
 use PMA\libraries\Transformations;
 use PMA\libraries\URL;
diff --git a/libraries/StorageEngine.php b/libraries/classes/StorageEngine.php
similarity index 98%
rename from libraries/StorageEngine.php
rename to libraries/classes/StorageEngine.php
index 735080eff2..49aca9d1f5 100644
--- a/libraries/StorageEngine.php
+++ b/libraries/classes/StorageEngine.php
@@ -5,11 +5,8 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-/**
- * defines
- */
 use PMA\libraries\engines\Bdb;
 use PMA\libraries\engines\Berkeleydb;
 use PMA\libraries\engines\Binlog;
@@ -22,7 +19,11 @@ use PMA\libraries\engines\Myisam;
 use PMA\libraries\engines\Ndbcluster;
 use PMA\libraries\engines\Pbxt;
 use PMA\libraries\engines\PerformanceSchema;
+use PMA\libraries\Util;
 
+/**
+* defines
+*/
 define('PMA_ENGINE_SUPPORT_NO', 0);
 define('PMA_ENGINE_SUPPORT_DISABLED', 1);
 define('PMA_ENGINE_SUPPORT_YES', 2);
@@ -68,7 +69,7 @@ class StorageEngine
      */
     public function __construct($engine)
     {
-        $storage_engines = StorageEngine::getStorageEngines();
+        $storage_engines = self::getStorageEngines();
         if (! empty($storage_engines[$engine])) {
             $this->engine  = $engine;
             $this->title   = $storage_engines[$engine]['Engine'];
@@ -153,7 +154,7 @@ class StorageEngine
             $output .= '<option value=""></option>';
         }
 
-        foreach (StorageEngine::getStorageEngines() as $key => $details) {
+        foreach (self::getStorageEngines() as $key => $details) {
             // Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5)
             if (! $offerUnavailableEngines
                 && ($details['Support'] == 'NO'
@@ -230,7 +231,7 @@ class StorageEngine
         if ($engine == "PBMS") {
             return true;
         }
-        $storage_engines = StorageEngine::getStorageEngines();
+        $storage_engines = self::getStorageEngines();
         return isset($storage_engines[$engine]);
     }
 
diff --git a/libraries/SubPartition.php b/libraries/classes/SubPartition.php
similarity index 99%
rename from libraries/SubPartition.php
rename to libraries/classes/SubPartition.php
index fda338ceec..229471f844 100644
--- a/libraries/SubPartition.php
+++ b/libraries/classes/SubPartition.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 /**
  * Represents a sub partition of a table
@@ -177,4 +177,4 @@ class SubPartition
     {
         return $this->comment;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/SysInfo.php b/libraries/classes/SysInfo.php
similarity index 86%
rename from libraries/SysInfo.php
rename to libraries/classes/SysInfo.php
index 0339d28fff..70bb0582a0 100644
--- a/libraries/SysInfo.php
+++ b/libraries/classes/SysInfo.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Hold PMA\libraries\SysInfo class
+ * Hold PhpMyAdmin\SysInfo class
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 /**
  * Basic sysinfo class not providing any real data.
  *
- * @package PhpMyAdmin-sysinfo
+ * @package PhpMyAdmin
  */
 class SysInfo
 {
@@ -45,4 +45,4 @@ class SysInfo
     {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/SysInfoLinux.php b/libraries/classes/SysInfoLinux.php
similarity index 91%
rename from libraries/SysInfoLinux.php
rename to libraries/classes/SysInfoLinux.php
index c2afba8b12..c29c2bfd20 100644
--- a/libraries/SysInfoLinux.php
+++ b/libraries/classes/SysInfoLinux.php
@@ -1,18 +1,20 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Hold PMA\libraries\SysInfoLinux class
+ * Hold PhpMyAdmin\SysInfoLinux class
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
+use PhpMyAdmin\SysInfo;
 
 /**
  * Linux based SysInfo class
  *
- * @package PhpMyAdmin-sysinfo
+ * @package PhpMyAdmin
  */
-class SysInfoLinux extends \PMA\libraries\SysInfo
+class SysInfoLinux extends SysInfo
 {
     public $os = 'Linux';
 
diff --git a/libraries/SysInfoSunOS.php b/libraries/classes/SysInfoSunOS.php
similarity index 91%
rename from libraries/SysInfoSunOS.php
rename to libraries/classes/SysInfoSunOS.php
index bca40cae81..f24cd71307 100644
--- a/libraries/SysInfoSunOS.php
+++ b/libraries/classes/SysInfoSunOS.php
@@ -1,18 +1,20 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Hold PMA\libraries\SysInfoSunOS class
+ * Hold PhpMyAdmin\SysInfoSunOS class
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
+use PhpMyAdmin\SysInfo;
 
 /**
  * SunOS based SysInfo class
  *
- * @package PhpMyAdmin-sysinfo
+ * @package PhpMyAdmin
  */
-class SysInfoSunOS extends \PMA\libraries\SysInfo
+class SysInfoSunOS extends SysInfo
 {
     public $os = 'SunOS';
 
@@ -77,4 +79,4 @@ class SysInfoSunOS extends \PMA\libraries\SysInfo
 
         return $mem;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/SysInfoWINNT.php b/libraries/classes/SysInfoWINNT.php
similarity index 94%
rename from libraries/SysInfoWINNT.php
rename to libraries/classes/SysInfoWINNT.php
index c56ddbb09e..ae23d41ace 100644
--- a/libraries/SysInfoWINNT.php
+++ b/libraries/classes/SysInfoWINNT.php
@@ -1,20 +1,21 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Hold PMA\libraries\SysInfoWINNT class
+ * Hold PhpMyAdmin\SysInfoWINNT class
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use COM;
+use PhpMyAdmin\SysInfo;
 
 /**
  * Windows NT based SysInfo class
  *
- * @package PhpMyAdmin-sysinfo
+ * @package PhpMyAdmin
  */
-class SysInfoWINNT extends \PMA\libraries\SysInfo
+class SysInfoWINNT extends SysInfo
 {
     private $_wmi;
     public $os = 'WINNT';
diff --git a/libraries/SystemDatabase.php b/libraries/classes/SystemDatabase.php
similarity index 96%
rename from libraries/SystemDatabase.php
rename to libraries/classes/SystemDatabase.php
index df5976a4e7..00cb8403a4 100644
--- a/libraries/SystemDatabase.php
+++ b/libraries/classes/SystemDatabase.php
@@ -1,20 +1,21 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\SystemDatabase class
+ * hold PhpMyAdmin\SystemDatabase class
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
+use PMA\libraries\Util;
 
 require_once 'libraries/database_interface.inc.php';
 
 /**
  * Class SystemDatabase
  *
- * @package PMA
+ * @package PhpMyAdmin
  */
 class SystemDatabase
 {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index dc4f18a19d..763c6c5fed 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -386,7 +386,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
          * or is not provided
          */
         $whitelist = array('ajax_request');
-        PMA\libraries\Sanitize::removeRequestVars($whitelist);
+        PhpMyAdmin\Sanitize::removeRequestVars($whitelist);
     }
 }
 
diff --git a/libraries/config/FormDisplay.php b/libraries/config/FormDisplay.php
index 1dbd458756..f4153f6928 100644
--- a/libraries/config/FormDisplay.php
+++ b/libraries/config/FormDisplay.php
@@ -14,7 +14,7 @@
  */
 namespace PMA\libraries\config;
 
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Core libraries.
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 1e0b3336d9..17474e9940 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -8,7 +8,7 @@
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Displays top part of the form
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 5afeabd9fc..b7b48d5727 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Returns sanitized language string, taking into account our special codes
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 0769533d9a..d9d8562367 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -20,7 +20,7 @@ use PMA\libraries\Template;
 use PMA\libraries\Tracker;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 require_once 'libraries/display_create_table.lib.php';
 require_once 'libraries/config/messages.inc.php';
diff --git a/libraries/controllers/server/ServerEnginesController.php b/libraries/controllers/server/ServerEnginesController.php
index 5f29a91894..da9b32f0f7 100644
--- a/libraries/controllers/server/ServerEnginesController.php
+++ b/libraries/controllers/server/ServerEnginesController.php
@@ -10,7 +10,7 @@
 namespace PMA\libraries\controllers\server;
 
 use PMA\libraries\controllers\Controller;
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 
diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php
index 6ab0e6986a..a1551f9616 100644
--- a/libraries/controllers/table/TableSearchController.php
+++ b/libraries/controllers/table/TableSearchController.php
@@ -10,7 +10,7 @@ namespace PMA\libraries\controllers\table;
 
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php
index f93ee83b3d..7ea93cf3bd 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/controllers/table/TableStructureController.php
@@ -17,7 +17,7 @@ use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\Table;
 use PMA\libraries\Template;
 use PMA\libraries\Transformations;
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index f7a940c77c..00ea863195 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -15,7 +15,7 @@ use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Prints Html For Display Import Hidden Input
diff --git a/libraries/engines/Bdb.php b/libraries/engines/Bdb.php
index 6c28ae3ba4..e99b84aefe 100644
--- a/libraries/engines/Bdb.php
+++ b/libraries/engines/Bdb.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The BDB storage engine
diff --git a/libraries/engines/Binlog.php b/libraries/engines/Binlog.php
index 0012f8525c..11d31f09df 100644
--- a/libraries/engines/Binlog.php
+++ b/libraries/engines/Binlog.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The binary log storage engine
diff --git a/libraries/engines/Innodb.php b/libraries/engines/Innodb.php
index 88eb4eb990..106a237fe6 100644
--- a/libraries/engines/Innodb.php
+++ b/libraries/engines/Innodb.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 use PMA\libraries\Util;
 
 /**
diff --git a/libraries/engines/Memory.php b/libraries/engines/Memory.php
index b4e8824891..de655b954c 100644
--- a/libraries/engines/Memory.php
+++ b/libraries/engines/Memory.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The MEMORY (HEAP) storage engine
diff --git a/libraries/engines/Merge.php b/libraries/engines/Merge.php
index dc9553a753..c765712774 100644
--- a/libraries/engines/Merge.php
+++ b/libraries/engines/Merge.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The MERGE storage engine
diff --git a/libraries/engines/Myisam.php b/libraries/engines/Myisam.php
index 7dff629eea..18ec5669c6 100644
--- a/libraries/engines/Myisam.php
+++ b/libraries/engines/Myisam.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The MyISAM storage engine
diff --git a/libraries/engines/Ndbcluster.php b/libraries/engines/Ndbcluster.php
index cbf1fc754b..de241f03ba 100644
--- a/libraries/engines/Ndbcluster.php
+++ b/libraries/engines/Ndbcluster.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The NDBCLUSTER storage engine
diff --git a/libraries/engines/Pbxt.php b/libraries/engines/Pbxt.php
index e7a033ed04..f4a7baf151 100644
--- a/libraries/engines/Pbxt.php
+++ b/libraries/engines/Pbxt.php
@@ -9,7 +9,7 @@ namespace PMA\libraries\engines;
 
 use PMA;
 use PhpMyAdmin\Core;
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The PBXT storage engine
diff --git a/libraries/engines/PerformanceSchema.php b/libraries/engines/PerformanceSchema.php
index 46909f9c08..61486a0354 100644
--- a/libraries/engines/PerformanceSchema.php
+++ b/libraries/engines/PerformanceSchema.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 /**
  * The performance schema storage engine
diff --git a/libraries/error.inc.php b/libraries/error.inc.php
index 9067bc27f6..cbec5a3725 100644
--- a/libraries/error.inc.php
+++ b/libraries/error.inc.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 5043571bbe..a3080f16c9 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -12,7 +12,7 @@ use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
 use PhpMyAdmin\ZipFile;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 
 /**
diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php
index 37f668f580..d6bc173761 100644
--- a/libraries/gis/GISVisualization.php
+++ b/libraries/gis/GISVisualization.php
@@ -11,7 +11,7 @@ namespace PMA\libraries\gis;
 use PhpMyAdmin\Core;
 use PMA\libraries\Util;
 use \TCPDF;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Handles visualization of GIS data
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 794ffc5358..781ecc6bc0 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -8,7 +8,7 @@
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\Transformations;
 use PMA\libraries\URL;
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 10aeb2a2c8..4921e462ea 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index 3ee9013c5b..a80784805d 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -8,7 +8,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\Table;
 use PMA\libraries\Transformations;
 use PMA\libraries\URL;
diff --git a/libraries/navigation/NavigationHeader.php b/libraries/navigation/NavigationHeader.php
index 65839a65dc..fa2cc6386c 100644
--- a/libraries/navigation/NavigationHeader.php
+++ b/libraries/navigation/NavigationHeader.php
@@ -10,7 +10,7 @@ namespace PMA\libraries\navigation;
 use PMA;
 use PMA\libraries\Template;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * This class renders the logo, links, server selection,
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index bcd33b51a4..5c4bdc1974 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\Partition;
 use PMA\libraries\plugins\export\ExportSql;
 use PhpMyAdmin\Response;
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/plugins/AuthenticationPlugin.php
index 37e5b6c9a1..0eebf5fe51 100644
--- a/libraries/plugins/AuthenticationPlugin.php
+++ b/libraries/plugins/AuthenticationPlugin.php
@@ -8,7 +8,7 @@
 namespace PMA\libraries\plugins;
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\URL;
 
 /**
diff --git a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
index 360702d3b9..894d29a8b5 100644
--- a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
@@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Provides common methods for all of the date format transformations plugins.
diff --git a/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php b/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
index 2da197d029..5d9a143644 100644
--- a/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
@@ -9,7 +9,7 @@
 namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php b/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
index 52dba5342b..0cd5d02081 100644
--- a/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
@@ -9,7 +9,7 @@
 namespace PMA\libraries\plugins\transformations\abs;
 
 use PMA\libraries\plugins\TransformationsPlugin;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php
index ea485f9565..cad682538f 100644
--- a/libraries/server_status.lib.php
+++ b/libraries/server_status.lib.php
@@ -7,7 +7,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 /**
  * Prints server status information: processes, connections and traffic
diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index c828fce1f4..20318209c7 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -7,7 +7,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Util;
 
 /**
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index 86f0895c7d..6be36e8d45 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -8,7 +8,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
 
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index 270a752940..1eea51a72c 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -7,7 +7,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 /**
  * Returns the html content for the query statistics
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index bf05faefc6..4b1b314986 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -7,7 +7,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\URL;
 
 /**
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index 27235ef2de..d53edc1868 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -13,6 +13,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+use PhpMyAdmin\SysInfo;
+
 define(
     'MEMORY_REGEXP',
     '/^(MemTotal|MemFree|Cached|Buffers|SwapCached|SwapTotal|SwapFree):'
@@ -41,7 +43,7 @@ function PMA_getSysInfoOs($php_os = PHP_OS)
 /**
  * Gets sysinfo class mathing current OS
  *
- * @return \PMA\libraries\SysInfo|mixed sysinfo class
+ * @return \PhpMyAdmin\SysInfo|mixed sysinfo class
  */
 function PMA_getSysInfo()
 {
@@ -49,13 +51,13 @@ function PMA_getSysInfo()
     $supported = array('Linux', 'WINNT', 'SunOS');
 
     if (in_array($php_os, $supported)) {
-        $class_name = 'PMA\libraries\SysInfo' . $php_os;
-        /** @var \PMA\libraries\SysInfo $ret */
+        $class_name = 'PhpMyAdmin\SysInfo' . $php_os;
+        /** @var PhpMyAdmin\SysInfo $ret */
         $ret = new $class_name();
         if ($ret->supported()) {
             return $ret;
         }
     }
 
-    return new \PMA\libraries\SysInfo();
+    return new SysInfo();
 }
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 4a75c487a1..85050fdb41 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -11,7 +11,7 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PMA\libraries\Tracker;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Filters tracking entries
diff --git a/libraries/twig/SanitizeExtension.php b/libraries/twig/SanitizeExtension.php
index 277c14082c..d645e1824b 100644
--- a/libraries/twig/SanitizeExtension.php
+++ b/libraries/twig/SanitizeExtension.php
@@ -27,7 +27,7 @@ class SanitizeExtension extends Twig_Extension
         return array(
             new Twig_SimpleFunction(
                 'Sanitize_escapeJsString',
-                'PMA\libraries\Sanitize::escapeJsString',
+                'PhpMyAdmin\Sanitize::escapeJsString',
                 array('is_safe' => array('html'))
             ),
         );
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 6fb6c924ab..2107c6b8bc 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/prefs_manage.php b/prefs_manage.php
index 83d6960ccf..cd85ef6cdd 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -13,7 +13,7 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PMA\libraries\ThemeManager;
 
 /**
diff --git a/server_status.php b/server_status.php
index 837f2c4f59..58c7b3dc66 100644
--- a/server_status.php
+++ b/server_status.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
diff --git a/server_status_advisor.php b/server_status_advisor.php
index 5956ae861b..35ed40261b 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_status_advisor.lib.php';
diff --git a/server_status_monitor.php b/server_status_monitor.php
index 314c079939..2789a0a85a 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
diff --git a/server_status_processes.php b/server_status_processes.php
index 33535a78c9..e58f067c00 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
diff --git a/server_status_queries.php b/server_status_queries.php
index 3f7d5afe41..b0d7fc066e 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -9,7 +9,7 @@
 
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Message;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
diff --git a/server_status_variables.php b/server_status_variables.php
index eb246a0fa2..7ba68d410c 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Message;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/server_common.inc.php';
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 55fe3de9b0..e0b3eb0964 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -12,7 +12,7 @@ use PMA\libraries\config\ServerConfigChecks;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\LanguageManager;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 8b41c56111..f288eb7fc2 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\VersionInformation;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/sql.php b/sql.php
index bd2ada1c0a..0cb8b8fccc 100644
--- a/sql.php
+++ b/sql.php
@@ -9,7 +9,7 @@
  */
 use PMA\libraries\config\PageSettings;
 use PhpMyAdmin\Response;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\URL;
 use PMA\libraries\Util;
 
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 63c3016258..873bb25091 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 use PMA\libraries\URL;
 
 /**
diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml
index bc88f06ad4..3196dd56b2 100644
--- a/templates/columns_definitions/column_definitions_form.phtml
+++ b/templates/columns_definitions/column_definitions_form.phtml
@@ -1,6 +1,6 @@
 <?php
 use PhpMyAdmin\Partition;
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 use PMA\libraries\URL;
 
 ?>
diff --git a/templates/columns_definitions/partitions.phtml b/templates/columns_definitions/partitions.phtml
index ea9f08c8a9..c8fe65f268 100644
--- a/templates/columns_definitions/partitions.phtml
+++ b/templates/columns_definitions/partitions.phtml
@@ -129,7 +129,7 @@ $valueTypeOptions = array('', 'LESS THAN', 'LESS THAN MAXVALUE', 'IN');
                         </td>
                     <?php endif; ?>
                     <td>
-                        <?= PMA\libraries\StorageEngine::getHtmlSelect(
+                        <?= PhpMyAdmin\StorageEngine::getHtmlSelect(
                             $subpartition['prefix'] . '[engine]',
                             null,
                             $subpartition['engine'],
diff --git a/templates/database/structure/table_header.phtml b/templates/database/structure/table_header.phtml
index 39237355c5..e9067d6089 100644
--- a/templates/database/structure/table_header.phtml
+++ b/templates/database/structure/table_header.phtml
@@ -38,7 +38,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
                         'initial_sort_order' => 'DESC'
                     )
                 ); ?>
-                <?= PMA\libraries\Util::showHint(PMA\libraries\Sanitize::sanitize(
+                <?= PMA\libraries\Util::showHint(PhpMyAdmin\Sanitize::sanitize(
                     __('May be approximate. Click on the number to get the exact'
                         . ' count. See [doc@faq3-11]FAQ 3.11[/doc].'))); ?>
             </th>
diff --git a/templates/server/databases/table_row.phtml b/templates/server/databases/table_row.phtml
index 37a90c4c38..eb4f0a9395 100644
--- a/templates/server/databases/table_row.phtml
+++ b/templates/server/databases/table_row.phtml
@@ -56,7 +56,7 @@
     <?php endif; ?>
 
     <td class="tool">
-        <a onclick="PMA_commonActions.setDb('<?= PMA\libraries\Sanitize::jsFormat($current['SCHEMA_NAME']) ?>');"
+        <a onclick="PMA_commonActions.setDb('<?= PhpMyAdmin\Sanitize::jsFormat($current['SCHEMA_NAME']) ?>');"
            href="server_privileges.php<?= \PMA\libraries\URL::getCommon(array('db' => $current['SCHEMA_NAME'], 'checkprivsdb' => $current['SCHEMA_NAME'])); ?>"
            title="<?= htmlspecialchars(sprintf(__('Check privileges for database "%s".'), $current['SCHEMA_NAME'])); ?>">
            <?= \PMA\libraries\Util::getIcon('s_rights.png', __('Check privileges')); ?>
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index b743bf86a4..93bfe86ebf 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -3,7 +3,7 @@ use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 $js_msg = '';
 $this_params = null;
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index 8997ecf9a2..e2c6c3232b 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -13,7 +13,7 @@ require_once 'test/PMATestCase.php';
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Tests for PhpMyAdmin\Core class
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index 0d4888bd03..a7579b8301 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -145,7 +145,7 @@ class DatabaseInterfaceTest extends PMATestCase
     public function testGetSystemDatabase()
     {
         $sd = $this->_dbi->getSystemDatabase();
-        $this->assertInstanceOf('PMA\libraries\SystemDatabase', $sd);
+        $this->assertInstanceOf('PhpMyAdmin\SystemDatabase', $sd);
     }
 
     /**
diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php
index 7a9fc853f4..fcae9152b4 100644
--- a/test/classes/SanitizeTest.php
+++ b/test/classes/SanitizeTest.php
@@ -8,7 +8,7 @@
 /*
  * Include to test
  */
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 
 /**
  * Tests for methods in Sanitize class
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index 6b89820f65..b5a67c6d89 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 
-use PMA\libraries\Scripts;
+use PhpMyAdmin\Scripts;
 
 require_once 'test/PMATestCase.php';
 
@@ -63,7 +63,7 @@ class ScriptsTest extends PMATestCase
      */
     private function _callPrivateFunction($name, $params)
     {
-        $class = new ReflectionClass('PMA\libraries\Scripts');
+        $class = new ReflectionClass(Scripts::class);
         $method = $class->getMethod($name);
         $method->setAccessible(true);
         return $method->invokeArgs($this->object, $params);
diff --git a/test/classes/ServerStatusDataTest.php b/test/classes/ServerStatusDataTest.php
index c2c7103c04..dbdcc0daf1 100644
--- a/test/classes/ServerStatusDataTest.php
+++ b/test/classes/ServerStatusDataTest.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index 772ee114fc..2f436ea613 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\Sql
+ * Tests for PhpMyAdmin\Sql
  *
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Sql;
+use PhpMyAdmin\Sql;
 
 /**
- * Tests for PMA\libraries\Sql
+ * Tests for PhpMyAdmin\Sql
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 2a2f7d81ae..ace3620462 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -5,7 +5,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 
 require_once 'test/PMATestCase.php';
 /*
@@ -37,7 +37,7 @@ class StorageEngineTest extends PMATestCase
     {
         $GLOBALS['server'] = 1;
         $this->object = $this->getMockForAbstractClass(
-            'PMA\libraries\StorageEngine', array('dummy')
+            'PhpMyAdmin\StorageEngine', array('dummy')
         );
     }
 
@@ -125,7 +125,7 @@ class StorageEngineTest extends PMATestCase
     public function providerGetEngine()
     {
         return array(
-            array('PMA\libraries\StorageEngine', 'unknown engine'),
+            array('PhpMyAdmin\StorageEngine', 'unknown engine'),
             array('PMA\libraries\engines\Bdb', 'Bdb'),
             array('PMA\libraries\engines\Berkeleydb', 'Berkeleydb'),
             array('PMA\libraries\engines\Binlog', 'Binlog'),
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index 420fd67044..d342062875 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -66,7 +66,7 @@ class SystemDatabaseTest extends PMATestCase
                 )
             );
 
-        $this->sysDb = new PMA\libraries\SystemDatabase($dbi);
+        $this->sysDb = new PhpMyAdmin\SystemDatabase($dbi);
     }
 
     /**
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php
index 199a8426ad..ca5cec79e8 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/controllers/ServerEnginesControllerTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\StorageEngine;
+use PhpMyAdmin\StorageEngine;
 use PMA\libraries\Theme;
 use PMA\libraries\controllers\server\ServerEnginesController;
 use PMA\libraries\URL;
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 244ef47944..6ce9d1009a 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -1835,7 +1835,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         $_REQUEST['insert_rows'] = 5;
         $GLOBALS['cfg']['InsertRows'] = 2;
 
-        $scriptsMock = $this->getMockBuilder('PMA\libraries\Scripts')
+        $scriptsMock = $this->getMockBuilder('PhpMyAdmin\Scripts')
             ->disableOriginalConstructor()
             ->setMethods(array('addFile'))
             ->getMock();
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index 6b6f41b6e5..ebc7b489cf 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Theme;
 
 require_once 'libraries/server_status_advisor.lib.php';
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 39427ab558..ee0fedee7f 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Theme;
 
 require_once 'libraries/server_status_monitor.lib.php';
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index 1926a21f83..7e7c607cc7 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Theme;
 
 require_once 'libraries/server_status_queries.lib.php';
diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php
index 6d0447365f..753d8f238d 100644
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Theme;
 
 require_once 'libraries/server_status.lib.php';
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 8b49d05157..97d9816a98 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ServerStatusData;
+use PhpMyAdmin\ServerStatusData;
 use PMA\libraries\Theme;
 
 require_once 'libraries/server_status_variables.lib.php';
diff --git a/test/libraries/sysinfo_test.php b/test/libraries/sysinfo_test.php
index 2d3f66774c..cf94329d7b 100644
--- a/test/libraries/sysinfo_test.php
+++ b/test/libraries/sysinfo_test.php
@@ -55,7 +55,7 @@ class PMA_SysInfoTest extends PHPUnit_Framework_TestCase
      */
     public function testGetSysInfo()
     {
-        $this->assertInstanceOf('PMA\libraries\SysInfo', PMA_getSysInfo());
+        $this->assertInstanceOf('PhpMyAdmin\SysInfo', PMA_getSysInfo());
     }
 
     /**
diff --git a/url.php b/url.php
index 8a3b574f0c..c56ed1f655 100644
--- a/url.php
+++ b/url.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Sanitize;
+use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Response;
 
 /**