diff --git a/ajax.php b/ajax.php
index db2a310034..ab60b71260 100644
--- a/ajax.php
+++ b/ajax.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 require_once 'libraries/common.inc.php';
 
 $response = Response::getInstance();
diff --git a/browse_foreigners.php b/browse_foreigners.php
index fee84276a2..daba389733 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -24,7 +24,7 @@ foreach ($request_params as $one_request_param) {
     }
 }
 
-PMA\libraries\Util::checkParameters(array('db', 'table', 'field'));
+PhpMyAdmin\Util::checkParameters(array('db', 'table', 'field'));
 
 $response = Response::getInstance();
 $response->getFooter()->setMinimal();
diff --git a/db_central_columns.php b/db_central_columns.php
index 19feb92033..ecb85ad310 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -8,7 +8,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /**
@@ -119,7 +119,7 @@ $response->addHTML($table_navigation_html);
 $columnAdd = PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db);
 $response->addHTML($columnAdd);
 $deleteRowForm = '<form method="post" id="del_form" action="db_central_columns.php">'
-        . URL::getHiddenInputs(
+        . Url::getHiddenInputs(
             $db
         )
         . '<input id="del_col_name" type="hidden" name="col_name" value="">'
diff --git a/db_datadict.php b/db_datadict.php
index 3ca83dbb1c..5cd979e86c 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
@@ -27,7 +27,7 @@ if (! isset($selected_tbl)) {
         $tooltip_truename,
         $tooltip_aliasname,
         $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+    ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 }
 
 $response = Response::getInstance();
@@ -42,12 +42,12 @@ $cfgRelation  = PMA_getRelationsParam();
 /**
  * Check parameters
  */
-PMA\libraries\Util::checkParameters(array('db'));
+PhpMyAdmin\Util::checkParameters(array('db'));
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'db_sql.php' . URL::getCommon(array('db' => $db));
+$err_url = 'db_sql.php' . Url::getCommon(array('db' => $db));
 
 if ($cfgRelation['commwork']) {
     $comment = PMA_getDbComment($db);
@@ -87,7 +87,7 @@ foreach ($tables as $table) {
     $GLOBALS['dbi']->selectDb($db);
     $indexes = $GLOBALS['dbi']->getTableIndexes($db, $table);
     list($primary, $pk_array, $indexes_info, $indexes_data)
-        = PMA\libraries\Util::processIndexData($indexes);
+        = PhpMyAdmin\Util::processIndexData($indexes);
 
     /**
      * Gets columns properties
@@ -130,7 +130,7 @@ foreach ($tables as $table) {
             $row['Null'] = 'NO';
         }
         $extracted_columnspec
-            = PMA\libraries\Util::extractColumnSpec($row['Type']);
+            = PhpMyAdmin\Util::extractColumnSpec($row['Type']);
 
         // reformat mysql query output
         // set or enum types: slashes single quotes inside options
@@ -155,7 +155,7 @@ foreach ($tables as $table) {
         }
         echo '</td>';
         echo '<td'
-            , PMA\libraries\Util::getClassForType(
+            , PhpMyAdmin\Util::getClassForType(
                 $extracted_columnspec['type']
             )
             , ' lang="en" dir="ltr">' , $type , '</td>';
@@ -210,4 +210,4 @@ foreach ($tables as $table) {
 /**
  * Displays the footer
  */
-echo PMA\libraries\Util::getButton();
+echo PhpMyAdmin\Util::getButton();
diff --git a/db_designer.php b/db_designer.php
index 17b7c92690..f95777c57b 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -138,7 +138,7 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 // Embed some data into HTML, later it will be read
 // by pmd/init.js and converted to JS variables.
diff --git a/db_export.php b/db_export.php
index ad5cf43f35..ee496b81be 100644
--- a/db_export.php
+++ b/db_export.php
@@ -23,7 +23,7 @@ $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('export.js');
 
-// $sub_part is used in PMA\libraries\Util::getDbInfo() to see if we are coming from
+// $sub_part is used in PhpMyAdmin\Util::getDbInfo() to see if we are coming from
 // db_export.php, in which case we don't obey $cfg['MaxTableList']
 $sub_part  = '_export';
 require_once 'libraries/db_common.inc.php';
@@ -39,7 +39,7 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 /**
  * Displays the form
diff --git a/db_import.php b/db_import.php
index f9c1cf94d7..59dc5f2532 100644
--- a/db_import.php
+++ b/db_import.php
@@ -35,7 +35,7 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 require 'libraries/display_import.lib.php';
 $response = Response::getInstance();
diff --git a/db_operations.php b/db_operations.php
index 657827ffd8..a65d798aba 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -134,7 +134,7 @@ if (strlen($GLOBALS['db']) > 0
 
             // if someday the RENAME DATABASE reappears, do not DROP
             $local_query = 'DROP DATABASE '
-                . PMA\libraries\Util::backquote($GLOBALS['db']) . ';';
+                . PhpMyAdmin\Util::backquote($GLOBALS['db']) . ';';
             $sql_query .= "\n" . $local_query;
             $GLOBALS['dbi']->query($local_query);
 
@@ -185,7 +185,7 @@ if (strlen($GLOBALS['db']) > 0
         $response->addJSON('newname', $_REQUEST['newname']);
         $response->addJSON(
             'sql_query',
-            PMA\libraries\Util::getMessage(null, $sql_query)
+            PhpMyAdmin\Util::getMessage(null, $sql_query)
         );
         $response->addJSON('db', $GLOBALS['db']);
         exit;
@@ -222,12 +222,12 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 echo "\n";
 
 if (isset($message)) {
-    echo PMA\libraries\Util::getMessage($message, $sql_query);
+    echo PhpMyAdmin\Util::getMessage($message, $sql_query);
     unset($message);
 }
 
@@ -296,8 +296,8 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
     // We only show this if we find something in the new pdf_pages table
     $test_query = '
         SELECT *
-        FROM ' . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
-        . '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages']) . '
+        FROM ' . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db'])
+        . '.' . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages']) . '
         WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($GLOBALS['db'])
         . '\'';
     $test_rs = PMA_queryAsControlUser(
diff --git a/db_qbe.php b/db_qbe.php
index b31f84ff93..a2b1e4a314 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Response;
 use PhpMyAdmin\SavedSearches;
 use PhpMyAdmin\Sql;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * requirements
@@ -120,7 +120,7 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 if ($message_to_display) {
     PhpMyAdmin\Message::error(
@@ -133,7 +133,7 @@ unset($message_to_display);
 // create new qbe search instance
 $db_qbe = new PhpMyAdmin\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
 
-$url = 'db_designer.php' . URL::getCommon(
+$url = 'db_designer.php' . Url::getCommon(
     array_merge(
         $url_params,
         array('query' => 1)
diff --git a/db_search.php b/db_search.php
index d8ce462f81..01cc70e718 100644
--- a/db_search.php
+++ b/db_search.php
@@ -28,7 +28,7 @@ require 'libraries/db_common.inc.php';
 
 // If config variable $GLOBALS['cfg']['UseDbSearch'] is on false : exit.
 if (! $GLOBALS['cfg']['UseDbSearch']) {
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         __('Access denied!'), '', false, $err_url
     );
 } // end if
@@ -50,7 +50,7 @@ if (! $response->isAjax()) {
         $tooltip_truename,
         $tooltip_aliasname,
         $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+    ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 }
 
 // Main search form has been submitted, get results
diff --git a/db_structure.php b/db_structure.php
index ce406f8358..6c4147ff3f 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -10,7 +10,7 @@ namespace PMA;
 
 use PMA\libraries\controllers\database\DatabaseStructureController;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
diff --git a/db_tracking.php b/db_tracking.php
index 1b7d9bbc5b..9facdd6e91 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\Tracker;
+use PhpMyAdmin\Tracker;
 
 /**
  * Run common work
@@ -42,7 +42,7 @@ list(
     $tooltip_truename,
     $tooltip_aliasname,
     $pos
-) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
 // Work to do?
 //  (here, do not use $_REQUEST['db] as it can be crafted)
@@ -113,8 +113,8 @@ $cfgRelation = PMA_getRelationsParam();
 
 // Prepare statement to get HEAD version
 $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
-    PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
-    PMA\libraries\Util::backquote($cfgRelation['tracking']) .
+    PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.' .
+    PhpMyAdmin\Util::backquote($cfgRelation['tracking']) .
     ' WHERE db_name = \'' . $GLOBALS['dbi']->escapeString($_REQUEST['db']) .
     '\' ' .
     ' GROUP BY table_name' .
@@ -147,5 +147,5 @@ if (count($data['ddlog']) > 0) {
         $log .= '# ' . $entry['date'] . ' ' . $entry['username'] . "\n"
             . $entry['statement'] . "\n";
     }
-    echo PMA\libraries\Util::getMessage(__('Database Log'), $log);
+    echo PhpMyAdmin\Util::getMessage(__('Database Log'), $log);
 }
diff --git a/export.php b/export.php
index 60c91fcac2..1775abf6f3 100644
--- a/export.php
+++ b/export.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 /**
@@ -172,7 +172,7 @@ foreach ($post_params as $one_post_param) {
 
 $table = $GLOBALS['table'];
 
-PMA\libraries\Util::checkParameters(array('what', 'export_type'));
+PhpMyAdmin\Util::checkParameters(array('what', 'export_type'));
 
 // sanitize this parameter which will be used below in a file inclusion
 $what = Core::securePath($_POST['what']);
@@ -258,9 +258,9 @@ if ($_REQUEST['output_format'] == 'astext') {
 
 // Generate error url and check for needed variables
 if ($export_type == 'server') {
-    $err_url = 'server_export.php' . URL::getCommon();
+    $err_url = 'server_export.php' . Url::getCommon();
 } elseif ($export_type == 'database' && strlen($db) > 0) {
-    $err_url = 'db_export.php' . URL::getCommon(array('db' => $db));
+    $err_url = 'db_export.php' . Url::getCommon(array('db' => $db));
     // Check if we have something to export
     if (isset($table_select)) {
         $tables = $table_select;
@@ -268,7 +268,7 @@ if ($export_type == 'server') {
         $tables = array();
     }
 } elseif ($export_type == 'table' && strlen($db) > 0 && strlen($table) > 0) {
-    $err_url = 'tbl_export.php' . URL::getCommon(
+    $err_url = 'tbl_export.php' . Url::getCommon(
         array(
             'db' => $db, 'table' => $table
         )
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 09a9a09eb3..f1d93d1e8b 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -10,7 +10,7 @@ use PhpMyAdmin\Core;
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISVisualization;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Escapes special characters if the variable is set.
@@ -28,7 +28,7 @@ function escape($variable)
 require_once 'libraries/common.inc.php';
 
 if (! isset($_REQUEST['field'])) {
-    PMA\libraries\Util::checkParameters(array('field'));
+    PhpMyAdmin\Util::checkParameters(array('field'));
 }
 
 // Get data if any posted
@@ -131,7 +131,7 @@ if (isset($_REQUEST['input_name'])) {
     echo '<input type="hidden" name="input_name" value="'
         , htmlspecialchars($_REQUEST['input_name']) , '" />';
 }
-echo URL::getHiddenInputs();
+echo Url::getHiddenInputs();
 
 echo '<!-- Visualization section -->';
 echo '<div id="placeholder" style="width:450px;height:300px;'
diff --git a/import.php b/import.php
index 9a963a7db0..bea76f5d84 100644
--- a/import.php
+++ b/import.php
@@ -13,7 +13,7 @@ use PhpMyAdmin\File;
 use PMA\libraries\plugins\ImportPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sql;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /* Enable LOAD DATA LOCAL INFILE for LDI plugin */
 if (isset($_POST['format']) && $_POST['format'] == 'ldi') {
@@ -171,7 +171,7 @@ if (! empty($sql_query)) {
         $rename_table_names
     )) {
         $ajax_reload['reload'] = true;
-        $ajax_reload['table_name'] = PMA\libraries\Util::unQuote(
+        $ajax_reload['table_name'] = PhpMyAdmin\Util::unQuote(
             $rename_table_names[2]
         );
     }
@@ -247,7 +247,7 @@ $post_patterns = array(
 Core::setPostAsGlobal($post_patterns);
 
 // Check needed parameters
-PMA\libraries\Util::checkParameters(array('import_type', 'format'));
+PhpMyAdmin\Util::checkParameters(array('import_type', 'format'));
 
 // We don't want anything special in format
 $format = Core::securePath($format);
@@ -278,7 +278,7 @@ if ($import_type == 'table') {
         }
     }
 }
-$err_url = $goto . URL::getCommon($urlparams);
+$err_url = $goto . Url::getCommon($urlparams);
 $_SESSION['Import_message']['go_back_url'] = $err_url;
 // Avoid setting selflink to 'import.php'
 // problem similar to bug 4276
@@ -438,7 +438,7 @@ if (! empty($local_import_file) && ! empty($cfg['UploadDir'])) {
     // sanitize $local_import_file as it comes from a POST
     $local_import_file = Core::securePath($local_import_file);
 
-    $import_file = PMA\libraries\Util::userDir($cfg['UploadDir'])
+    $import_file = PhpMyAdmin\Util::userDir($cfg['UploadDir'])
         . $local_import_file;
 
     /*
@@ -532,11 +532,11 @@ if (! $error) {
     } else {
         // Do the real import
         try {
-            $default_fk_check = PMA\libraries\Util::handleDisableFKCheckInit();
+            $default_fk_check = PhpMyAdmin\Util::handleDisableFKCheckInit();
             $import_plugin->doImport($sql_data);
-            PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check);
+            PhpMyAdmin\Util::handleDisableFKCheckCleanup($default_fk_check);
         } catch (Exception $e) {
-            PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check);
+            PhpMyAdmin\Util::handleDisableFKCheckCleanup($default_fk_check);
             throw $e;
         }
     }
@@ -605,7 +605,7 @@ if ($timeout_passed) {
         $urlparams['local_import_file'] = $local_import_file;
     }
 
-    $importUrl = $err_url = $goto . URL::getCommon($urlparams);
+    $importUrl = $err_url = $goto . Url::getCommon($urlparams);
 
     $message = PhpMyAdmin\Message::error(
         __(
@@ -656,7 +656,7 @@ if ($sqlLength <= $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
 // There was an error?
 if (isset($my_die)) {
     foreach ($my_die as $key => $die) {
-        PMA\libraries\Util::mysqlDie(
+        PhpMyAdmin\Util::mysqlDie(
             $die['error'], $die['sql'], false, $err_url, $error
         );
     }
@@ -689,7 +689,7 @@ if ($go_sql) {
         if (Sql::hasNoRightsToDropDatabase(
             $analyzed_sql_results, $cfg['AllowUserDropDatabase'], $GLOBALS['is_superuser']
         )) {
-            PMA\libraries\Util::mysqlDie(
+            PhpMyAdmin\Util::mysqlDie(
                 __('"DROP DATABASE" statements are disabled.'),
                 '',
                 false,
@@ -755,7 +755,7 @@ if ($go_sql) {
     $response->addJSON('message', PhpMyAdmin\Message::success($msg));
     $response->addJSON(
         'sql_query',
-        PMA\libraries\Util::getMessage($msg, $sql_query, 'success')
+        PhpMyAdmin\Util::getMessage($msg, $sql_query, 'success')
     );
 } else if ($result == false) {
     $response->setRequestStatus(false);
diff --git a/index.php b/index.php
index 1759ec0ec0..1dc5932d6f 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,8 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\ThemeManager;
-use PMA\libraries\URL;
+use PhpMyAdmin\ThemeManager;
+use PhpMyAdmin\Url;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -71,11 +71,11 @@ if (isset($_REQUEST['ajax_request']) && ! empty($_REQUEST['access_time'])) {
 if (! empty($_REQUEST['db'])) {
     $page = null;
     if (! empty($_REQUEST['table'])) {
-        $page = PMA\libraries\Util::getScriptNameForOption(
+        $page = PhpMyAdmin\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabTable'], 'table'
         );
     } else {
-        $page = PMA\libraries\Util::getScriptNameForOption(
+        $page = PhpMyAdmin\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
         );
     }
@@ -110,7 +110,7 @@ $show_query = '1';
 
 // Any message to display?
 if (! empty($message)) {
-    echo PMA\libraries\Util::getMessage($message);
+    echo PhpMyAdmin\Util::getMessage($message);
     unset($message);
 }
 if (isset($_SESSION['partial_logout'])) {
@@ -120,7 +120,7 @@ if (isset($_SESSION['partial_logout'])) {
     unset($_SESSION['partial_logout']);
 }
 
-$common_url_query =  URL::getCommon();
+$common_url_query =  Url::getCommon();
 $mysql_cur_user_and_host = '';
 
 // when $server > 0, a server has been chosen so we can display
@@ -186,7 +186,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
     ) {
         echo '<li id="li_select_server" class="no_bullets" >';
         include_once 'libraries/select_server.lib.php';
-        echo PMA\libraries\Util::getImage('s_host.png') , " "
+        echo PhpMyAdmin\Util::getImage('s_host.png') , " "
             , PMA_selectServer(true, true);
         echo '</li>';
     }
@@ -202,7 +202,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
             if ($cfg['ShowChgPassword']) {
                 $conditional_class = 'ajax';
                 PMA_printListItem(
-                    PMA\libraries\Util::getImage('s_passwd.png') . "&nbsp;" . __(
+                    PhpMyAdmin\Util::getImage('s_passwd.png') . "&nbsp;" . __(
                         'Change password'
                     ),
                     'li_change_password',
@@ -217,12 +217,12 @@ if ($server > 0 || count($cfg['Servers']) > 1
         } // end if
         echo '    <li id="li_select_mysql_collation" class="no_bullets" >';
         echo '        <form method="post" action="index.php">' , "\n"
-           . URL::getHiddenInputs(null, null, 4, 'collation_connection')
+           . Url::getHiddenInputs(null, null, 4, 'collation_connection')
            . '            <label for="select_collation_connection">' . "\n"
-           . '                ' . PMA\libraries\Util::getImage('s_asci.png')
+           . '                ' . PhpMyAdmin\Util::getImage('s_asci.png')
             . "&nbsp;" . __('Server connection collation') . "\n"
            // put the doc link in the form so that it appears on the same line
-           . PMA\libraries\Util::showMySQLDocu('Charset-connection')
+           . PhpMyAdmin\Util::showMySQLDocu('Charset-connection')
            . ': ' .  "\n"
            . '            </label>' . "\n"
 
@@ -249,7 +249,7 @@ $language_manager = LanguageManager::getInstance();
 if (empty($cfg['Lang']) && $language_manager->hasChoice()) {
     echo '<li id="li_select_lang" class="no_bullets">';
 
-    echo PMA\libraries\Util::getImage('s_lang.png') , " "
+    echo PhpMyAdmin\Util::getImage('s_lang.png') , " "
         , $language_manager->getSelectorDisplay();
     echo '</li>';
 }
@@ -258,7 +258,7 @@ if (empty($cfg['Lang']) && $language_manager->hasChoice()) {
 
 if ($GLOBALS['cfg']['ThemeManager']) {
     echo '<li id="li_select_theme" class="no_bullets">';
-    echo PMA\libraries\Util::getImage('s_theme.png') , " "
+    echo PhpMyAdmin\Util::getImage('s_theme.png') , " "
             ,  ThemeManager::getInstance()->getHtmlSelectBox();
     echo '</li>';
 }
@@ -273,7 +273,7 @@ echo '</ul>';
 if ($server > 0) {
     echo '<ul>';
     PMA_printListItem(
-        PMA\libraries\Util::getImage('b_tblops.png') . "&nbsp;" . __(
+        PhpMyAdmin\Util::getImage('b_tblops.png') . "&nbsp;" . __(
             'More settings'
         ),
         'li_user_preferences',
@@ -303,7 +303,7 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
         'li_server_info'
     );
     PMA_printListItem(
-        __('Server type:') . ' ' . PMA\libraries\Util::getServerType(),
+        __('Server type:') . ' ' . PhpMyAdmin\Util::getServerType(),
         'li_server_type'
     );
     PMA_printListItem(
@@ -352,11 +352,11 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
 
             $php_ext_string = __('PHP extension:') . ' ';
 
-            $extensions = PMA\libraries\Util::listPHPExtensions();
+            $extensions = PhpMyAdmin\Util::listPHPExtensions();
 
             foreach ($extensions as $extension) {
                 $php_ext_string  .= '  ' . $extension
-                    . PMA\libraries\Util::showPHPDocu('book.' . $extension . '.php');
+                    . PhpMyAdmin\Util::showPHPDocu('book.' . $extension . '.php');
             }
 
             PMA_printListItem(
@@ -405,7 +405,7 @@ PMA_printListItem(
 PMA_printListItem(
     __('Documentation'),
     'li_pma_docs',
-    PMA\libraries\Util::getDocuLink('index'),
+    PhpMyAdmin\Util::getDocuLink('index'),
     null,
     '_blank'
 );
@@ -435,14 +435,14 @@ PMA_printListItem(
 PMA_printListItem(
     __('List of changes'),
     'li_pma_changes',
-    'changelog.php' . URL::getCommon(),
+    'changelog.php' . Url::getCommon(),
     null,
     '_blank'
 );
 PMA_printListItem(
     __('License'),
     'li_pma_license',
-    'license.php' . URL::getCommon(),
+    'license.php' . Url::getCommon(),
     null,
     '_blank'
 );
@@ -657,7 +657,7 @@ function PMA_printListItem($name, $listId = null, $url = null,
     $mysql_help_page = null, $target = null, $a_id = null, $class = null,
     $a_class = null
 ) {
-    echo PMA\libraries\Template::get('list/item')
+    echo PhpMyAdmin\Template::get('list/item')
         ->render(
             array(
                 'content' => $name,
diff --git a/js/functions.js b/js/functions.js
index 16a7ad2a60..b00813499e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3943,7 +3943,7 @@ function showIndexEditDialog($outer)
 
 /**
  * Function to display tooltips that were
- * generated on the PHP side by PMA\libraries\Util::showHint()
+ * generated on the PHP side by PhpMyAdmin\Util::showHint()
  *
  * @param object $div a div jquery object which specifies the
  *                    domain for searching for tooltips. If we
@@ -4203,7 +4203,7 @@ AJAX.registerOnload('functions.js', function () {
     PMA_init_slider();
 
     /**
-     * Enables the text generated by PMA\libraries\Util::linkOrButton() to be clickable
+     * Enables the text generated by PhpMyAdmin\Util::linkOrButton() to be clickable
      */
     $(document).on('click', 'a.formLinkSubmit', function (e) {
         if (! $(this).hasClass('requireConfirm')) {
diff --git a/js/messages.php b/js/messages.php
index aecf237699..ca3f967d3d 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -748,7 +748,7 @@ echo "var themeCalendarImage = '" , $GLOBALS['pmaThemeImage']
 /* Image path */
 echo "var pmaThemeImage = '" , $GLOBALS['pmaThemeImage'] , "';\n";
 
-echo "var mysql_doc_template = '" , PMA\libraries\Util::getMySQLDocuURL('%s')
+echo "var mysql_doc_template = '" , PhpMyAdmin\Util::getMySQLDocuURL('%s')
     , "';\n";
 
 //Max input vars allowed by PHP.
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index 548713bee9..cc24abdced 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Function to get html for one relational key
@@ -114,7 +114,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
         . 'id="browse_foreign_form" name="browse_foreign_from" '
         . 'action="browse_foreigners.php" method="post">'
         . '<fieldset>'
-        . URL::getHiddenInputs($db, $table)
+        . Url::getHiddenInputs($db, $table)
         . '<input type="hidden" name="field" value="' . htmlspecialchars($field)
         . '" />'
         . '<input type="hidden" name="fieldkey" value="'
@@ -307,7 +307,7 @@ function PMA_getHtmlForGotoPage($foreignData)
     $nbTotalPage = @ceil($foreignData['the_total'] / $session_max_rows);
 
     if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) {
-        $gotopage = PMA\libraries\Util::pageselector(
+        $gotopage = PhpMyAdmin\Util::pageselector(
             'pos',
             $session_max_rows,
             $pageNow,
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 9ec91e08b2..eab70f15fa 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -7,8 +7,8 @@
  */
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Message;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Defines the central_columns parameters for the current user
@@ -615,7 +615,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
     if ($pos - $max_rows >= 0) {
         $table_navigation_html .= '<td>'
             . '<form action="db_central_columns.php" method="post">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="pos" value="' . ($pos - $max_rows) . '" />'
@@ -630,7 +630,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
         $table_navigation_html .= '<td>';
         $table_navigation_html .= '<form action="db_central_columns.php'
             . '" method="post">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>';
@@ -643,7 +643,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
     if ($pos + $max_rows < $total_rows) {
         $table_navigation_html .= '<td>'
             . '<form action="db_central_columns.php" method="post">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="pos" value="' . ($pos + $max_rows) . '" />'
@@ -803,7 +803,7 @@ function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
             __('Add column')
         )
         . '<form id="add_column" action="db_central_columns.php" method="post">'
-        . URL::getHiddenInputs(
+        . Url::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="add_column" value="add">'
@@ -834,7 +834,7 @@ function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
 function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
 {
     $tableHtml = '<tr data-rownum="' . $row_num . '" id="f_' . $row_num . '">'
-        . URL::getHiddenInputs(
+        . Url::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="edit_save" value="save">'
@@ -858,7 +858,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . '<span>' . htmlspecialchars($row['col_name']) . '</span>'
         . '<input name="orig_col_name" type="hidden" '
         . 'value="' . htmlspecialchars($row['col_name']) . '">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
+        . PhpMyAdmin\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -876,7 +876,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
     $tableHtml .=
         '<td name = "col_type" class="nowrap"><span>'
         . htmlspecialchars($row['col_type']) . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
+        . PhpMyAdmin\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'column_number' => $row_num,
@@ -891,7 +891,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         '<td class="nowrap" name="col_length">'
         . '<span>' . ($row['col_length']?htmlspecialchars($row['col_length']):"")
         . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_length')->render(
             array(
                 'column_number' => $row_num,
                 'ci' => 2,
@@ -919,7 +919,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         '<td class="nowrap" name="col_default"><span>' . (isset($row['col_default'])
             ? htmlspecialchars($row['col_default']) : 'None')
         . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
+        . PhpMyAdmin\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -945,7 +945,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         ($row['col_attribute']
             ? htmlspecialchars($row['col_attribute']) : "" )
         . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
+        . PhpMyAdmin\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -961,7 +961,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         '<td class="nowrap" name="col_isNull">'
         . '<span>' . ($row['col_isNull'] ? __('Yes') : __('No'))
         . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
+        . PhpMyAdmin\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'column_number' => $row_num,
@@ -977,7 +977,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
     $tableHtml .=
         '<td class="nowrap" name="col_extra"><span>'
         . htmlspecialchars($row['col_extra']) . '</span>'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_extra')->render(
             array(
                 'column_number' => $row_num,
                 'ci' => 7,
@@ -1006,7 +1006,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . '<input name="orig_col_name[' . $row_num . ']" type="hidden" '
         . 'value="' . htmlspecialchars($row['col_name']) . '">'
         . '<td name="col_name" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
+        . PhpMyAdmin\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1023,7 +1023,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td name = "col_type" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
+        . PhpMyAdmin\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'column_number' => $row_num,
@@ -1036,7 +1036,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_length">'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_length')->render(
             array(
                 'column_number' => $row_num,
                 'ci' => 2,
@@ -1061,7 +1061,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
     }
     $tableHtml .=
         '<td class="nowrap" name="col_default">'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
+        . PhpMyAdmin\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1081,7 +1081,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_attribute">'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
+        . PhpMyAdmin\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => $row_num,
@@ -1097,7 +1097,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . '</td>';
     $tableHtml .=
         '<td class="nowrap" name="col_isNull">'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
+        . PhpMyAdmin\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'column_number' => $row_num,
@@ -1112,7 +1112,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
 
     $tableHtml .=
         '<td class="nowrap" name="col_extra">'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_extra')->render(
             array(
                 'column_number' => $row_num,
                 'ci' => 7,
@@ -1180,7 +1180,7 @@ function PMA_getCentralColumnsListRaw($db, $table)
  */
 function PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir)
 {
-    $html_output = PMA\libraries\Template::get('select_all')
+    $html_output = PhpMyAdmin\Template::get('select_all')
         ->render(
             array(
                 'pma_theme_image' => $pmaThemeImage,
@@ -1263,7 +1263,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
         . '<form id="add_new" class="new_central_col '
         . ($total_rows != 0 ? 'hide"' : '"')
         . 'method="post" action="db_central_columns.php">'
-        . URL::getHiddenInputs(
+        . Url::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="add_new_column" value="add_new_column">'
@@ -1272,7 +1272,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
     $addNewColumn .= '<tr>'
         . '<td></td>'
         . '<td name="col_name" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_name')
+        . PhpMyAdmin\Template::get('columns_definitions/column_name')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1286,7 +1286,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
             )
         . '</td>'
         . '<td name = "col_type" class="nowrap">'
-        . PMA\libraries\Template::get('columns_definitions/column_type')
+        . PhpMyAdmin\Template::get('columns_definitions/column_type')
             ->render(
                 array(
                 'column_number' => 0,
@@ -1298,7 +1298,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
             )
         . '</td>'
         . '<td class="nowrap" name="col_length">'
-        . PMA\libraries\Template::get('columns_definitions/column_length')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_length')->render(
             array(
                 'column_number' => 0,
                 'ci' => 2,
@@ -1309,7 +1309,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
         )
         . '</td>'
         . '<td class="nowrap" name="col_default">'
-        . PMA\libraries\Template::get('columns_definitions/column_default')
+        . PhpMyAdmin\Template::get('columns_definitions/column_default')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1327,7 +1327,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
         )
         . '</td>'
         . '<td class="nowrap" name="col_attribute">'
-        . PMA\libraries\Template::get('columns_definitions/column_attribute')
+        . PhpMyAdmin\Template::get('columns_definitions/column_attribute')
             ->render(
                 array(
                 'columnNumber' => 0,
@@ -1340,7 +1340,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
             )
         . '</td>'
         . '<td class="nowrap" name="col_isNull">'
-        . PMA\libraries\Template::get('columns_definitions/column_null')
+        . PhpMyAdmin\Template::get('columns_definitions/column_null')
             ->render(
                 array(
                 'column_number' => 0,
@@ -1351,7 +1351,7 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
             )
         . '</td>'
         . '<td class="nowrap" name="col_extra">'
-        . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
+        . PhpMyAdmin\Template::get('columns_definitions/column_extra')->render(
             array(
                 'column_number' => 0,
                 'ci' => 7,
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 127031b232..15847bdc78 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -29,7 +29,7 @@ function PMA_getItemsFromShowGrantsRow($row)
         mb_strpos($row, '.', $db_name_offset) - $db_name_offset
     );
 
-    $show_grants_dbname = PMA\libraries\Util::unQuote($show_grants_dbname, '`');
+    $show_grants_dbname = PhpMyAdmin\Util::unQuote($show_grants_dbname, '`');
 
     $show_grants_str    = mb_substr(
         $row,
@@ -45,7 +45,7 @@ function PMA_getItemsFromShowGrantsRow($row)
         $row, $tblname_start_offset,
         $tblname_end_offset - $tblname_start_offset
     );
-    $show_grants_tblname = PMA\libraries\Util::unQuote($show_grants_tblname, '`');
+    $show_grants_tblname = PhpMyAdmin\Util::unQuote($show_grants_tblname, '`');
 
     return array(
         $show_grants_str,
@@ -141,33 +141,33 @@ function PMA_checkRequiredPrivilegesForAdjust(
  */
 function PMA_analyseShowGrant()
 {
-    if (PMA\libraries\Util::cacheExists('is_create_db_priv')) {
-        $GLOBALS['is_create_db_priv'] = PMA\libraries\Util::cacheGet(
+    if (PhpMyAdmin\Util::cacheExists('is_create_db_priv')) {
+        $GLOBALS['is_create_db_priv'] = PhpMyAdmin\Util::cacheGet(
             'is_create_db_priv'
         );
-        $GLOBALS['is_reload_priv'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['is_reload_priv'] = PhpMyAdmin\Util::cacheGet(
             'is_reload_priv'
         );
-        $GLOBALS['db_to_create'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['db_to_create'] = PhpMyAdmin\Util::cacheGet(
             'db_to_create'
         );
-        $GLOBALS['dbs_where_create_table_allowed'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['dbs_where_create_table_allowed'] = PhpMyAdmin\Util::cacheGet(
             'dbs_where_create_table_allowed'
         );
-        $GLOBALS['dbs_to_test'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['dbs_to_test'] = PhpMyAdmin\Util::cacheGet(
             'dbs_to_test'
         );
 
-        $GLOBALS['db_priv'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['db_priv'] = PhpMyAdmin\Util::cacheGet(
             'db_priv'
         );
-        $GLOBALS['col_priv'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['col_priv'] = PhpMyAdmin\Util::cacheGet(
             'col_priv'
         );
-        $GLOBALS['table_priv'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['table_priv'] = PhpMyAdmin\Util::cacheGet(
             'table_priv'
         );
-        $GLOBALS['proc_priv'] = PMA\libraries\Util::cacheGet(
+        $GLOBALS['proc_priv'] = PhpMyAdmin\Util::cacheGet(
             'proc_priv'
         );
 
@@ -244,7 +244,7 @@ function PMA_analyseShowGrant()
                 // this array may contain wildcards
                 $GLOBALS['dbs_where_create_table_allowed'][] = $show_grants_dbname;
 
-                $dbname_to_test = PMA\libraries\Util::backquote($show_grants_dbname);
+                $dbname_to_test = PhpMyAdmin\Util::backquote($show_grants_dbname);
 
                 if ($GLOBALS['is_create_db_priv']) {
                     // no need for any more tests if we already know this
@@ -291,19 +291,19 @@ function PMA_analyseShowGrant()
 
     // must also cacheUnset() them in
     // libraries/plugins/auth/AuthenticationCookie.php
-    PMA\libraries\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']);
-    PMA\libraries\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']);
-    PMA\libraries\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']);
-    PMA\libraries\Util::cacheSet(
+    PhpMyAdmin\Util::cacheSet('is_create_db_priv', $GLOBALS['is_create_db_priv']);
+    PhpMyAdmin\Util::cacheSet('is_reload_priv', $GLOBALS['is_reload_priv']);
+    PhpMyAdmin\Util::cacheSet('db_to_create', $GLOBALS['db_to_create']);
+    PhpMyAdmin\Util::cacheSet(
         'dbs_where_create_table_allowed',
         $GLOBALS['dbs_where_create_table_allowed']
     );
-    PMA\libraries\Util::cacheSet('dbs_to_test', $GLOBALS['dbs_to_test']);
+    PhpMyAdmin\Util::cacheSet('dbs_to_test', $GLOBALS['dbs_to_test']);
 
-    PMA\libraries\Util::cacheSet('proc_priv', $GLOBALS['proc_priv']);
-    PMA\libraries\Util::cacheSet('table_priv', $GLOBALS['table_priv']);
-    PMA\libraries\Util::cacheSet('col_priv', $GLOBALS['col_priv']);
-    PMA\libraries\Util::cacheSet('db_priv', $GLOBALS['db_priv']);
+    PhpMyAdmin\Util::cacheSet('proc_priv', $GLOBALS['proc_priv']);
+    PhpMyAdmin\Util::cacheSet('table_priv', $GLOBALS['table_priv']);
+    PhpMyAdmin\Util::cacheSet('col_priv', $GLOBALS['col_priv']);
+    PhpMyAdmin\Util::cacheSet('db_priv', $GLOBALS['db_priv']);
 } // end function
 
 list($username, $hostname) = $GLOBALS['dbi']->getCurrentUserAndHost();
diff --git a/libraries/classes/Advisor.php b/libraries/classes/Advisor.php
index 7ad674126b..80791aee0c 100644
--- a/libraries/classes/Advisor.php
+++ b/libraries/classes/Advisor.php
@@ -10,8 +10,8 @@ namespace PhpMyAdmin;
 
 use Exception;
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 
 /**
@@ -407,7 +407,7 @@ class Advisor
             // linking to server_variables.php
             $rule['recommendation'] = preg_replace(
                 '/\{([a-z_0-9]+)\}/Ui',
-                '<a href="server_variables.php' . URL::getCommon()
+                '<a href="server_variables.php' . Url::getCommon()
                 . '&filter=\1">\1</a>',
                 $this->translate($rule['recommendation'])
             );
@@ -599,7 +599,7 @@ class Advisor
     }
 
     /**
-     * Wrapper for PMA\libraries\Util::timespanFormat
+     * Wrapper for PhpMyAdmin\Util::timespanFormat
      *
      * This function is used when evaluating advisory_rules.txt
      *
@@ -613,7 +613,7 @@ class Advisor
     }
 
     /**
-     * Wrapper around PMA\libraries\Util::formatByteDown
+     * Wrapper around PhpMyAdmin\Util::formatByteDown
      *
      * This function is used when evaluating advisory_rules.txt
      *
diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php
index ccb1aac599..a4168d1a7e 100644
--- a/libraries/classes/Bookmark.php
+++ b/libraries/classes/Bookmark.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Handles bookmarking SQL queries
diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php
index b757ce6cae..0e16fbf880 100644
--- a/libraries/classes/Charsets.php
+++ b/libraries/classes/Charsets.php
@@ -7,7 +7,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Class used to manage MySQL charsets
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 15514f8972..6d789aee5e 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -11,9 +11,9 @@ use DirectoryIterator;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Error;
 use PhpMyAdmin\LanguageManager;
-use PMA\libraries\ThemeManager;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\ThemeManager;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Indication for error handler (see end of this file).
@@ -1582,7 +1582,7 @@ class Config
     {
         return '<form name="form_fontsize_selection" id="form_fontsize_selection"'
             . ' method="get" action="index.php" class="disableAjax">' . "\n"
-            . URL::getHiddenInputs() . "\n"
+            . Url::getHiddenInputs() . "\n"
             . Config::getFontsizeSelection() . "\n"
             . '</form>';
     }
diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php
index d7419a79b1..d33d968510 100644
--- a/libraries/classes/Console.php
+++ b/libraries/classes/Console.php
@@ -8,8 +8,8 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Bookmark;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 87c8c47f95..aa365ef0d1 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -13,9 +13,9 @@ use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Core class
@@ -682,7 +682,7 @@ class Core
         $params = array();
         $params['url'] = $url;
 
-        $url = URL::getCommon($params);
+        $url = Url::getCommon($params);
         //strip off token and such sensitive information. Just keep url.
         $arr = parse_url($url);
         parse_str($arr["query"], $vars);
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 3feaa45e68..44d95c8031 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -13,10 +13,10 @@ use PhpMyAdmin\Error;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\SystemDatabase;
-use PMA\libraries\Table;
-use PMA\libraries\Tracker;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 require_once './libraries/util.lib.php';
 
@@ -2046,7 +2046,7 @@ class DatabaseInterface
             $error .= $separator . __('The server is not responding.');
         } elseif ($error_number == 1698 ) {
             $error .= ' - ' . $error_message;
-            $error .= $separator . '<a href="logout.php' . URL::getCommon() . '">';
+            $error .= $separator . '<a href="logout.php' . Url::getCommon() . '">';
             $error .= __('Logout and try as another user.') . '</a>';
         } elseif ($error_number == 1005) {
             if (strpos($error_message, 'errno: 13') !== false) {
@@ -2062,7 +2062,7 @@ class DatabaseInterface
                  */
                 $error .= ' - ' . $error_message .
                     ' (<a href="server_engines.php' .
-                    URL::getCommon(
+                    Url::getCommon(
                         array('engine' => 'InnoDB', 'page' => 'Status')
                     ) . '">' . __('Details…') . '</a>)';
             }
diff --git a/libraries/classes/DbQbe.php b/libraries/classes/DbQbe.php
index d1dc8e963e..3e6f4fa530 100644
--- a/libraries/classes/DbQbe.php
+++ b/libraries/classes/DbQbe.php
@@ -9,9 +9,9 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Table;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Class to handle database QBE search
@@ -1563,7 +1563,7 @@ class DbQbe
         if (empty($from_clause)) {
             // Create cartesian product
             $from_clause = implode(
-                ", ", array_map(array('PMA\libraries\Util', 'backquote'), $search_tables)
+                ", ", array_map(array('PhpMyAdmin\Util', 'backquote'), $search_tables)
             );
         }
 
@@ -1669,7 +1669,7 @@ class DbQbe
             if (count($unfinalized) > 0) {
                 // Add these tables as cartesian product before joined tables
                 $join .= implode(
-                    ', ', array_map(array('PMA\libraries\Util', 'backquote'), $unfinalized)
+                    ', ', array_map(array('PhpMyAdmin\Util', 'backquote'), $unfinalized)
                 );
             }
         }
@@ -1831,7 +1831,7 @@ class DbQbe
         $url_params['db'] = $this->_db;
         $url_params['criteriaColumnCount'] = $this->_new_column_count;
         $url_params['rows'] = $this->_new_row_count;
-        $html_output .= URL::getHiddenInputs($url_params);
+        $html_output .= Url::getHiddenInputs($url_params);
         $html_output .= '</fieldset>';
         // get footers
         $html_output .= $this->_getTableFooters();
@@ -1839,7 +1839,7 @@ class DbQbe
         $html_output .= $this->_getTablesList();
         $html_output .= '</form>';
         $html_output .= '<form action="db_qbe.php" method="post" class="lock-page">';
-        $html_output .= URL::getHiddenInputs(array('db' => $this->_db));
+        $html_output .= Url::getHiddenInputs(array('db' => $this->_db));
         // get SQL query
         $html_output .= '<div class="floatleft" style="width:50%">';
         $html_output .= '<fieldset>';
diff --git a/libraries/classes/DbSearch.php b/libraries/classes/DbSearch.php
index 34546618f3..3b97ca771d 100644
--- a/libraries/classes/DbSearch.php
+++ b/libraries/classes/DbSearch.php
@@ -8,8 +8,8 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Class to handle database search
@@ -337,7 +337,7 @@ class DbSearch
         if ($res_cnt > 0) {
             $this_url_params['db'] = htmlspecialchars($GLOBALS['db']);
             $this_url_params['table'] = htmlspecialchars($each_table);
-            $browse_result_path = 'sql.php' . URL::getCommon($this_url_params);
+            $browse_result_path = 'sql.php' . Url::getCommon($this_url_params);
             $html_output .= '<td><a name="browse_search" '
                 . ' class="ajax browse_results" href="'
                 . $browse_result_path . '" '
@@ -371,7 +371,7 @@ class DbSearch
         $html_output .= '<form id="db_search_form"'
             . ' class="ajax lock-page"'
             . ' method="post" action="db_search.php" name="db_search">';
-        $html_output .= URL::getHiddenInputs($GLOBALS['db']);
+        $html_output .= Url::getHiddenInputs($GLOBALS['db']);
         $html_output .= '<fieldset>';
         // set legend caption
         $html_output .= '<legend>' . __('Search in database') . '</legend>';
diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php
index e4d5a711b9..02952ac5d5 100644
--- a/libraries/classes/DisplayResults.php
+++ b/libraries/classes/DisplayResults.php
@@ -16,11 +16,11 @@ use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Sql;
 use PhpMyAdmin\SqlParser\Utils\Query;
-use PMA\libraries\Table;
-use PMA\libraries\Template;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Handle all the functionalities related to displaying results
@@ -747,7 +747,7 @@ class DisplayResults
 
         return '<td>'
             . '<form action="sql.php" method="post" ' . $onsubmit . '>'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '<input type="hidden" name="sql_query" value="'
@@ -802,7 +802,7 @@ class DisplayResults
             //<form> to keep the form alignment of button < and <<
             // and also to know what to execute when the selector changes
             $table_navigation_html .= '<form action="sql.php" method="post">';
-            $table_navigation_html .= URL::getHiddenInputs($_url_params);
+            $table_navigation_html .= Url::getHiddenInputs($_url_params);
 
             $table_navigation_html .= Util::pageselector(
                 'pos',
@@ -949,7 +949,7 @@ class DisplayResults
                 . ')'
             . '">';
 
-        $table_navigation_html .= URL::getHiddenInputs(
+        $table_navigation_html .= Url::getHiddenInputs(
             $this->__get('db'), $this->__get('table')
         );
 
@@ -1021,7 +1021,7 @@ class DisplayResults
         return "\n"
             . '<td>'
             . '<form action="sql.php" method="post">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '<input type="hidden" name="sql_query" value="'
@@ -1300,7 +1300,7 @@ class DisplayResults
         $table_headers_html .= '<input class="save_cells_at_once" type="hidden"'
             . ' value="' . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />'
             . '<div class="common_hidden_inputs">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '</div>';
@@ -1434,11 +1434,11 @@ class DisplayResults
 
         $drop_down_html .= '<form action="sql.php" method="post" ' .
             'class="print_ignore">' . "\n"
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             // to avoid calling Sql::handleSortOrder() later
-            . URL::getHiddenFields(array('sort_by_key' => '1'))
+            . Url::getHiddenFields(array('sort_by_key' => '1'))
             . __('Sort by key')
             . ': <select name="sql_query" class="autosubmit">' . "\n";
 
@@ -1719,7 +1719,7 @@ class DisplayResults
             'display_options_form' => 1
         );
 
-        $options_html .= URL::getHiddenInputs($url_params)
+        $options_html .= Url::getHiddenInputs($url_params)
             . '<br />'
             . Util::getDivForSliderEffect(
                 '', __('Options')
@@ -1859,7 +1859,7 @@ class DisplayResults
 
         $tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="'
                      . $tmp_txt . '" title="' . $tmp_txt . '" />';
-        $tmp_url = 'sql.php' . URL::getCommon($url_params_full_text);
+        $tmp_url = 'sql.php' . Url::getCommon($url_params_full_text);
 
         return Util::linkOrButton(
             $tmp_url, $tmp_image, array(), false
@@ -1893,7 +1893,7 @@ class DisplayResults
             $form_html .= ' class="ajax" ';
 
             $form_html .= '>'
-                . URL::getHiddenInputs(
+                . Url::getHiddenInputs(
                     $this->__get('db'), $this->__get('table'), 1
                 )
                 . '<input type="hidden" name="goto" value="sql.php" />';
@@ -2025,8 +2025,8 @@ class DisplayResults
             'session_max_rows'   => $session_max_rows,
             'is_browse_distinct' => $this->__get('is_browse_distinct'),
         );
-        $single_order_url  = 'sql.php' . URL::getCommon($_single_url_params);
-        $multi_order_url = 'sql.php' . URL::getCommon($_multi_url_params);
+        $single_order_url  = 'sql.php' . Url::getCommon($_single_url_params);
+        $multi_order_url = 'sql.php' . Url::getCommon($_multi_url_params);
 
         // Displays the sorting URL
         // enable sort order swapping for image
@@ -2299,10 +2299,10 @@ class DisplayResults
     /**
      * Get sort order link
      *
-     * @param string  $order_img       the sort order image
-     * @param array   $fields_meta     set of field properties
-     * @param string  $order_url       the url for sort
-     * @param string  $multi_order_url the url for sort
+     * @param string $order_img       the sort order image
+     * @param array  $fields_meta     set of field properties
+     * @param string $order_url       the url for sort
+     * @param string $multi_order_url the url for sort
      *
      * @return  string                      the sort order link
      *
@@ -3165,7 +3165,7 @@ class DisplayResults
                 $_url_params['sql_query'] = $url_sql_query;
             }
 
-            $transform_options['wrapper_link'] = URL::getCommon($_url_params);
+            $transform_options['wrapper_link'] = Url::getCommon($_url_params);
 
             $display_params = $this->__get('display_params');
 
@@ -3284,7 +3284,7 @@ class DisplayResults
         $divider = strpos($link_relations['default_page'], '?') ? '&' : '?';
         if (empty($link_relations['link_dependancy_params'])) {
             return $link_relations['default_page']
-                . URL::getCommonRaw($linking_url_params, $divider);
+                . Url::getCommonRaw($linking_url_params, $divider);
         }
 
         foreach ($link_relations['link_dependancy_params'] as $new_param) {
@@ -3308,7 +3308,7 @@ class DisplayResults
         }
 
         return $link_relations['default_page']
-            . URL::getCommonRaw($linking_url_params, $divider);
+            . Url::getCommonRaw($linking_url_params, $divider);
     }
 
 
@@ -3473,12 +3473,12 @@ class DisplayResults
             );
 
         $edit_url = 'tbl_change.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 $_url_params + array('default_action' => 'update')
             );
 
         $copy_url = 'tbl_change.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 $_url_params + array('default_action' => 'insert')
             );
 
@@ -3532,7 +3532,7 @@ class DisplayResults
                 'goto'      => (empty($goto) ? 'tbl_sql.php' : $goto),
             );
 
-            $lnk_goto = 'sql.php' . URL::getCommonRaw($_url_params);
+            $lnk_goto = 'sql.php' . Url::getCommonRaw($_url_params);
 
             $del_query = 'DELETE FROM '
                 . Util::backquote($this->__get('table'))
@@ -3546,7 +3546,7 @@ class DisplayResults
                     'message_to_show' => __('The row has been deleted.'),
                     'goto'      => $lnk_goto,
                 );
-            $del_url  = 'sql.php' . URL::getCommon($_url_params);
+            $del_url  = 'sql.php' . Url::getCommon($_url_params);
 
             $js_conf  = 'DELETE FROM ' . Sanitize::jsFormat($this->__get('table'))
                 . ' WHERE ' . Sanitize::jsFormat($where_clause, false)
@@ -3563,7 +3563,7 @@ class DisplayResults
                     'goto'      => 'index.php',
                 );
 
-            $lnk_goto = 'sql.php' . URL::getCommonRaw($_url_params);
+            $lnk_goto = 'sql.php' . Url::getCommonRaw($_url_params);
 
             $kill = $GLOBALS['dbi']->getKillQuery($row[0]);
 
@@ -3573,7 +3573,7 @@ class DisplayResults
                     'goto'      => $lnk_goto,
                 );
 
-            $del_url  = 'sql.php' . URL::getCommon($_url_params);
+            $del_url  = 'sql.php' . Url::getCommon($_url_params);
             $js_conf  = $kill;
             $del_str = Util::getIcon(
                 'b_drop.png', __('Kill')
@@ -5073,7 +5073,7 @@ class DisplayResults
                     'printview' => '1',
                     'sql_query' => $this->__get('sql_query'),
                 );
-        $url_query = URL::getCommon($_url_params);
+        $url_query = Url::getCommon($_url_params);
 
         if (!$header_shown) {
             $results_operations_html .= $header;
@@ -5138,7 +5138,7 @@ class DisplayResults
             }
 
             $results_operations_html .= Util::linkOrButton(
-                'tbl_export.php' . URL::getCommon($_url_params),
+                'tbl_export.php' . Url::getCommon($_url_params),
                 Util::getIcon(
                     'b_tblexport.png', __('Export'), true
                 ),
@@ -5151,7 +5151,7 @@ class DisplayResults
 
             // prepare chart
             $results_operations_html .= Util::linkOrButton(
-                'tbl_chart.php' . URL::getCommon($_url_params),
+                'tbl_chart.php' . Url::getCommon($_url_params),
                 Util::getIcon(
                     'b_chart.png', __('Display chart'), true
                 ),
@@ -5176,7 +5176,7 @@ class DisplayResults
                 $results_operations_html
                     .= Util::linkOrButton(
                         'tbl_gis_visualization.php'
-                        . URL::getCommon($_url_params),
+                        . Url::getCommon($_url_params),
                         Util::getIcon(
                             'b_globe.gif', __('Visualize GIS data'), true
                         ),
@@ -5321,7 +5321,7 @@ class DisplayResults
             && (!empty($tmpdb) && !empty($meta->orgtable))
         ) {
             $result = '<a href="tbl_get_field.php'
-                . URL::getCommon($url_params)
+                . Url::getCommon($url_params)
                 . '" class="disableAjax">'
                 . $result . '</a>';
         }
@@ -5489,7 +5489,7 @@ class DisplayResults
                 );
 
                 $result .= '<a class="ajax" href="sql.php'
-                    . URL::getCommon($_url_params)
+                    . Url::getCommon($_url_params)
                     . '"' . $title . '>';
 
                 if ($transformation_plugin != $default_function) {
diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
index 5507f07692..531802edad 100644
--- a/libraries/classes/ErrorHandler.php
+++ b/libraries/classes/ErrorHandler.php
@@ -9,7 +9,7 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\Error;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * handling errors
@@ -352,7 +352,7 @@ class ErrorHandler
                 $retval .= ' class="hide"';
             }
             $retval .=  '>';
-            $retval .= URL::getHiddenFields(array(
+            $retval .= Url::getHiddenFields(array(
                 'exception_type' => 'php',
                 'send_error_report' => '1',
             ));
diff --git a/libraries/classes/File.php b/libraries/classes/File.php
index 80b9d9d152..b054d4ddcd 100644
--- a/libraries/classes/File.php
+++ b/libraries/classes/File.php
@@ -10,7 +10,7 @@ namespace PhpMyAdmin;
 use PMA\libraries\config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use PhpMyAdmin\ZipExtension;
 
 /**
diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php
index 5077493223..6416dffa06 100644
--- a/libraries/classes/Footer.php
+++ b/libraries/classes/Footer.php
@@ -13,8 +13,8 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Scripts;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 use Traversable;
 
 /**
@@ -182,7 +182,7 @@ class Footer
         ) {
             $params['single_table'] = $_REQUEST['single_table'];
         }
-        return basename(Core::getenv('SCRIPT_NAME')) . URL::getCommonRaw($params);
+        return basename(Core::getenv('SCRIPT_NAME')) . Url::getCommonRaw($params);
     }
 
     /**
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 4eab447e43..3f37183e8b 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -16,8 +16,8 @@ use PMA\libraries\navigation\Navigation;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\Scripts;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Class used to output the HTTP and HTML headers
@@ -225,7 +225,7 @@ class Header
         }
 
         $params = array(
-            'common_query' => URL::getCommonRaw(),
+            'common_query' => Url::getCommonRaw(),
             'opendb_url' => Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             ),
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index c2d6d57170..2a4e7b3f1f 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -10,8 +10,8 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\IndexColumn;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Index manipulation class
@@ -651,7 +651,7 @@ class Index
         );
         $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
             . 'left;"><form action="tbl_indexes.php" method="post">';
-        $html_output .= URL::getHiddenInputs(
+        $html_output .= Url::getHiddenInputs(
             $GLOBALS['db'], $GLOBALS['table']
         );
         $html_output .= sprintf(
@@ -741,7 +741,7 @@ class Index
                 $r .= '" ' . $row_span . '>'
                    . '    <a class="';
                 $r .= 'ajax';
-                $r .= '" href="tbl_indexes.php' . URL::getCommon($this_params)
+                $r .= '" href="tbl_indexes.php' . Url::getCommon($this_params)
                    . '">' . Util::getIcon('b_edit.png', __('Edit')) . '</a>'
                    . '</td>' . "\n";
                 $this_params = $GLOBALS['url_params'];
@@ -767,7 +767,7 @@ class Index
                     . ' value="' . $js_msg . '" />';
                 $r .= '    <a class="drop_primary_key_index_anchor';
                 $r .= ' ajax';
-                $r .= '" href="sql.php' . URL::getCommon($this_params)
+                $r .= '" href="sql.php' . Url::getCommon($this_params)
                    . '" >'
                    . Util::getIcon('b_drop.png', __('Drop'))  . '</a>'
                    . '</td>' . "\n";
diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
index e5fe91fa0f..3efb25ce95 100644
--- a/libraries/classes/LanguageManager.php
+++ b/libraries/classes/LanguageManager.php
@@ -9,9 +9,9 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Language;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Language selection manager
diff --git a/libraries/classes/ListDatabase.php b/libraries/classes/ListDatabase.php
index 859e1dcd65..fd4cb9d159 100644
--- a/libraries/classes/ListDatabase.php
+++ b/libraries/classes/ListDatabase.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\ListAbstract;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once './libraries/check_user_privileges.lib.php';
 
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index 3861c7e9e2..d214743533 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -8,9 +8,9 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Tracker;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Class for generating the top menu
@@ -208,7 +208,7 @@ class Menu
             Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             ),
-            URL::getCommon(),
+            Url::getCommon(),
             htmlspecialchars($server_info),
             __('Server')
         );
@@ -227,7 +227,7 @@ class Menu
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 ),
-                URL::getCommon(array('db' => $this->_db)),
+                Url::getCommon(array('db' => $this->_db)),
                 htmlspecialchars($this->_db),
                 __('Database')
             );
@@ -261,7 +261,7 @@ class Menu
                     Util::getScriptNameForOption(
                         $GLOBALS['cfg']['DefaultTabTable'], 'table'
                     ),
-                    URL::getCommon(
+                    Url::getCommon(
                         array(
                             'db' => $this->_db, 'table' => $this->_table
                         )
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index 212d5636e4..852b97877b 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * a single message
diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php
index d0911a3ff9..8ab3f1bf99 100644
--- a/libraries/classes/Pdf.php
+++ b/libraries/classes/Pdf.php
@@ -10,7 +10,7 @@ namespace PhpMyAdmin;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use TCPDF;
 use TCPDF_FONTS;
 
diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php
index 2bfa2c816c..0486a8d549 100644
--- a/libraries/classes/RecentFavoriteTable.php
+++ b/libraries/classes/RecentFavoriteTable.php
@@ -8,8 +8,8 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Message;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the recently used and favorite tables.
@@ -188,7 +188,7 @@ class RecentFavoriteTable
                         'table' => $table['table']
                     );
                     $recent_url = 'tbl_recent_favorite.php'
-                        . URL::getCommon($recent_params);
+                        . Url::getCommon($recent_params);
                     $html .= '<a href="' . $recent_url . '">`'
                           . htmlspecialchars($table['db']) . '`.`'
                           . htmlspecialchars($table['table']) . '`</a>';
@@ -206,7 +206,7 @@ class RecentFavoriteTable
                         'remove_favorite' => true
                     );
                     $fav_rm_url = 'db_structure.php'
-                        . URL::getCommon($fav_params);
+                        . Url::getCommon($fav_params);
                     $html .= 'href="' . $fav_rm_url
                         . '" title="' . __("Remove from Favorites")
                         . '" data-favtargetn="'
@@ -220,7 +220,7 @@ class RecentFavoriteTable
                         'table' => $table['table']
                     );
                     $table_url = 'tbl_recent_favorite.php'
-                        . URL::getCommon($fav_params);
+                        . Url::getCommon($fav_params);
                     $html .= '<a href="' . $table_url . '">`'
                         . htmlspecialchars($table['db']) . '`.`'
                         . htmlspecialchars($table['table']) . '`</a>';
@@ -353,7 +353,7 @@ class RecentFavoriteTable
         if ($cfgRelation['favoritework'] && ! isset($_SESSION['tmpval']['favorites_synced'][$server_id])) {
             $params  = array('ajax_request' => true, 'favorite_table' => true,
                 'sync_favorite_tables' => true);
-            $url     = 'db_structure.php' . URL::getCommon($params);
+            $url     = 'db_structure.php' . Url::getCommon($params);
             $retval  = '<a class="hide" id="sync_favorite_tables"';
             $retval .= ' href="' . $url . '"></a>';
         }
@@ -368,7 +368,7 @@ class RecentFavoriteTable
     public static function getHtmlUpdateRecentTables()
     {
         $params  = array('ajax_request' => true, 'recent_table' => true);
-        $url     = 'index.php' . URL::getCommon($params);
+        $url     = 'index.php' . Url::getCommon($params);
         $retval  = '<a class="hide" id="update_recent_tables"';
         $retval .= ' href="' . $url . '"></a>';
         return $retval;
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index b71705d42b..f5317db3cd 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * This class includes various sanitization methods that can be called statically
diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php
index 221da4f725..23ed47a44b 100644
--- a/libraries/classes/SavedSearches.php
+++ b/libraries/classes/SavedSearches.php
@@ -9,7 +9,7 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Saved searches managing
diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index 66283bcdd3..bb502a3a3b 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -9,7 +9,7 @@ namespace PhpMyAdmin;
 
 use PhpMyAdmin\Header;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Collects information about which JavaScript
@@ -47,10 +47,10 @@ class Scripts
         $first_dynamic_scripts = "";
         $dynamic_scripts = "";
         $scripts = array();
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         foreach ($files as $value) {
             if (mb_strpos($value['filename'], ".php") !== false) {
-                $file_name = $value['filename'] . URL::getCommon($value['params'] + array('v' => PMA_VERSION));
+                $file_name = $value['filename'] . Url::getCommon($value['params'] + array('v' => PMA_VERSION));
                 if ($value['before_statics'] === true) {
                     $first_dynamic_scripts
                         .= "<script data-cfasync='false' type='text/javascript' "
@@ -67,7 +67,7 @@ class Scripts
                 $scripts[] = "scripts%5B%5D=" . $value['filename'];
             }
         }
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         $static_scripts = '';
         // Using chunks of 10 files to avoid too long URLs
         // as some servers are set to 512 bytes URL limit
diff --git a/libraries/classes/ServerStatusData.php b/libraries/classes/ServerStatusData.php
index 4fa649a61e..cf1d85d56d 100644
--- a/libraries/classes/ServerStatusData.php
+++ b/libraries/classes/ServerStatusData.php
@@ -8,7 +8,7 @@
  */
 namespace PhpMyAdmin;
 
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * This class provides data about the server status
@@ -144,13 +144,13 @@ class ServerStatusData
         // variable or section name => (name => url)
 
         $links['table'][__('Flush (close) all tables')] = $this->selfUrl
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'flush' => 'TABLES'
                 )
             );
         $links['table'][__('Show open tables')]
-            = 'sql.php' . URL::getCommon(
+            = 'sql.php' . Url::getCommon(
                 array(
                     'sql_query' => 'SHOW OPEN TABLES',
                     'goto' => $this->selfUrl,
@@ -159,7 +159,7 @@ class ServerStatusData
 
         if ($GLOBALS['replication_info']['master']['status']) {
             $links['repl'][__('Show slave hosts')]
-                = 'sql.php' . URL::getCommon(
+                = 'sql.php' . Url::getCommon(
                     array(
                         'sql_query' => 'SHOW SLAVE HOSTS',
                         'goto' => $this->selfUrl,
@@ -175,7 +175,7 @@ class ServerStatusData
 
         $links['qcache'][__('Flush query cache')]
             = $this->selfUrl
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'flush' => 'QUERY CACHE'
                 )
@@ -191,10 +191,10 @@ class ServerStatusData
         $links['Slow_queries']['doc'] = 'slow_query_log';
 
         $links['innodb'][__('Variables')]
-            = 'server_engines.php?' . URL::getCommon(array('engine' => 'InnoDB'));
+            = 'server_engines.php?' . Url::getCommon(array('engine' => 'InnoDB'));
         $links['innodb'][__('InnoDB Status')]
             = 'server_engines.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'engine' => 'InnoDB',
                     'page' => 'Status'
@@ -419,7 +419,7 @@ class ServerStatusData
      */
     public function getMenuHtml()
     {
-        $url_params = URL::getCommon();
+        $url_params = Url::getCommon();
         $items = array(
             array(
                 'name' => __('Server'),
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 5d8c349dc0..b519e0616c 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -18,10 +18,10 @@ 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;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Sql class
@@ -208,7 +208,7 @@ class Sql
                 . htmlspecialchars($_REQUEST['curr_value'])
                 . '</span>'
                 . '<a href="browse_foreigners.php'
-                . URL::getCommon($_url_params) . '"'
+                . Url::getCommon($_url_params) . '"'
                 . 'class="ajax browse_foreign" ' . '>'
                 . __('Browse foreign values')
                 . '</a>';
@@ -241,7 +241,7 @@ class Sql
         if (! empty($profiling_results)) {
             $url_query = isset($url_query)
                 ? $url_query
-                : URL::getCommon(array('db' => $db));
+                : Url::getCommon(array('db' => $db));
 
             $profiling_table = '';
             $profiling_table .= '<fieldset><legend>' . __('Profiling')
@@ -554,7 +554,7 @@ EOT;
             && ! empty($sql_query)
         ) {
             $goto = 'sql.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'db' => $db,
                         'table' => $table,
@@ -567,7 +567,7 @@ EOT;
                 . ' onsubmit="return ! emptyCheckTheField(this,'
                 . '\'bkm_fields[bkm_label]\');"'
                 . ' class="bookmarkQueryForm print_ignore">';
-            $html .= URL::getHiddenInputs();
+            $html .= Url::getHiddenInputs();
             $html .= '<input type="hidden" name="db"'
                 . ' value="' . htmlspecialchars($db) . '" />';
             $html .= '<input type="hidden" name="goto" value="' . $goto . '" />';
diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php
index 49aca9d1f5..bdb420fc2d 100644
--- a/libraries/classes/StorageEngine.php
+++ b/libraries/classes/StorageEngine.php
@@ -19,7 +19,7 @@ use PMA\libraries\engines\Myisam;
 use PMA\libraries\engines\Ndbcluster;
 use PMA\libraries\engines\Pbxt;
 use PMA\libraries\engines\PerformanceSchema;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
 * defines
diff --git a/libraries/classes/SystemDatabase.php b/libraries/classes/SystemDatabase.php
index 00cb8403a4..caf8919263 100644
--- a/libraries/classes/SystemDatabase.php
+++ b/libraries/classes/SystemDatabase.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once 'libraries/database_interface.inc.php';
 
diff --git a/libraries/Table.php b/libraries/classes/Table.php
similarity index 99%
rename from libraries/Table.php
rename to libraries/classes/Table.php
index cdc7bfdfcf..e82f6c2fc6 100644
--- a/libraries/Table.php
+++ b/libraries/classes/Table.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
@@ -16,6 +16,8 @@ use PhpMyAdmin\SqlParser\Components\OptionsArray;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Statements\DropStatement;
+use PhpMyAdmin\SqlParser\Utils\Table as TableUtils;
+use PhpMyAdmin\Util;
 
 /**
  * Handles everything related to tables
@@ -733,7 +735,7 @@ class Table
         $extra, $comment, $virtuality, $expression, $move_to
     ) {
         return Util::backquote($oldcol) . ' '
-        . Table::generateFieldSpec(
+        . self::generateFieldSpec(
             $newcol, $type, $length, $attribute,
             $collation, $null, $default_type, $default_value, $extra,
             $comment, $virtuality, $expression, $move_to
@@ -1261,7 +1263,7 @@ class Table
             'db_name' => $target_db,
             'table_name' => $target_table
         );
-        Table::duplicateInfo(
+        self::duplicateInfo(
             'displaywork',
             'table_info',
             $get_fields,
@@ -1286,7 +1288,7 @@ class Table
             'foreign_db' => $target_db,
             'master_table' => $target_table
         );
-        Table::duplicateInfo(
+        self::duplicateInfo(
             'relwork',
             'relation',
             $get_fields,
@@ -1308,7 +1310,7 @@ class Table
             'foreign_db' => $target_db,
             'foreign_table' => $target_table
         );
-        Table::duplicateInfo(
+        self::duplicateInfo(
             'relwork',
             'relation',
             $get_fields,
@@ -1326,7 +1328,7 @@ class Table
         $get_fields = array('page_descr');
         $where_fields = array('db_name' => $source_db);
         $new_fields = array('db_name' => $target_db);
-        $last_id = Table::duplicateInfo(
+        $last_id = self::duplicateInfo(
             'pdfwork',
             'pdf_pages',
             $get_fields,
@@ -1345,7 +1347,7 @@ class Table
                 'table_name' => $target_table,
                 'pdf_page_number' => $last_id
             );
-            Table::duplicateInfo(
+            self::duplicateInfo(
                 'pdfwork',
                 'table_coords',
                 $get_fields,
@@ -1433,7 +1435,7 @@ class Table
         // Allow whitespaces (not trailing) in $new_name,
         // since we are using $backquoted in getting the fullName of table
         // below to be used in the query
-        if (! Table::isValidName($new_name, true)) {
+        if (! self::isValidName($new_name, true)) {
             $this->errors[] = __('Invalid table name:') . ' '
                 . $new_table->getFullName();
             return false;
@@ -2540,7 +2542,7 @@ class Table
          * @var \PhpMyAdmin\SqlParser\Statements\CreateStatement $stmt
         */
         $stmt = $parser->statements[0];
-        $fields = \PhpMyAdmin\SqlParser\Utils\Table::getFields($stmt);
+        $fields = TableUtils::getFields($stmt);
         if ($column != null) {
             $expression = isset($fields[$column]['expr']) ?
                 substr($fields[$column]['expr'], 1, -1) : '';
diff --git a/libraries/Template.php b/libraries/classes/Template.php
similarity index 98%
rename from libraries/Template.php
rename to libraries/classes/Template.php
index 0670f33a7c..9c7f961061 100644
--- a/libraries/Template.php
+++ b/libraries/classes/Template.php
@@ -1,27 +1,27 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * hold PMA\libraries\Template class
+ * hold PhpMyAdmin\Template class
  *
- * @package PMA\libraries
+ * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use Twig_Environment;
-use Twig_Loader_Filesystem;
 use PMA\libraries\twig\CharsetsExtension;
 use PMA\libraries\twig\I18nExtension;
 use PMA\libraries\twig\MessageExtension;
 use PMA\libraries\twig\SanitizeExtension;
 use PMA\libraries\twig\UrlExtension;
 use PMA\libraries\twig\UtilExtension;
+use Twig_Environment;
+use Twig_Loader_Filesystem;
 
 /**
  * Class Template
  *
  * Handle front end templating
  *
- * @package PMA\libraries
+ * @package PhpMyAdmin
  */
 class Template
 {
diff --git a/libraries/Theme.php b/libraries/classes/Theme.php
similarity index 99%
rename from libraries/Theme.php
rename to libraries/classes/Theme.php
index c7344d9d3d..bd06d483f2 100644
--- a/libraries/Theme.php
+++ b/libraries/classes/Theme.php
@@ -5,9 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use PMA\libraries\URL;
+use PhpMyAdmin\ThemeManager;
+use PhpMyAdmin\Url;
 
 /**
  * handles theme
@@ -456,7 +457,7 @@ class Theme
     public function getPrintPreview()
     {
         $url_params = array('set_theme' => $this->getId());
-        $url = 'index.php' . URL::getCommon($url_params);
+        $url = 'index.php' . Url::getCommon($url_params);
 
         $retval  = '<div class="theme_preview">';
         $retval .= '<h2>';
diff --git a/libraries/ThemeManager.php b/libraries/classes/ThemeManager.php
similarity index 99%
rename from libraries/ThemeManager.php
rename to libraries/classes/ThemeManager.php
index 8c07e9e3bb..bf4bcdfb5b 100644
--- a/libraries/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -5,9 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 /**
  * phpMyAdmin theme manager
@@ -369,7 +370,7 @@ class ThemeManager
         if ($form) {
             $select_box .= '<form name="setTheme" method="post"';
             $select_box .= ' action="index.php" class="disableAjax">';
-            $select_box .= URL::getHiddenInputs();
+            $select_box .= Url::getHiddenInputs();
         }
 
         $theme_preview_path= './themes.php';
diff --git a/libraries/Tracker.php b/libraries/classes/Tracker.php
similarity index 96%
rename from libraries/Tracker.php
rename to libraries/classes/Tracker.php
index 9611632c7f..a865532f70 100644
--- a/libraries/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -5,9 +5,19 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PMA\libraries\plugins\export\ExportSql;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Statements\AlterStatement;
+use PhpMyAdmin\SqlParser\Statements\CreateStatement;
+use PhpMyAdmin\SqlParser\Statements\DeleteStatement;
+use PhpMyAdmin\SqlParser\Statements\DropStatement;
+use PhpMyAdmin\SqlParser\Statements\InsertStatement;
+use PhpMyAdmin\SqlParser\Statements\RenameStatement;
+use PhpMyAdmin\SqlParser\Statements\TruncateStatement;
+use PhpMyAdmin\SqlParser\Statements\UpdateStatement;
+use PhpMyAdmin\Util;
 
 /**
  * This class tracks changes on databases, tables and views.
@@ -628,7 +638,7 @@ class Tracker
         // $parsed_sql = PMA_SQP_parse($query);
         // $sql_info = PMA_SQP_analyze($parsed_sql);
 
-        $parser = new \PhpMyAdmin\SqlParser\Parser($query);
+        $parser = new Parser($query);
 
         $tokens = $parser->list->tokens;
 
@@ -649,7 +659,7 @@ class Tracker
             $result['type'] = 'DDL';
 
             // Parse CREATE statement
-            if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\CreateStatement) {
+            if ($statement instanceof CreateStatement) {
                 if (empty($options) || !isset($options[6])) {
                     return $result;
                 }
@@ -677,7 +687,7 @@ class Tracker
             }
 
             // Parse ALTER statement
-            elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\AlterStatement) {
+            elseif ($statement instanceof AlterStatement) {
                 if (empty($options) || !isset($options[3])) {
                     return $result;
                 }
@@ -694,7 +704,7 @@ class Tracker
             }
 
             // Parse DROP statement
-            elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\DropStatement) {
+            elseif ($statement instanceof DropStatement) {
                 if (empty($options) || !isset($options[1])) {
                     return $result;
                 }
@@ -714,7 +724,7 @@ class Tracker
             }
 
             // Prase RENAME statement
-            elseif ($statement instanceof \PhpMyAdmin\SqlParser\Statements\RenameStatement) {
+            elseif ($statement instanceof RenameStatement) {
                 $result['identifier']               = 'RENAME TABLE';
                 $result['tablename']                = $statement->renames[0]->old->table;
                 $result['tablename_after_rename']   = $statement->renames[0]->new->table;
@@ -730,25 +740,25 @@ class Tracker
             $result['type'] = 'DML';
 
             // Parse UPDATE statement
-            if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\UpdateStatement) {
+            if ($statement instanceof UpdateStatement) {
                 $result['identifier']   = 'UPDATE';
                 $result['tablename']    = $statement->tables[0]->table;
             }
 
             // Parse INSERT INTO statement
-            if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\InsertStatement) {
+            if ($statement instanceof InsertStatement) {
                 $result['identifier']   = 'INSERT';
                 $result['tablename']    = $statement->into->dest->table;
             }
 
             // Parse DELETE statement
-            if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\DeleteStatement) {
+            if ($statement instanceof DeleteStatement) {
                 $result['identifier']   = 'DELETE';
                 $result['tablename']    = $statement->from[0]->table;
             }
 
             // Parse TRUNCATE statement
-            if ($statement instanceof \PhpMyAdmin\SqlParser\Statements\TruncateStatement) {
+            if ($statement instanceof TruncateStatement) {
                 $result['identifier']   = 'TRUNCATE' ;
                 $result['tablename']    = $statement->table->table;
             }
diff --git a/libraries/Transformations.php b/libraries/classes/Transformations.php
similarity index 99%
rename from libraries/Transformations.php
rename to libraries/classes/Transformations.php
index 9581154860..29dc1a703c 100644
--- a/libraries/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -15,10 +15,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Transformations class
diff --git a/libraries/Types.php b/libraries/classes/Types.php
similarity index 99%
rename from libraries/Types.php
rename to libraries/classes/Types.php
index 49416add65..3562f71a3f 100644
--- a/libraries/Types.php
+++ b/libraries/classes/Types.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 /**
  * Generic class holding type definitions.
diff --git a/libraries/TypesMySQL.php b/libraries/classes/TypesMySQL.php
similarity index 99%
rename from libraries/TypesMySQL.php
rename to libraries/classes/TypesMySQL.php
index a1ee7bacb3..0984a1de30 100644
--- a/libraries/TypesMySQL.php
+++ b/libraries/classes/TypesMySQL.php
@@ -5,7 +5,10 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
+
+use PhpMyAdmin\Types;
+use PhpMyAdmin\Util;
 
 /**
  * Class holding type definitions for MySQL.
@@ -536,7 +539,7 @@ class TypesMySQL extends Types
         );
 
         if (PMA_MYSQL_INT_VERSION >= 50708
-            && \PMA\libraries\Util::getServerType() != 'MariaDB'
+            && Util::getServerType() != 'MariaDB'
         ) {
           $ret['JSON'] = array(
               'JSON',
diff --git a/libraries/URL.php b/libraries/classes/Url.php
similarity index 93%
rename from libraries/URL.php
rename to libraries/classes/Url.php
index c26491f8d2..ce3abe98bb 100644
--- a/libraries/URL.php
+++ b/libraries/classes/Url.php
@@ -5,14 +5,14 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 /**
  * Static methods for URL/hidden inputs generating
  *
  * @package PhpMyAdmin
  */
-class URL
+class Url
 {
     /**
      * Generates text with hidden inputs.
@@ -24,7 +24,7 @@ class URL
      * @param string|array $skip   do not generate a hidden field for this parameter
      *                             (can be an array of strings)
      *
-     * @see URL::getCommon()
+     * @see Url::getCommon()
      *
      * @return string   string with input fields
      *
@@ -75,7 +75,7 @@ class URL
             }
         }
 
-        return URL::getHiddenFields($params);
+        return Url::getHiddenFields($params);
     }
 
     /**
@@ -93,7 +93,7 @@ class URL
      *          'b' => 'ccc_b',
      *     ),
      * );
-     * echo URL::getHiddenFields($values);
+     * echo Url::getHiddenFields($values);
      *
      * // produces:
      * <input type="hidden" name="aaa" Value="aaa" />
@@ -123,10 +123,10 @@ class URL
             }
 
             if (is_array($value)) {
-                $fields .= URL::getHiddenFields($value, $name);
+                $fields .= Url::getHiddenFields($value, $name);
             } else {
                 // do not generate an ending "\n" because
-                // URL::getHiddenInputs() is sometimes called
+                // Url::getHiddenInputs() is sometimes called
                 // from a JS document.write()
                 $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
                     . '" value="' . htmlspecialchars($value) . '" />';
@@ -144,7 +144,7 @@ class URL
      * $params['db']      = 'mysql';
      * $params['table']   = 'rights';
      * // note the missing ?
-     * echo 'script.php' . URL::getCommon($params);
+     * echo 'script.php' . Url::getCommon($params);
      * // produces with cookies enabled:
      * // script.php?myparam=myvalue&amp;db=mysql&amp;table=rights
      * // with cookies disabled:
@@ -152,7 +152,7 @@ class URL
      * // &amp;table=rights
      *
      * // note the missing ?
-     * echo 'script.php' . URL::getCommon();
+     * echo 'script.php' . Url::getCommon();
      * // produces with cookies enabled:
      * // script.php
      * // with cookies disabled:
@@ -168,7 +168,7 @@ class URL
     public static function getCommon($params = array(), $divider = '?')
     {
         return htmlspecialchars(
-            URL::getCommonRaw($params, $divider)
+            Url::getCommonRaw($params, $divider)
         );
     }
 
@@ -180,7 +180,7 @@ class URL
      * $params['db']      = 'mysql';
      * $params['table']   = 'rights';
      * // note the missing ?
-     * echo 'script.php' . URL::getCommon($params);
+     * echo 'script.php' . Url::getCommon($params);
      * // produces with cookies enabled:
      * // script.php?myparam=myvalue&amp;db=mysql&amp;table=rights
      * // with cookies disabled:
@@ -188,7 +188,7 @@ class URL
      * // &amp;table=rights
      *
      * // note the missing ?
-     * echo 'script.php' . URL::getCommon();
+     * echo 'script.php' . Url::getCommon();
      * // produces with cookies enabled:
      * // script.php
      * // with cookies disabled:
@@ -203,7 +203,7 @@ class URL
      */
     public static function getCommonRaw($params = array(), $divider = '?')
     {
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
 
         // avoid overwriting when creating navi panel links to servers
         if (isset($GLOBALS['server'])
@@ -275,6 +275,3 @@ class URL
         }
     }
 }
-
-
-
diff --git a/libraries/Util.php b/libraries/classes/Util.php
similarity index 99%
rename from libraries/Util.php
rename to libraries/classes/Util.php
index 9f661b9a03..4a8e71afc8 100644
--- a/libraries/Util.php
+++ b/libraries/classes/Util.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Hold the PMA\libraries\Util class
+ * Hold the PhpMyAdmin\Util class
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
@@ -18,8 +18,8 @@ use PhpMyAdmin\SqlParser\Lexer;
 use PhpMyAdmin\SqlParser\Parser;
 use PhpMyAdmin\SqlParser\Token;
 use PhpMyAdmin\SqlParser\Utils\Error as ParserError;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 use stdClass;
 
 if (! defined('PHPMYADMIN')) {
@@ -609,14 +609,14 @@ class Util
                     $_url_params['db'] = $db;
                     $_url_params['table'] = $table;
                     $doedit_goto = '<a href="tbl_sql.php'
-                        . URL::getCommon($_url_params) . '">';
+                        . Url::getCommon($_url_params) . '">';
                 } elseif (strlen($db) > 0) {
                     $_url_params['db'] = $db;
                     $doedit_goto = '<a href="db_sql.php'
-                        . URL::getCommon($_url_params) . '">';
+                        . Url::getCommon($_url_params) . '">';
                 } else {
                     $doedit_goto = '<a href="server_sql.php'
-                        . URL::getCommon($_url_params) . '">';
+                        . Url::getCommon($_url_params) . '">';
                 }
 
                 $error_msg .= $doedit_goto
@@ -1068,7 +1068,7 @@ class Util
                     $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
                     $explain_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . URL::getCommon($explain_params),
+                            'import.php' . Url::getCommon($explain_params),
                             __('Explain SQL')
                         ) . ']';
                 } elseif (preg_match(
@@ -1079,7 +1079,7 @@ class Util
                         = mb_substr($sql_query, 8);
                     $explain_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . URL::getCommon($explain_params),
+                            'import.php' . Url::getCommon($explain_params),
                             __('Skip Explain SQL')
                         ) . ']';
                     $url = 'https://mariadb.org/explain_analyzer/analyze/'
@@ -1105,7 +1105,7 @@ class Util
             if (! empty($cfg['SQLQuery']['Edit'])
                 && empty($GLOBALS['show_as_php'])
             ) {
-                $edit_link .= URL::getCommon($url_params) . '#querybox';
+                $edit_link .= Url::getCommon($url_params) . '#querybox';
                 $edit_link = ' ['
                     . self::linkOrButton($edit_link, __('Edit'))
                     . ']';
@@ -1120,7 +1120,7 @@ class Util
                 if (! empty($GLOBALS['show_as_php'])) {
                     $php_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . URL::getCommon($url_params),
+                            'import.php' . Url::getCommon($url_params),
                             __('Without PHP code'),
                             array(),
                             true,
@@ -1132,7 +1132,7 @@ class Util
 
                     $php_link .= ' ['
                         . self::linkOrButton(
-                            'import.php' . URL::getCommon($url_params),
+                            'import.php' . Url::getCommon($url_params),
                             __('Submit query'),
                             array(),
                             true,
@@ -1147,7 +1147,7 @@ class Util
                     $_message = __('Create PHP code');
                     $php_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . URL::getCommon($php_params),
+                            'import.php' . Url::getCommon($php_params),
                             $_message
                         )
                         . ']';
@@ -1161,7 +1161,7 @@ class Util
                 && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same
                 && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
             ) {
-                $refresh_link = 'import.php' . URL::getCommon($url_params);
+                $refresh_link = 'import.php' . Url::getCommon($url_params);
                 $refresh_link = ' ['
                     . self::linkOrButton($refresh_link, __('Refresh')) . ']';
             } else {
@@ -1174,7 +1174,7 @@ class Util
 
             $retval .= '<div class="tools print_ignore">';
             $retval .= '<form action="sql.php" method="post">';
-            $retval .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+            $retval .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
             $retval .= '<input type="hidden" name="sql_query" value="'
                 . htmlspecialchars($sql_query) . '" />';
 
@@ -1648,7 +1648,7 @@ class Util
             if (! empty($tab['args']) && is_array($tab['args'])) {
                 $url_params = array_merge($url_params, $tab['args']);
             }
-            $tab['link'] = htmlentities($tab['link']) . URL::getCommon($url_params);
+            $tab['link'] = htmlentities($tab['link']) . Url::getCommon($url_params);
         }
 
         if (! empty($tab['fragment'])) {
@@ -1843,7 +1843,7 @@ class Util
                 }
                 $ret = '<form action="' . $url_parts['path'] . '" class="link"'
                      . ' method="post"' . $target . ' style="display: inline;">';
-                $ret .= URL::getHiddenInputs();
+                $ret .= Url::getHiddenInputs();
                 $subname_open   = '';
                 $subname_close  = '';
                 $submit_link    = '#';
@@ -1904,7 +1904,7 @@ class Util
     public static function splitURLQuery($url)
     {
         // decode encoded url separators
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         // on most places separator is still hard coded ...
         if ($separator !== '&') {
             // ... so always replace & with $separator
@@ -2413,19 +2413,19 @@ class Util
 
                 $_url_params[$name] = 0;
                 $list_navigator_html .= '<a' . $class . $title1 . ' href="' . $script
-                    . URL::getCommon($_url_params) . '">' . $caption1
+                    . Url::getCommon($_url_params) . '">' . $caption1
                     . '</a>';
 
                 $_url_params[$name] = $pos - $max_count;
                 $list_navigator_html .= ' <a' . $class . $title2
-                    . ' href="' . $script . URL::getCommon($_url_params) . '">'
+                    . ' href="' . $script . Url::getCommon($_url_params) . '">'
                     . $caption2 . '</a>';
             }
 
             $list_navigator_html .= '<form action="' . basename($script)
                 . '" method="post">';
 
-            $list_navigator_html .= URL::getHiddenInputs($_url_params);
+            $list_navigator_html .= Url::getHiddenInputs($_url_params);
             $list_navigator_html .= self::pageselector(
                 $name,
                 $max_count,
@@ -2452,7 +2452,7 @@ class Util
 
                 $_url_params[$name] = $pos + $max_count;
                 $list_navigator_html .= '<a' . $class . $title3 . ' href="' . $script
-                    . URL::getCommon($_url_params) . '" >' . $caption3
+                    . Url::getCommon($_url_params) . '" >' . $caption3
                     . '</a>';
 
                 $_url_params[$name] = floor($count / $max_count) * $max_count;
@@ -2461,7 +2461,7 @@ class Util
                 }
 
                 $list_navigator_html .= ' <a' . $class . $title4
-                    . ' href="' . $script . URL::getCommon($_url_params) . '" >'
+                    . ' href="' . $script . Url::getCommon($_url_params) . '" >'
                     . $caption4 . '</a>';
             }
             $list_navigator_html .= '</div>' . "\n";
@@ -2515,7 +2515,7 @@ class Util
             . self::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
-            . URL::getCommon(array('db' => $database)) . '" title="'
+            . Url::getCommon(array('db' => $database)) . '" title="'
             . htmlspecialchars(
                 sprintf(
                     __('Jump to database “%s”.'),
@@ -4734,7 +4734,7 @@ class Util
          *
          * See https://letsencrypt.org/certificates/
          */
-        $certs_dir = dirname(__file__) . '/certs/';
+        $certs_dir = dirname(__file__) . '/../certs/';
         /* See code below for logic */
         if ($ssl == CURLOPT_CAPATH) {
             $curl_status &= curl_setopt($curl_handle, CURLOPT_CAPATH, $certs_dir);
diff --git a/libraries/VersionInformation.php b/libraries/classes/VersionInformation.php
similarity index 98%
rename from libraries/VersionInformation.php
rename to libraries/classes/VersionInformation.php
index 960f9618ad..0eaf199938 100644
--- a/libraries/VersionInformation.php
+++ b/libraries/classes/VersionInformation.php
@@ -5,15 +5,11 @@
  *
  * @package PhpMyAdmin
  */
-namespace PMA\libraries;
+namespace PhpMyAdmin;
 
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use stdClass;
 
-if (!defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Responsible for retrieving version information and notifiying about latest version
  *
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 763c6c5fed..b65bffe2a7 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -38,11 +38,11 @@ use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\AuthenticationPlugin;
 use PhpMyAdmin\DbList;
-use PMA\libraries\ThemeManager;
-use PMA\libraries\Tracker;
+use PhpMyAdmin\ThemeManager;
+use PhpMyAdmin\Tracker;
 use PhpMyAdmin\Response;
-use PMA\libraries\TypesMySQL;
-use PMA\libraries\Util;
+use PhpMyAdmin\TypesMySQL;
+use PhpMyAdmin\Util;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Logging;
 
diff --git a/libraries/config/FormDisplay.php b/libraries/config/FormDisplay.php
index f4153f6928..bfa89e9e7b 100644
--- a/libraries/config/FormDisplay.php
+++ b/libraries/config/FormDisplay.php
@@ -19,7 +19,7 @@ use PhpMyAdmin\Sanitize;
 /**
  * Core libraries.
  */
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once './libraries/config/FormDisplay.tpl.php';
 
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 17474e9940..ac1fdf7632 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 /**
@@ -39,8 +39,8 @@ function PMA_displayFormTop($action = null, $method = 'post', $hidden_fields = n
         $htmlOutput .= '<input type="hidden" name="check_page_refresh" '
             . ' id="check_page_refresh" value="" />' . "\n";
     }
-    $htmlOutput .= URL::getHiddenInputs('', '', 0, 'server') . "\n";
-    $htmlOutput .= URL::getHiddenFields((array)$hidden_fields);
+    $htmlOutput .= Url::getHiddenInputs('', '', 0, 'server') . "\n";
+    $htmlOutput .= Url::getHiddenFields((array)$hidden_fields);
     return $htmlOutput;
 }
 
diff --git a/libraries/config/ServerConfigChecks.php b/libraries/config/ServerConfigChecks.php
index 43bd9397ba..a0f470465c 100644
--- a/libraries/config/ServerConfigChecks.php
+++ b/libraries/config/ServerConfigChecks.php
@@ -8,8 +8,8 @@
 namespace PMA\libraries\config;
 
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Performs various compatibility, security and consistency checks on current config
@@ -378,13 +378,13 @@ class ServerConfigChecks
         );
         $sAllowArbitraryServerWarn = sprintf(
             $sAllowArbitraryServerWarn,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -400,7 +400,7 @@ class ServerConfigChecks
         );
         $sBZipDumpWarning = sprintf(
             $sBZipDumpWarning,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]', '%s'
         );
@@ -415,7 +415,7 @@ class ServerConfigChecks
         );
         $sGZipDumpWarning = sprintf(
             $sGZipDumpWarning,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
@@ -427,7 +427,7 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn = sprintf(
             $sLoginCookieValidityWarn,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
             '[a@' . Core::getPHPDocLink(
@@ -443,7 +443,7 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn2 = sprintf(
             $sLoginCookieValidityWarn2,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -454,10 +454,10 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn3 = sprintf(
             $sLoginCookieValidityWarn3,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -469,10 +469,10 @@ class ServerConfigChecks
         );
         $sSecurityInfoMsg = sprintf(
             $sSecurityInfoMsg,
-            '[a@?page=servers' . URL::getCommon(array(), '&')
+            '[a@?page=servers' . Url::getCommon(array(), '&')
             . '&amp;mode=edit&amp;id=%1$d#tab_Server_config]',
             '[/a]',
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -485,7 +485,7 @@ class ServerConfigChecks
         );
         $sServerAuthConfigMsg = sprintf(
             $sServerAuthConfigMsg,
-            '[a@?page=servers' . URL::getCommon(array(), '&')
+            '[a@?page=servers' . Url::getCommon(array(), '&')
             . '&amp;mode=edit&amp;id=%1$d#tab_Server]',
             '[/a]'
         );
@@ -495,7 +495,7 @@ class ServerConfigChecks
         );
         $sZipDumpExportWarn = sprintf(
             $sZipDumpExportWarn,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
@@ -506,7 +506,7 @@ class ServerConfigChecks
         );
         $sZipDumpImportWarn = sprintf(
             $sZipDumpImportWarn,
-            '[a@?page=form' . URL::getCommon(array(), '&')
+            '[a@?page=form' . Url::getCommon(array(), '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
diff --git a/libraries/config/Validator.php b/libraries/config/Validator.php
index eb816f11f7..273bf2e7e1 100644
--- a/libraries/config/Validator.php
+++ b/libraries/config/Validator.php
@@ -9,7 +9,7 @@ namespace PMA\libraries\config;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Validation class for various validation functions
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index d9d8562367..00a5bbd83a 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -16,10 +16,10 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
-use PMA\libraries\Template;
-use PMA\libraries\Tracker;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 require_once 'libraries/display_create_table.lib.php';
@@ -134,7 +134,7 @@ class DatabaseStructureController extends DatabaseController
         // If there are no tables, the user is redirected to the last page
         // having any.
         if ($this->_total_num_tables > 0 && $this->_pos > $this->_total_num_tables) {
-            $uri = './db_structure.php' . URL::getCommonRaw(array(
+            $uri = './db_structure.php' . Url::getCommonRaw(array(
                 'db' => $this->db,
                 'pos' => max(0, $this->_total_num_tables - $GLOBALS['cfg']['MaxTableList']),
                 'reload' => 1
@@ -203,7 +203,7 @@ class DatabaseStructureController extends DatabaseController
         /* Printable view of a table */
         $this->response->addHTML(
             Template::get('database/structure/print_view_data_dictionary_link')
-                ->render(array('url_query' => URL::getCommon(
+                ->render(array('url_query' => Url::getCommon(
                     array(
                         'db' => $this->db,
                         'goto' => 'db_structure.php',
@@ -345,7 +345,7 @@ class DatabaseStructureController extends DatabaseController
     public function multiSubmitAction()
     {
         $action = 'db_structure.php';
-        $err_url = 'db_structure.php' . URL::getCommon(
+        $err_url = 'db_structure.php' . Url::getCommon(
             array('db' => $this->db)
         );
 
@@ -407,7 +407,7 @@ class DatabaseStructureController extends DatabaseController
 
             $table_is_view = false;
             // Sets parameters for links
-            $tbl_url_query = URL::getCommon(
+            $tbl_url_query = Url::getCommon(
                 array('db' => $this->db, 'table' => $current_table['TABLE_NAME'])
             );
             // do not list the previous table's size info for a view
diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/controllers/server/ServerBinlogController.php
index 8b4f5f3136..e401d29117 100644
--- a/libraries/controllers/server/ServerBinlogController.php
+++ b/libraries/controllers/server/ServerBinlogController.php
@@ -12,9 +12,9 @@ namespace PMA\libraries\controllers\server;
 use PMA\libraries\controllers\Controller;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
-use PMA\libraries\Util;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 
 /**
  * Handles viewing binary logs
@@ -189,7 +189,7 @@ class ServerBinlogController extends Controller
             }
 
             $html .= '<a href="server_binlog.php'
-                . URL::getCommon($this_url_params) . '"';
+                . Url::getCommon($this_url_params) . '"';
             if (Util::showIcons('TableNavigationLinksMode')) {
                 $html .= ' title="' . _pgettext('Previous page', 'Previous') . '">';
             } else {
@@ -211,7 +211,7 @@ class ServerBinlogController extends Controller
             $tempTitle = __('Show Full Queries');
             $tempImgMode = 'full';
         }
-        $html .= '<a href="server_binlog.php' . URL::getCommon($this_url_params)
+        $html .= '<a href="server_binlog.php' . Url::getCommon($this_url_params)
             . '" title="' . $tempTitle . '">'
             . '<img src="' . $GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode
             . 'text.png" alt="' . $tempTitle . '" /></a>';
@@ -222,7 +222,7 @@ class ServerBinlogController extends Controller
             $this_url_params = $url_params;
             $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
             $html .= ' - <a href="server_binlog.php'
-                . URL::getCommon($this_url_params)
+                . Url::getCommon($this_url_params)
                 . '"';
             if (Util::showIcons('TableNavigationLinksMode')) {
                 $html .= ' title="' . _pgettext('Next page', 'Next') . '">';
diff --git a/libraries/controllers/server/ServerCollationsController.php b/libraries/controllers/server/ServerCollationsController.php
index b1ab0f0292..cae3b52a3b 100644
--- a/libraries/controllers/server/ServerCollationsController.php
+++ b/libraries/controllers/server/ServerCollationsController.php
@@ -11,7 +11,7 @@ namespace PMA\libraries\controllers\server;
 
 use PMA\libraries\controllers\Controller;
 use PhpMyAdmin\Charsets;
-use PMA\libraries\Template;
+use PhpMyAdmin\Template;
 
 /**
  * Handles viewing character sets and collations
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index 48f3823727..a0810a51d3 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -13,9 +13,9 @@ use PMA\libraries\controllers\Controller;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Handles viewing and creating and deleting databases
@@ -176,7 +176,7 @@ class ServerDatabasesController extends Controller
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 )
-                . URL::getCommon(array('db' => $_POST['new_db']))
+                . Url::getCommon(array('db' => $_POST['new_db']))
             );
         }
     }
@@ -192,7 +192,7 @@ class ServerDatabasesController extends Controller
             $message = Message::error(__('No databases selected.'));
         } else {
             $action = 'server_databases.php';
-            $err_url = $action . URL::getCommon();
+            $err_url = $action . Url::getCommon();
 
             $GLOBALS['submit_mult'] = 'drop_db';
             $GLOBALS['mult_btn'] = __('Yes');
@@ -285,7 +285,7 @@ class ServerDatabasesController extends Controller
 
         $html .= '<form class="ajax" action="server_databases.php" ';
         $html .= 'method="post" name="dbStatsForm" id="dbStatsForm">' . "\n";
-        $html .= URL::getHiddenInputs($_url_params);
+        $html .= Url::getHiddenInputs($_url_params);
 
         $_url_params['sort_by'] = 'SCHEMA_NAME';
         $_url_params['sort_order']
@@ -579,7 +579,7 @@ class ServerDatabasesController extends Controller
             'class' => 'li_switch_dbstats',
             'url' => array(
                 'href' => 'server_databases.php'
-                    . URL::getCommon(array('dbstats' => '1')),
+                    . Url::getCommon(array('dbstats' => '1')),
                 'title' => __('Enable statistics')
             ),
         );
diff --git a/libraries/controllers/server/ServerEnginesController.php b/libraries/controllers/server/ServerEnginesController.php
index da9b32f0f7..7232dda511 100644
--- a/libraries/controllers/server/ServerEnginesController.php
+++ b/libraries/controllers/server/ServerEnginesController.php
@@ -11,8 +11,8 @@ namespace PMA\libraries\controllers\server;
 
 use PMA\libraries\controllers\Controller;
 use PhpMyAdmin\StorageEngine;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 
 /**
  * Handles viewing storage engine details
diff --git a/libraries/controllers/server/ServerPluginsController.php b/libraries/controllers/server/ServerPluginsController.php
index 493c2861db..509e71a267 100644
--- a/libraries/controllers/server/ServerPluginsController.php
+++ b/libraries/controllers/server/ServerPluginsController.php
@@ -10,7 +10,7 @@
 namespace PMA\libraries\controllers\server;
 
 use PMA\libraries\controllers\Controller;
-use PMA\libraries\Template;
+use PhpMyAdmin\Template;
 
 /**
  * Handles viewing server plugin details
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php
index 4dc714c150..74738fd479 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/controllers/server/ServerVariablesController.php
@@ -12,9 +12,9 @@ namespace PMA\libraries\controllers\server;
 use PMA\libraries\controllers\Controller;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Handles viewing and editing server variables
@@ -275,7 +275,7 @@ class ServerVariablesController extends Controller
      */
     private function _getHtmlForLinkTemplates()
     {
-        $url = 'server_variables.php' . URL::getCommon();
+        $url = 'server_variables.php' . Url::getCommon();
         return Template::get('server/variables/link_template')
             ->render(array('url' => $url));
     }
diff --git a/libraries/controllers/table/TableChartController.php b/libraries/controllers/table/TableChartController.php
index 4084f69cdd..cc2dc8eb3f 100644
--- a/libraries/controllers/table/TableChartController.php
+++ b/libraries/controllers/table/TableChartController.php
@@ -12,9 +12,9 @@ namespace PMA\libraries\controllers\table;
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\libraries\Table;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Table;
 
 
 /**
diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/controllers/table/TableGisVisualizationController.php
index 2f89de7d3b..5ca46c7438 100644
--- a/libraries/controllers/table/TableGisVisualizationController.php
+++ b/libraries/controllers/table/TableGisVisualizationController.php
@@ -12,9 +12,9 @@ namespace PMA\libraries\controllers\table;
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
-use PMA\libraries\Template;
+use PhpMyAdmin\Template;
 use PMA\libraries\gis\GISVisualization;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
@@ -187,7 +187,7 @@ class TableGisVisualizationController extends TableController
          * Displays the page
          */
         $this->url_params['sql_query'] = $this->sql_query;
-        $downloadUrl = 'tbl_gis_visualization.php' . URL::getCommon(
+        $downloadUrl = 'tbl_gis_visualization.php' . Url::getCommon(
             array_merge(
                 $this->url_params,
                 array(
diff --git a/libraries/controllers/table/TableIndexesController.php b/libraries/controllers/table/TableIndexesController.php
index 2d93866378..14c2a6a18a 100644
--- a/libraries/controllers/table/TableIndexesController.php
+++ b/libraries/controllers/table/TableIndexesController.php
@@ -12,8 +12,8 @@ namespace PMA\libraries\controllers\table;
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 use PhpMyAdmin\Response;
 
 
diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php
index 25cc9a5b7e..5ffc28d214 100644
--- a/libraries/controllers/table/TableRelationController.php
+++ b/libraries/controllers/table/TableRelationController.php
@@ -12,9 +12,9 @@ use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
-use PMA\libraries\Table;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 
 /**
  * Handles table relation logic
diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php
index a1551f9616..85029d9b7e 100644
--- a/libraries/controllers/table/TableSearchController.php
+++ b/libraries/controllers/table/TableSearchController.php
@@ -11,8 +11,8 @@ namespace PMA\libraries\controllers\table;
 use PMA\libraries\controllers\TableController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Sql;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
 
 /**
  * Class TableSearchController
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php
index 7ea93cf3bd..9f214843ff 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/controllers/table/TableStructureController.php
@@ -18,11 +18,11 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Sql;
-use PMA\libraries\Table;
-use PMA\libraries\Template;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 use PMA\Util as Util_lib;
 
 require_once 'libraries/util.lib.php';
@@ -96,7 +96,7 @@ class TableStructureController extends TableController
         parent::__construct();
 
         $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = URL::getCommonRaw(array('db' => $db, 'table' => $table));
+        $this->_url_query = Url::getCommonRaw(array('db' => $db, 'table' => $table));
         $this->_tbl_is_view = $tbl_is_view;
         $this->_tbl_storage_engine = $tbl_storage_engine;
         $this->_table_info_num_rows = $table_info_num_rows;
@@ -319,7 +319,7 @@ class TableStructureController extends TableController
         $url_params = array();
         include_once 'libraries/tbl_common.inc.php';
         $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = URL::getCommonRaw(array(
+        $this->_url_query = Url::getCommonRaw(array(
             'db' => $db,
             'table' => $table,
             'goto' => 'tbl_structure.php',
@@ -829,7 +829,7 @@ class TableStructureController extends TableController
      */
     protected function updateColumns()
     {
-        $err_url = 'tbl_structure.php' . URL::getCommon(
+        $err_url = 'tbl_structure.php' . Url::getCommon(
             array(
                 'db' => $this->db, 'table' => $this->table
             )
@@ -1228,7 +1228,7 @@ class TableStructureController extends TableController
             );
 
             $edit_view_url = 'view_create.php'
-                . URL::getCommon($url_params) . '&amp;'
+                . Url::getCommon($url_params) . '&amp;'
                 . implode(
                     '&amp;',
                     array_map(
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
index bf5a192f46..2c43ef3878 100644
--- a/libraries/create_addfield.lib.php
+++ b/libraries/create_addfield.lib.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Util;
 
 /**
  * Transforms the radio button field_key into 4 arrays
@@ -116,11 +116,11 @@ function PMA_setColumnCreationStatementSuffix($current_field_num,
             $sql_suffix .= ' FIRST';
         } else {
             $sql_suffix .= ' AFTER '
-                    . PMA\libraries\Util::backquote($_REQUEST['after_field']);
+                    . PhpMyAdmin\Util::backquote($_REQUEST['after_field']);
         }
     } else {
         $sql_suffix .= ' AFTER '
-                . PMA\libraries\Util::backquote(
+                . PhpMyAdmin\Util::backquote(
                     $_REQUEST['field_name'][$current_field_num - 1]
                 );
     }
@@ -151,12 +151,12 @@ function PMA_buildIndexStatements($index, $index_choice,
         . ' ' . $index_choice;
 
     if (! empty($index['Key_name']) && $index['Key_name'] != 'PRIMARY') {
-        $sql_query .= ' ' . PMA\libraries\Util::backquote($index['Key_name']);
+        $sql_query .= ' ' . PhpMyAdmin\Util::backquote($index['Key_name']);
     }
 
     $index_fields = array();
     foreach ($index['columns'] as $key => $column) {
-        $index_fields[$key] = PMA\libraries\Util::backquote(
+        $index_fields[$key] = PhpMyAdmin\Util::backquote(
             $_REQUEST['field_name'][$column['col_index']]
         );
         if ($column['size']) {
@@ -410,8 +410,8 @@ function PMA_getTableCreationQuery($db, $table)
     $sql_statement = PMA_getColumnCreationStatements(true);
 
     // Builds the 'create table' statement
-    $sql_query = 'CREATE TABLE ' . PMA\libraries\Util::backquote($db) . '.'
-        . PMA\libraries\Util::backquote(trim($table)) . ' (' . $sql_statement . ')';
+    $sql_query = 'CREATE TABLE ' . PhpMyAdmin\Util::backquote($db) . '.'
+        . PhpMyAdmin\Util::backquote(trim($table)) . ' (' . $sql_statement . ')';
 
     // Adds table type, character set, comments and partition definition
     if (!empty($_REQUEST['tbl_storage_engine'])
@@ -479,14 +479,14 @@ function PMA_tryColumnCreationQuery($db, $table, $err_url)
     // To allow replication, we first select the db to use and then run queries
     // on this db.
     if (!($GLOBALS['dbi']->selectDb($db))) {
-        PMA\libraries\Util::mysqlDie(
+        PhpMyAdmin\Util::mysqlDie(
             $GLOBALS['dbi']->getError(),
-            'USE ' . PMA\libraries\Util::backquote($db), false,
+            'USE ' . PhpMyAdmin\Util::backquote($db), false,
             $err_url
         );
     }
     $sql_query    = 'ALTER TABLE ' .
-        PMA\libraries\Util::backquote($table) . ' ' . $sql_statement . ';';
+        PhpMyAdmin\Util::backquote($table) . ' ' . $sql_statement . ';';
     // If there is a request for SQL previewing.
     if (isset($_REQUEST['preview_sql'])) {
         Core::previewSQL($sql_query);
diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php
index c8ffdcff04..b639c89f1b 100644
--- a/libraries/database_interface.inc.php
+++ b/libraries/database_interface.inc.php
@@ -33,7 +33,7 @@ if (defined('TESTSUITE')) {
     $extension = 'mysqli';
     if (!DatabaseInterface::checkDbExtension($extension)) {
 
-        $docurl = PMA\libraries\Util::getDocuLink('faq', 'faqmysql');
+        $docurl = PhpMyAdmin\Util::getDocuLink('faq', 'faqmysql');
         $doclink = sprintf(
             __('See %sour documentation%s for more information.'),
             '[a@' . $docurl  . '@documentation]',
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 0526c53ed8..65e8fe0e63 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -9,14 +9,14 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-PMA\libraries\Util::checkParameters(array('db'));
+PhpMyAdmin\Util::checkParameters(array('db'));
 
 global $cfg;
 global $db;
@@ -32,12 +32,12 @@ if ($db_is_system_schema) {
 /**
  * Defines the urls to return to in case of error in a sql statement
  */
-$err_url_0 = 'index.php' . URL::getCommon();
+$err_url_0 = 'index.php' . Url::getCommon();
 
-$err_url = PMA\libraries\Util::getScriptNameForOption(
+$err_url = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . URL::getCommon(array('db' => $db));
+    . Url::getCommon(array('db' => $db));
 
 /**
  * Ensures the database exists (else move to the "parent" script) and displays
@@ -61,7 +61,7 @@ if (! isset($is_db) || ! $is_db) {
     if (isset($message)) {
         $params['message'] = $message;
     }
-    $uri = './index.php' . URL::getCommonRaw($params);
+    $uri = './index.php' . Url::getCommonRaw($params);
     if (strlen($db) === 0 || ! $is_db) {
         $response = Response::getInstance();
         if ($response->isAjax()) {
@@ -86,7 +86,7 @@ if (isset($_REQUEST['submitcollation'])
 ) {
     list($db_charset) = explode('_', $_REQUEST['db_collation']);
     $sql_query        = 'ALTER DATABASE '
-        . PMA\libraries\Util::backquote($db)
+        . PhpMyAdmin\Util::backquote($db)
         . ' DEFAULT' . Util::getCharsetQueryPart($_REQUEST['db_collation']);
     $result           = $GLOBALS['dbi']->query($sql_query);
     $message          = Message::success();
@@ -107,4 +107,4 @@ if (isset($_REQUEST['submitcollation'])
 /**
  * Set parameters for links
  */
-$url_query = URL::getCommon(array('db' => $db));
+$url_query = Url::getCommon(array('db' => $db));
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index 16fcc537aa..493109564a 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -24,7 +24,7 @@ require_once 'libraries/relation.lib.php';
  */
 function PMA_getHtmlForPageSelector($cfgRelation, $db)
 {
-    return PMA\libraries\Template::get('database/designer/page_selector')
+    return PhpMyAdmin\Template::get('database/designer/page_selector')
         ->render(
             array(
                 'db' => $db,
@@ -43,7 +43,7 @@ function PMA_getHtmlForPageSelector($cfgRelation, $db)
  */
 function PMA_getHtmlForEditOrDeletePages($db, $operation)
 {
-    return PMA\libraries\Template::get('database/designer/edit_delete_pages')
+    return PhpMyAdmin\Template::get('database/designer/edit_delete_pages')
         ->render(
             array(
                 'db' => $db,
@@ -61,7 +61,7 @@ function PMA_getHtmlForEditOrDeletePages($db, $operation)
  */
 function PMA_getHtmlForPageSaveAs($db)
 {
-    return PMA\libraries\Template::get('database/designer/page_save_as')
+    return PhpMyAdmin\Template::get('database/designer/page_save_as')
         ->render(
             array(
                 'db' => $db
@@ -80,8 +80,8 @@ function PMA_getPageIdsAndNames($db)
 {
     $cfgRelation = PMA_getRelationsParam();
     $page_query = "SELECT `page_nr`, `page_descr` FROM "
-        . PMA\libraries\Util::backquote($cfgRelation['db']) . "."
-        . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
+        . PhpMyAdmin\Util::backquote($cfgRelation['db']) . "."
+        . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
         . " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($db) . "'"
         . " ORDER BY `page_descr`";
     $page_rs = PMA_queryAsControlUser(
@@ -120,7 +120,7 @@ function PMA_getHtmlForSchemaExport($db, $page)
         )->getDisplay();
     }
 
-    return PMA\libraries\Template::get('database/designer/schema_export')
+    return PhpMyAdmin\Template::get('database/designer/schema_export')
         ->render(
             array(
                 'db' => $db,
@@ -143,7 +143,7 @@ function PMA_getHtmlForSchemaExport($db, $page)
 function PMA_getHtmlForJSFields(
     $script_tables, $script_contr, $script_display_field, $display_page
 ) {
-    return PMA\libraries\Template::get('database/designer/js_fields')
+    return PhpMyAdmin\Template::get('database/designer/js_fields')
         ->render(
             array(
                 'script_tables' => $script_tables,
@@ -166,7 +166,7 @@ function PMA_getHtmlForJSFields(
  */
 function PMA_getDesignerPageMenu($visualBuilder, $selected_page, $params_array)
 {
-    return PMA\libraries\Template::get('database/designer/side_menu')
+    return PhpMyAdmin\Template::get('database/designer/side_menu')
         ->render(
             array(
                 'visualBuilder' => $visualBuilder,
@@ -190,9 +190,9 @@ function PMA_getSideMenuParamsArray()
     if ($GLOBALS['cfgRelation']['designersettingswork']) {
 
         $query = 'SELECT `settings_data` FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['designer_settings'])
-            . ' WHERE ' . PMA\libraries\Util::backquote('username') . ' = "'
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['designer_settings'])
+            . ' WHERE ' . PhpMyAdmin\Util::backquote('username') . ' = "'
             . $GLOBALS['cfg']['Server']['user'] . '";';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
@@ -271,7 +271,7 @@ function PMA_returnClassNamesFromMenuButtons()
  */
 function PMA_getHTMLCanvas()
 {
-    return PMA\libraries\Template::get('database/designer/canvas')->render();
+    return PhpMyAdmin\Template::get('database/designer/canvas')->render();
 }
 
 /**
@@ -284,7 +284,7 @@ function PMA_getHTMLCanvas()
  */
 function PMA_getHTMLTableList($tab_pos, $display_page)
 {
-    return PMA\libraries\Template::get('database/designer/table_list')
+    return PhpMyAdmin\Template::get('database/designer/table_list')
         ->render(
             array(
                 'tab_pos' => $tab_pos,
@@ -307,7 +307,7 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
 function PMA_getDatabaseTables(
     $tab_pos, $display_page, $tab_column, $tables_all_keys, $tables_pk_or_unique_keys
 ) {
-    return PMA\libraries\Template::get('database/designer/database_tables')
+    return PhpMyAdmin\Template::get('database/designer/database_tables')
         ->render(
             array(
                 'tab_pos' => $tab_pos,
@@ -326,7 +326,7 @@ function PMA_getDatabaseTables(
  */
 function PMA_getNewRelationPanel()
 {
-    return PMA\libraries\Template::get('database/designer/new_relation_panel')
+    return PhpMyAdmin\Template::get('database/designer/new_relation_panel')
         ->render();
 }
 
@@ -337,7 +337,7 @@ function PMA_getNewRelationPanel()
  */
 function PMA_getDeleteRelationPanel()
 {
-    return PMA\libraries\Template::get('database/designer/delete_relation_panel')
+    return PhpMyAdmin\Template::get('database/designer/delete_relation_panel')
         ->render();
 }
 
@@ -348,7 +348,7 @@ function PMA_getDeleteRelationPanel()
  */
 function PMA_getOptionsPanel()
 {
-    return PMA\libraries\Template::get('database/designer/options_panel')->render();
+    return PhpMyAdmin\Template::get('database/designer/options_panel')->render();
 }
 
 /**
@@ -358,7 +358,7 @@ function PMA_getOptionsPanel()
  */
 function PMA_getRenameToPanel()
 {
-    return PMA\libraries\Template::get('database/designer/rename_to_panel')
+    return PhpMyAdmin\Template::get('database/designer/rename_to_panel')
         ->render();
 }
 
@@ -369,7 +369,7 @@ function PMA_getRenameToPanel()
  */
 function PMA_getHavingQueryPanel()
 {
-    return PMA\libraries\Template::get('database/designer/having_query_panel')
+    return PhpMyAdmin\Template::get('database/designer/having_query_panel')
         ->render();
 }
 
@@ -380,7 +380,7 @@ function PMA_getHavingQueryPanel()
  */
 function PMA_getAggregateQueryPanel()
 {
-    return PMA\libraries\Template::get('database/designer/aggregate_query_panel')
+    return PhpMyAdmin\Template::get('database/designer/aggregate_query_panel')
         ->render();
 }
 
@@ -391,7 +391,7 @@ function PMA_getAggregateQueryPanel()
  */
 function PMA_getWhereQueryPanel()
 {
-    return PMA\libraries\Template::get('database/designer/where_query_panel')
+    return PhpMyAdmin\Template::get('database/designer/where_query_panel')
         ->render();
 }
 
@@ -402,5 +402,5 @@ function PMA_getWhereQueryPanel()
  */
 function PMA_getQueryDetails()
 {
-    return PMA\libraries\Template::get('database/designer/query_details')->render();
+    return PhpMyAdmin\Template::get('database/designer/query_details')->render();
 }
diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php
index bf4f235d19..5b3a7f6a3e 100644
--- a/libraries/db_table_exists.inc.php
+++ b/libraries/db_table_exists.inc.php
@@ -10,7 +10,7 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -46,7 +46,7 @@ if (empty($is_db)) {
                 }
                 Core::sendHeaderLocation(
                     './index.php'
-                    . URL::getCommonRaw($url_params)
+                    . Url::getCommonRaw($url_params)
                 );
             }
             exit;
@@ -88,7 +88,7 @@ if (empty($is_table)
                  * only happen if IS_TRANSFORMATION_WRAPPER?
                  */
                 $_result = $GLOBALS['dbi']->tryQuery(
-                    'SELECT COUNT(*) FROM ' . PMA\libraries\Util::backquote($table)
+                    'SELECT COUNT(*) FROM ' . PhpMyAdmin\Util::backquote($table)
                     . ';',
                     null,
                     PhpMyAdmin\DatabaseInterface::QUERY_STORE
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 879acf87fd..d8eb860246 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
   * Get HTML for the Change password dialog
@@ -33,7 +33,7 @@ function PMA_getHtmlForChangePassword($mode, $username, $hostname)
         . 'name="chgPassword" '
         . 'class="' . ($is_privileges ? 'submenu-item' : '') . '">';
 
-    $html .= URL::getHiddenInputs();
+    $html .= Url::getHiddenInputs();
 
     if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) {
         $html .= '<input type="hidden" name="username" '
@@ -79,7 +79,7 @@ function PMA_getHtmlForChangePassword($mode, $username, $hostname)
         . '</td>'
         . '</tr>';
 
-    $serverType = PMA\libraries\Util::getServerType();
+    $serverType = PhpMyAdmin\Util::getServerType();
     $orig_auth_plugin = PMA_getCurrentAuthenticationPlugin(
         'change',
         $username,
@@ -120,7 +120,7 @@ function PMA_getHtmlForChangePassword($mode, $username, $hostname)
                         . 'or an \'<i>unencrypted connection that encrypts the '
                         . 'password using RSA</i>\'; while connecting to the server.'
                     )
-                    . PMA\libraries\Util::showMySQLDocu(
+                    . PhpMyAdmin\Util::showMySQLDocu(
                         'sha256-authentication-plugin'
                     )
                 )
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index d2b59617b4..5b68de8191 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -42,7 +42,7 @@ require_once './libraries/check_user_privileges.lib.php';
  */
 function PMA_getHtmlForCreateTable($db)
 {
-    return PMA\libraries\Template::get('database/create_table')->render(
+    return PhpMyAdmin\Template::get('database/create_table')->render(
         array('db' => $db)
     );
 }
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 356a1bdfe7..ac5ae6474e 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -12,9 +12,9 @@ use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
 
 /**
  * Outputs appropriate checked statement for checkbox.
@@ -113,11 +113,11 @@ function PMA_getHtmlForHiddenInput(
     global $cfg;
     $html = "";
     if ($export_type == 'server') {
-        $html .= URL::getHiddenInputs('', '', 1);
+        $html .= Url::getHiddenInputs('', '', 1);
     } elseif ($export_type == 'database') {
-        $html .= URL::getHiddenInputs($db, '', 1);
+        $html .= Url::getHiddenInputs($db, '', 1);
     } else {
-        $html .= URL::getHiddenInputs($db, $table, 1);
+        $html .= Url::getHiddenInputs($db, $table, 1);
     }
 
     // just to keep this value for possible next display of this form after saving
@@ -171,7 +171,7 @@ function PMA_getHtmlForExportOptionHeader($export_type, $db, $table)
 {
     $html  = '<div class="exportoptions" id="header">';
     $html .= '<h2>';
-    $html .= PMA\libraries\Util::getImage('b_export.png', __('Export'));
+    $html .= PhpMyAdmin\Util::getImage('b_export.png', __('Export'));
     if ($export_type == 'server') {
         $html .= __('Exporting databases from the current server');
     } elseif ($export_type == 'database') {
@@ -252,8 +252,8 @@ function PMA_getOptionsForExportTemplates($export_type)
     $cfgRelation = PMA_getRelationsParam();
 
     $query = "SELECT `id`, `template_name` FROM "
-       . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-       . PMA\libraries\Util::backquote($cfgRelation['export_templates'])
+       . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+       . PhpMyAdmin\Util::backquote($cfgRelation['export_templates'])
        . " WHERE `username` = "
        . "'" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user'])
         . "' AND `export_type` = '" . $GLOBALS['dbi']->escapeString($export_type) . "'"
@@ -397,7 +397,7 @@ function PMA_getHtmlForExportOptionsFormat($export_list)
 
     $html .= '<div class="exportoptions" id="submit">';
 
-    $html .= PMA\libraries\Util::getExternalBug(
+    $html .= PhpMyAdmin\Util::getExternalBug(
         __('SQL compatibility mode'), 'mysql', '50027', '14515'
     );
     global $cfg;
@@ -493,7 +493,7 @@ function PMA_getHtmlForExportOptionsQuickExport()
     $html .= '<label for="checkbox_quick_dump_onserver">';
     $html .= sprintf(
         __('Save on server in the directory <b>%s</b>'),
-        htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']))
+        htmlspecialchars(PhpMyAdmin\Util::userDir($cfg['SaveDir']))
     );
     $html .= '</label>';
     $html .= '</li>';
@@ -528,7 +528,7 @@ function PMA_getHtmlForExportOptionsOutputSaveDir()
     $html .= '<label for="checkbox_dump_onserver">';
     $html .= sprintf(
         __('Save on server in the directory <b>%s</b>'),
-        htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']))
+        htmlspecialchars(PhpMyAdmin\Util::userDir($cfg['SaveDir']))
     );
     $html .= '</label>';
     $html .= '</li>';
@@ -581,13 +581,13 @@ function PMA_getHtmlForExportOptionsOutputFormat($export_type)
     );
     $msg->addParamHtml('</a>');
     $msg->addParam($trans);
-    $doc_url = PMA\libraries\Util::getDocuLink('faq', 'faq6-27');
+    $doc_url = PhpMyAdmin\Util::getDocuLink('faq', 'faq6-27');
     $msg->addParamHtml(
         '<a href="' . $doc_url . '" target="documentation">'
     );
     $msg->addParamHtml('</a>');
 
-    $html .= PMA\libraries\Util::showHint($msg);
+    $html .= PhpMyAdmin\Util::showHint($msg);
     $html .= '</label>';
     $html .= '<input type="text" name="filename_template" id="filename_template" ';
     $html .= ' value="';
@@ -1065,8 +1065,8 @@ function PMA_handleExportTemplateActions($cfgRelation)
         $id = '';
     }
 
-    $templateTable = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-       . PMA\libraries\Util::backquote($cfgRelation['export_templates']);
+    $templateTable = PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+       . PhpMyAdmin\Util::backquote($cfgRelation['export_templates']);
     $user = $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']);
 
     switch ($_REQUEST['templateAction']) {
diff --git a/libraries/display_git_revision.lib.php b/libraries/display_git_revision.lib.php
index eca8b55895..c2f3521e5f 100644
--- a/libraries/display_git_revision.lib.php
+++ b/libraries/display_git_revision.lib.php
@@ -65,7 +65,7 @@ function PMA_printGitRevision()
         . $branch . ',<br /> '
         . sprintf(
             __('committed on %1$s by %2$s'),
-            PMA\libraries\Util::localisedDate(strtotime($committer['date'])),
+            PhpMyAdmin\Util::localisedDate(strtotime($committer['date'])),
             '<a href="' . Core::linkURL(
                 'mailto:' . htmlspecialchars($committer['email'])
             ) . '">'
@@ -75,7 +75,7 @@ function PMA_printGitRevision()
             ? ', <br />'
             . sprintf(
                 __('authored on %1$s by %2$s'),
-                PMA\libraries\Util::localisedDate(strtotime($author['date'])),
+                PhpMyAdmin\Util::localisedDate(strtotime($author['date'])),
                 '<a href="' . Core::linkURL(
                     'mailto:' . htmlspecialchars($author['email'])
                 ) . '">'
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 00ea863195..a139309134 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -14,7 +14,7 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ImportPlugin;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 /**
@@ -30,11 +30,11 @@ function PMA_getHtmlForHiddenInputs($import_type, $db, $table)
 {
     $html  = '';
     if ($import_type == 'server') {
-        $html .= URL::getHiddenInputs('', '', 1);
+        $html .= Url::getHiddenInputs('', '', 1);
     } elseif ($import_type == 'database') {
-        $html .= URL::getHiddenInputs($db, '', 1);
+        $html .= Url::getHiddenInputs($db, '', 1);
     } else {
-        $html .= URL::getHiddenInputs($db, $table, 1);
+        $html .= Url::getHiddenInputs($db, $table, 1);
     }
     $html .= '    <input type="hidden" name="import_type" value="'
         . $import_type . '" />' . "\n";
@@ -76,7 +76,7 @@ function PMA_getHtmlForImportJS($upload_id)
                     . 'Details about the upload are not available.'
                 ),
                 false
-            ) . PMA\libraries\Util::showDocu('faq', 'faq2-9');
+            ) . PhpMyAdmin\Util::showDocu('faq', 'faq2-9');
         $html .= "   $('#upload_form_status_info').html('" . $image_tag . "');";
         $html .= '   $("#upload_form_status").css("display", "none");';
     } // else
@@ -106,7 +106,7 @@ function PMA_getHtmlForImportOptions($import_type, $db, $table)
 {
     $html  = '    <div class="exportoptions" id="header">';
     $html .= '        <h2>';
-    $html .= PMA\libraries\Util::getImage('b_import.png', __('Import'));
+    $html .= PhpMyAdmin\Util::getImage('b_import.png', __('Import'));
 
     if ($import_type == 'server') {
         $html .= __('Importing into the current server');
@@ -232,7 +232,7 @@ function PMA_getHtmlForImportOptionsFile(
         $html .= '            <li>';
         $html .= '                <input type="radio" name="file_location" '
             . 'id="radio_import_file" required="required" />';
-        $html .= PMA\libraries\Util::getBrowseUploadFileBlock($max_upload_size);
+        $html .= PhpMyAdmin\Util::getBrowseUploadFileBlock($max_upload_size);
         $html .= '<br />' . __('You may also drag and drop a file on any page.');
         $html .= '            </li>';
         $html .= '            <li>';
@@ -244,7 +244,7 @@ function PMA_getHtmlForImportOptionsFile(
             $html .= ' checked="checked"';
         }
         $html .= ' />';
-        $html .= PMA\libraries\Util::getSelectUploadFileBlock(
+        $html .= PhpMyAdmin\Util::getSelectUploadFileBlock(
             $import_list,
             $cfg['UploadDir']
         );
@@ -252,14 +252,14 @@ function PMA_getHtmlForImportOptionsFile(
         $html .= '            </ul>';
 
     } elseif ($GLOBALS['is_upload']) {
-        $html .= PMA\libraries\Util::getBrowseUploadFileBlock($max_upload_size);
+        $html .= PhpMyAdmin\Util::getBrowseUploadFileBlock($max_upload_size);
         $html .= '<br />' . __('You may also drag and drop a file on any page.');
     } elseif (!$GLOBALS['is_upload']) {
         $html .= Message::notice(
             __('File uploads are not allowed on this server.')
         )->getDisplay();
     } elseif (!empty($cfg['UploadDir'])) {
-        $html .= PMA\libraries\Util::getSelectUploadFileBlock(
+        $html .= PhpMyAdmin\Util::getSelectUploadFileBlock(
             $import_list,
             $cfg['UploadDir']
         );
@@ -346,7 +346,7 @@ function PMA_getHtmlForImportOptionsOther()
     $html  = '   <div class="importoptions">';
     $html .= '       <h3>' . __('Other options:') . '</h3>';
     $html .= '       <div class="formelementrow">';
-    $html .= PMA\libraries\Util::getFKCheckbox();
+    $html .= PhpMyAdmin\Util::getFKCheckbox();
     $html .= '       </div>';
     $html .= '   </div>';
 
@@ -479,7 +479,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
 {
     //some variable for javascript
     $ajax_url = "import_status.php?id=" . $upload_id . "&"
-        . URL::getCommonRaw(array('import_status'=>1));
+        . Url::getCommonRaw(array('import_status'=>1));
     $promot_str = Sanitize::jsFormat(
         __(
             'The file being uploaded is probably larger than '
@@ -497,7 +497,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
         __('The file is being processed, please be patient.'),
         false
     );
-    $import_url = URL::getCommonRaw(array('import_status'=>1));
+    $import_url = Url::getCommonRaw(array('import_status'=>1));
 
     //start output
     $html  = 'var finished = false; ';
diff --git a/libraries/engines/Innodb.php b/libraries/engines/Innodb.php
index 106a237fe6..7fa9a1a719 100644
--- a/libraries/engines/Innodb.php
+++ b/libraries/engines/Innodb.php
@@ -8,7 +8,7 @@
 namespace PMA\libraries\engines;
 
 use PhpMyAdmin\StorageEngine;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * The InnoDB storage engine
diff --git a/libraries/engines/Pbxt.php b/libraries/engines/Pbxt.php
index f4a7baf151..5cc56704ee 100644
--- a/libraries/engines/Pbxt.php
+++ b/libraries/engines/Pbxt.php
@@ -7,9 +7,9 @@
  */
 namespace PMA\libraries\engines;
 
-use PMA;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\StorageEngine;
+use PhpMyAdmin\Util;
 
 /**
  * The PBXT storage engine
@@ -145,14 +145,14 @@ class Pbxt extends StorageEngine
     public function resolveTypeSize($formatted_size)
     {
         if (preg_match('/^[0-9]+[a-zA-Z]+$/', $formatted_size)) {
-            $value = PMA\libraries\Util::extractValueFromFormattedSize(
+            $value = Util::extractValueFromFormattedSize(
                 $formatted_size
             );
         } else {
             $value = $formatted_size;
         }
 
-        return PMA\libraries\Util::formatByteDown($value);
+        return Util::formatByteDown($value);
     }
 
     //--------------------
diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php
index 7aa58e0c40..3e02a70198 100644
--- a/libraries/error_report.lib.php
+++ b/libraries/error_report.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -178,7 +178,7 @@ function PMA_sanitizeUrl($url)
  */
 function PMA_sendErrorReport($report)
 {
-    $response = PMA\libraries\Util::httpRequest(
+    $response = PhpMyAdmin\Util::httpRequest(
         SUBMISSION_URL,
         "POST",
         false,
@@ -308,15 +308,15 @@ function PMA_getErrorReportForm()
 {
     $datas = array(
         'report_data' => PMA_getPrettyReportData(),
-        'hidden_inputs' => URL::getHiddenInputs(),
+        'hidden_inputs' => Url::getHiddenInputs(),
         'hidden_fields' => null,
     );
 
     $reportData = PMA_getReportData();
     if (!empty($reportData)) {
-        $datas['hidden_fields'] = URL::getHiddenFields($reportData);
+        $datas['hidden_fields'] = Url::getHiddenFields($reportData);
     }
 
-    return PMA\libraries\Template::get('error/report_form')
+    return PhpMyAdmin\Template::get('error/report_form')
         ->render($datas);
 }
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index a3080f16c9..553c892541 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -9,9 +9,9 @@
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 use PhpMyAdmin\ZipFile;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 
@@ -279,7 +279,7 @@ function PMA_getExportFilenameAndMimetype(
             );
         }
     }
-    $filename = PMA\libraries\Util::expandUserString($filename_template);
+    $filename = PhpMyAdmin\Util::expandUserString($filename_template);
     // remove dots in filename (coming from either the template or already
     // part of the filename) to avoid a remote code execution vulnerability
     $filename = Sanitize::sanitizeFilename($filename, $replaceDots = true);
@@ -324,7 +324,7 @@ function PMA_openExportFile($filename, $quick_export)
     $file_handle = null;
     $message = '';
 
-    $save_filename = PMA\libraries\Util::userDir($GLOBALS['cfg']['SaveDir'])
+    $save_filename = PhpMyAdmin\Util::userDir($GLOBALS['cfg']['SaveDir'])
         . preg_replace('@[/\\\\]@', '_', $filename);
 
     if (file_exists($save_filename)
@@ -477,11 +477,11 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
      */
     $back_button = '<p>[ <a href="';
     if ($export_type == 'server') {
-        $back_button .= 'server_export.php' . URL::getCommon();
+        $back_button .= 'server_export.php' . Url::getCommon();
     } elseif ($export_type == 'database') {
-        $back_button .= 'db_export.php' . URL::getCommon(array('db' => $db));
+        $back_button .= 'db_export.php' . Url::getCommon(array('db' => $db));
     } else {
-        $back_button .= 'tbl_export.php' . URL::getCommon(
+        $back_button .= 'tbl_export.php' . Url::getCommon(
             array(
                 'db' => $db, 'table' => $table
             )
@@ -684,12 +684,12 @@ function PMA_exportDatabase(
             && in_array($table, $table_data)
             && ! ($is_view)
         ) {
-            $tableObj = new PMA\libraries\Table($table, $db);
+            $tableObj = new PhpMyAdmin\Table($table, $db);
             $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
 
             $local_query  = 'SELECT ' . implode(', ', $nonGeneratedCols)
-                .  ' FROM ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($table);
+                .  ' FROM ' . PhpMyAdmin\Util::backquote($db)
+                . '.' . PhpMyAdmin\Util::backquote($table);
 
             if (! $export_plugin->exportData(
                 $db, $table, $crlf, $err_url, $local_query, $aliases
@@ -870,12 +870,12 @@ function PMA_exportTable(
             $GLOBALS['dbi']->selectDb($db);
         } else {
             // Data is exported only for Non-generated columns
-            $tableObj = new PMA\libraries\Table($table, $db);
+            $tableObj = new PhpMyAdmin\Table($table, $db);
             $nonGeneratedCols = $tableObj->getNonGeneratedColumns(true);
 
             $local_query  = 'SELECT ' . implode(', ', $nonGeneratedCols)
-                .  ' FROM ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($table) . $add_query;
+                .  ' FROM ' . PhpMyAdmin\Util::backquote($db)
+                . '.' . PhpMyAdmin\Util::backquote($table) . $add_query;
         }
         if (! $export_plugin->exportData(
             $db, $table, $crlf, $err_url, $local_query, $aliases
@@ -1000,8 +1000,8 @@ function PMA_lockTables($db, $tables, $lockType = "WRITE")
 {
     $locks = array();
     foreach ($tables as $table) {
-        $locks[] = PMA\libraries\Util::backquote($db) . "."
-            . PMA\libraries\Util::backquote($table) . " " . $lockType;
+        $locks[] = PhpMyAdmin\Util::backquote($db) . "."
+            . PhpMyAdmin\Util::backquote($table) . " " . $lockType;
     }
 
     $sql = "LOCK TABLES " . implode(", ", $locks);
diff --git a/libraries/gis/GISPolygon.php b/libraries/gis/GISPolygon.php
index e77c6a1475..06b9828733 100644
--- a/libraries/gis/GISPolygon.php
+++ b/libraries/gis/GISPolygon.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\gis;
 
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use \TCPDF;
 
 /**
diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php
index d6bc173761..8927b636ea 100644
--- a/libraries/gis/GISVisualization.php
+++ b/libraries/gis/GISVisualization.php
@@ -9,7 +9,7 @@
 namespace PMA\libraries\gis;
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use \TCPDF;
 use PhpMyAdmin\Sanitize;
 
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index ee87f84783..8e9c37d3f7 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -8,9 +8,9 @@
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -298,7 +298,7 @@ function PMA_lookForUse($buffer, $db, $reload)
         // $db must not contain the escape characters generated by backquote()
         // ( used in PMA_buildSQL() as: backquote($db_name), and then called
         // in PMA_importRunQuery() which in turn calls PMA_lookForUse() )
-        $db = PMA\libraries\Util::unQuote($db);
+        $db = PhpMyAdmin\Util::unQuote($db);
 
         $reload = true;
     }
@@ -1029,15 +1029,15 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
         for ($i = 0; $i < $num_tables; ++$i) {
             $num_cols = count($tables[$i][COL_NAMES]);
             $tempSQLStr = "CREATE TABLE IF NOT EXISTS "
-            . PMA\libraries\Util::backquote($db_name)
-            . '.' . PMA\libraries\Util::backquote($tables[$i][TBL_NAME]) . " (";
+            . PhpMyAdmin\Util::backquote($db_name)
+            . '.' . PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME]) . " (";
             for ($j = 0; $j < $num_cols; ++$j) {
                 $size = $analyses[$i][SIZES][$j];
                 if ((int)$size == 0) {
                     $size = 10;
                 }
 
-                $tempSQLStr .= PMA\libraries\Util::backquote(
+                $tempSQLStr .= PhpMyAdmin\Util::backquote(
                     $tables[$i][COL_NAMES][$j]
                 ) . " "
                 . $type_array[$analyses[$i][TYPES][$j]];
@@ -1073,11 +1073,11 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
         $num_cols = count($tables[$i][COL_NAMES]);
         $num_rows = count($tables[$i][ROWS]);
 
-        $tempSQLStr = "INSERT INTO " . PMA\libraries\Util::backquote($db_name) . '.'
-            . PMA\libraries\Util::backquote($tables[$i][TBL_NAME]) . " (";
+        $tempSQLStr = "INSERT INTO " . PhpMyAdmin\Util::backquote($db_name) . '.'
+            . PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME]) . " (";
 
         for ($m = 0; $m < $num_cols; ++$m) {
-            $tempSQLStr .= PMA\libraries\Util::backquote($tables[$i][COL_NAMES][$m]);
+            $tempSQLStr .= PhpMyAdmin\Util::backquote($tables[$i][COL_NAMES][$m]);
 
             if ($m != ($num_cols - 1)) {
                 $tempSQLStr .= ", ";
@@ -1196,8 +1196,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
     }
 
     $params = array('db' => (string)$db_name);
-    $db_url = 'db_structure.php' . URL::getCommon($params);
-    $db_ops_url = 'db_operations.php' . URL::getCommon($params);
+    $db_url = 'db_structure.php' . Url::getCommon($params);
+    $db_ops_url = 'db_operations.php' . Url::getCommon($params);
 
     $message = '<br /><br />';
     $message .= '<strong>' . __(
@@ -1217,13 +1217,13 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
         $db_url,
         sprintf(
             __('Go to database: %s'),
-            htmlspecialchars(PMA\libraries\Util::backquote($db_name))
+            htmlspecialchars(PhpMyAdmin\Util::backquote($db_name))
         ),
         htmlspecialchars($db_name),
         $db_ops_url,
         sprintf(
             __('Edit settings for %s'),
-            htmlspecialchars(PMA\libraries\Util::backquote($db_name))
+            htmlspecialchars(PhpMyAdmin\Util::backquote($db_name))
         )
     );
 
@@ -1237,9 +1237,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
              'db' => (string) $db_name,
              'table' => (string) $tables[$i][TBL_NAME]
         );
-        $tbl_url = 'sql.php' . URL::getCommon($params);
-        $tbl_struct_url = 'tbl_structure.php' . URL::getCommon($params);
-        $tbl_ops_url = 'tbl_operations.php' . URL::getCommon($params);
+        $tbl_url = 'sql.php' . Url::getCommon($params);
+        $tbl_struct_url = 'tbl_structure.php' . Url::getCommon($params);
+        $tbl_ops_url = 'tbl_operations.php' . Url::getCommon($params);
 
         unset($params);
 
@@ -1253,7 +1253,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
                 sprintf(
                     __('Go to table: %s'),
                     htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
+                        PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME])
                     )
                 ),
                 htmlspecialchars($tables[$i][TBL_NAME]),
@@ -1261,14 +1261,14 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
                 sprintf(
                     __('Structure of %s'),
                     htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
+                        PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME])
                     )
                 ),
                 $tbl_ops_url,
                 sprintf(
                     __('Edit settings for %s'),
                     htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
+                        PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME])
                     )
                 )
             );
@@ -1279,7 +1279,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
                 sprintf(
                     __('Go to view: %s'),
                     htmlspecialchars(
-                        PMA\libraries\Util::backquote($tables[$i][TBL_NAME])
+                        PhpMyAdmin\Util::backquote($tables[$i][TBL_NAME])
                     )
                 ),
                 htmlspecialchars($tables[$i][TBL_NAME])
@@ -1419,10 +1419,10 @@ function PMA_getMatchedRows($analyzed_sql_results = array())
         'db'        => $GLOBALS['db'],
         'sql_query' => $matched_row_query
     );
-    $matched_rows_url  = 'sql.php' . URL::getCommon($_url_params);
+    $matched_rows_url  = 'sql.php' . Url::getCommon($_url_params);
 
     return array(
-        'sql_query' => PMA\libraries\Util::formatSql($analyzed_sql_results['query']),
+        'sql_query' => PhpMyAdmin\Util::formatSql($analyzed_sql_results['query']),
         'matched_rows' => $matched_rows,
         'matched_rows_url' => $matched_rows_url
     );
@@ -1642,16 +1642,16 @@ function PMA_isTableTransactional($table)
 {
     $table = explode('.', $table);
     if (count($table) == 2) {
-        $db = PMA\libraries\Util::unQuote($table[0]);
-        $table = PMA\libraries\Util::unQuote($table[1]);
+        $db = PhpMyAdmin\Util::unQuote($table[0]);
+        $table = PhpMyAdmin\Util::unQuote($table[1]);
     } else {
         $db = $GLOBALS['db'];
-        $table = PMA\libraries\Util::unQuote($table[0]);
+        $table = PhpMyAdmin\Util::unQuote($table[0]);
     }
 
     // Query to check if table exists.
-    $check_table_query = 'SELECT * FROM ' . PMA\libraries\Util::backquote($db)
-        . '.' . PMA\libraries\Util::backquote($table) . ' '
+    $check_table_query = 'SELECT * FROM ' . PhpMyAdmin\Util::backquote($db)
+        . '.' . PhpMyAdmin\Util::backquote($table) . ' '
         . 'LIMIT 1';
 
     $result = $GLOBALS['dbi']->tryQuery($check_table_query);
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 781ecc6bc0..e847aec7f0 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -9,8 +9,8 @@ use PhpMyAdmin\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
 
 /**
  * Retrieve form parameters for insert/edit form
@@ -83,8 +83,8 @@ function PMA_analyzeWhereClauses(
     foreach ($where_clause_array as $key_id => $where_clause) {
 
         $local_query     = 'SELECT * FROM '
-            . PMA\libraries\Util::backquote($db) . '.'
-            . PMA\libraries\Util::backquote($table)
+            . PhpMyAdmin\Util::backquote($db) . '.'
+            . PhpMyAdmin\Util::backquote($table)
             . ' WHERE ' . $where_clause . ';';
         $result[$key_id] = $GLOBALS['dbi']->query(
             $local_query, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE
@@ -122,7 +122,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
     if (! $rows[$key_id]) {
         unset($rows[$key_id], $where_clause_array[$key_id]);
         Response::getInstance()->addHtml(
-            PMA\libraries\Util::getMessage(
+            PhpMyAdmin\Util::getMessage(
                 __('MySQL returned an empty result set (i.e. zero rows).'),
                 $local_query
             )
@@ -135,7 +135,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
         $meta = $GLOBALS['dbi']->getFieldsMeta($result[$key_id]);
 
         list($unique_condition, $tmp_clause_is_unique)
-            = PMA\libraries\Util::getUniqueCondition(
+            = PhpMyAdmin\Util::getUniqueCondition(
                 $result[$key_id], // handle
                 count($meta), // fields_cnt
                 $meta, // fields_meta
@@ -164,8 +164,8 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
 function PMA_loadFirstRow($table, $db)
 {
     $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($db)
-        . '.' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;',
+        'SELECT * FROM ' . PhpMyAdmin\Util::backquote($db)
+        . '.' . PhpMyAdmin\Util::backquote($table) . ' LIMIT 1;',
         null,
         PhpMyAdmin\DatabaseInterface::QUERY_STORE
     );
@@ -226,12 +226,12 @@ function PMA_showTypeOrFunction($which, $url_params, $is_show)
 
     if (! $is_show) {
         return ' : <a href="tbl_change.php'
-            . URL::getCommon($this_url_params) . '">'
+            . Url::getCommon($this_url_params) . '">'
             . PMA_showTypeOrFunctionLabel($which)
             . '</a>';
     }
     return '<th><a href="tbl_change.php'
-        . URL::getCommon($this_url_params)
+        . Url::getCommon($this_url_params)
         . '" title="' . __('Hide') . '">'
         . PMA_showTypeOrFunctionLabel($which)
         . '</a></th>';
@@ -414,7 +414,7 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
             . ' ' . $onChangeClause
             . ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
             . ' id="field_' . $idindex . '_1">';
-        $html_output .= PMA\libraries\Util::getFunctionsForField(
+        $html_output .= PhpMyAdmin\Util::getFunctionsForField(
             $column,
             $insert_mode,
             $foreignData
@@ -685,7 +685,7 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
         . 'value="' . htmlspecialchars($data) . '" />';
 
     $html_output .= '<a class="ajax browse_foreign" href="browse_foreigners.php'
-        . URL::getCommon(
+        . Url::getCommon(
             array(
                 'db' => $db,
                 'table' => $table,
@@ -779,7 +779,7 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
         $the_class = 'char';
         $textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
         $textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
+        $extracted_columnspec = PhpMyAdmin\Util::extractColumnSpec(
             $column['Type']
         );
         $maxlength = $extracted_columnspec['spec_in_brackets'];
@@ -1100,7 +1100,7 @@ function PMA_getBinaryAndBlobColumn(
     ) {
         $html_output .= __('Binary - do not edit');
         if (isset($data)) {
-            $data_size = PMA\libraries\Util::formatByteDown(
+            $data_size = PhpMyAdmin\Util::formatByteDown(
                 mb_strlen(stripslashes($data)), 3, 1
             );
             $html_output .= ' (' . $data_size[0] . ' ' . $data_size[1] . ')';
@@ -1189,7 +1189,7 @@ function PMA_getHTMLinput(
     }
     $input_min_max = false;
     if (in_array($column['True_Type'], $GLOBALS['PMA_Types']->getIntegerTypes())) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
+        $extracted_columnspec = PhpMyAdmin\Util::extractColumnSpec(
             $column['Type']
         );
         $is_unsigned = $extracted_columnspec['unsigned'];
@@ -1226,7 +1226,7 @@ function PMA_getHTMLinput(
 function PMA_getSelectOptionForUpload($vkey, $column)
 {
     $files = PMA_getFileSelectOptions(
-        PMA\libraries\Util::userDir($GLOBALS['cfg']['UploadDir'])
+        PhpMyAdmin\Util::userDir($GLOBALS['cfg']['UploadDir'])
     );
 
     if ($files === false) {
@@ -1274,7 +1274,7 @@ function PMA_getMaxUploadSize($column, $biggest_max_file_size)
         $this_field_max_size = $max_field_sizes[$column['pma_type']];
     }
     $html_output
-        = PMA\libraries\Util::getFormattedMaximumUploadSize(
+        = PhpMyAdmin\Util::getFormattedMaximumUploadSize(
             $this_field_max_size
         ) . "\n";
     // do not generate here the MAX_FILE_SIZE, because we should
@@ -1415,9 +1415,9 @@ function PMA_getColumnSize($column, $extracted_columnspec)
  */
 function PMA_getHTMLforGisDataTypes()
 {
-    $edit_str = PMA\libraries\Util::getIcon('b_edit.png', __('Edit/Insert'));
+    $edit_str = PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit/Insert'));
     return '<span class="open_gis_editor">'
-        . PMA\libraries\Util::linkOrButton(
+        . PhpMyAdmin\Util::linkOrButton(
             '#', $edit_str, array(), false, false, '_blank'
         )
         . '</span>';
@@ -1437,7 +1437,7 @@ function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url
 {
     $html_output = '<form id="continueForm" method="post"'
         . ' action="tbl_replace.php" name="continueForm">'
-        . URL::getHiddenInputs($db, $table)
+        . Url::getHiddenInputs($db, $table)
         . '<input type="hidden" name="goto"'
         . ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
         . '<input type="hidden" name="err_url"'
@@ -1605,7 +1605,7 @@ function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_
 function PMA_getSubmitAndResetButtonForActionsPanel($tabindex, $tabindex_for_value)
 {
     return '<td>'
-    . PMA\libraries\Util::showHint(
+    . PhpMyAdmin\Util::showHint(
         __(
             'Use TAB key to move from value to value,'
             . ' or CTRL+arrows to move anywhere.'
@@ -1688,7 +1688,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
     } elseif ($column['True_Type'] == 'bit') {
         $special_chars = $as_is
             ? $current_row[$column['Field']]
-            : PMA\libraries\Util::printableBitValue(
+            : PhpMyAdmin\Util::printableBitValue(
                 $current_row[$column['Field']],
                 $extracted_columnspec['spec_in_brackets']
             );
@@ -1699,7 +1699,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
     ) {
         $current_row[$column['Field']] = $as_is
             ? $current_row[$column['Field']]
-            : PMA\libraries\Util::addMicroseconds(
+            : PhpMyAdmin\Util::addMicroseconds(
                 $current_row[$column['Field']]
             );
         $special_chars = htmlspecialchars($current_row[$column['Field']]);
@@ -1707,7 +1707,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
         // Convert gis data to Well Know Text format
         $current_row[$column['Field']] = $as_is
             ? $current_row[$column['Field']]
-            : PMA\libraries\Util::asWKT(
+            : PhpMyAdmin\Util::asWKT(
                 $current_row[$column['Field']], true
             );
         $special_chars = htmlspecialchars($current_row[$column['Field']]);
@@ -1727,7 +1727,7 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
         //We need to duplicate the first \n or otherwise we will lose
         //the first newline entered in a VARCHAR or TEXT column
         $special_chars_encoded
-            = PMA\libraries\Util::duplicateFirstNewline($special_chars);
+            = PhpMyAdmin\Util::duplicateFirstNewline($special_chars);
 
         $data = $current_row[$column['Field']];
     } // end if... else...
@@ -1783,21 +1783,21 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
     $trueType = $column['True_Type'];
 
     if ($trueType == 'bit') {
-        $special_chars = PMA\libraries\Util::convertBitDefaultValue(
+        $special_chars = PhpMyAdmin\Util::convertBitDefaultValue(
             $column['Default']
         );
     } elseif (substr($trueType, 0, 9) == 'timestamp'
         || $trueType == 'datetime'
         || $trueType == 'time'
     ) {
-        $special_chars = PMA\libraries\Util::addMicroseconds($column['Default']);
+        $special_chars = PhpMyAdmin\Util::addMicroseconds($column['Default']);
     } elseif ($trueType == 'binary' || $trueType == 'varbinary') {
         $special_chars = bin2hex($column['Default']);
     } else {
         $special_chars = htmlspecialchars($column['Default']);
     }
     $backup_field = '';
-    $special_chars_encoded = PMA\libraries\Util::duplicateFirstNewline(
+    $special_chars_encoded = PhpMyAdmin\Util::duplicateFirstNewline(
         $special_chars
     );
     return array(
@@ -1872,8 +1872,8 @@ function PMA_isInsertRow()
  */
 function PMA_setSessionForEditNext($one_where_clause)
 {
-    $local_query = 'SELECT * FROM ' . PMA\libraries\Util::backquote($GLOBALS['db'])
-        . '.' . PMA\libraries\Util::backquote($GLOBALS['table']) . ' WHERE '
+    $local_query = 'SELECT * FROM ' . PhpMyAdmin\Util::backquote($GLOBALS['db'])
+        . '.' . PhpMyAdmin\Util::backquote($GLOBALS['table']) . ' WHERE '
         . str_replace('` =', '` >', $one_where_clause) . ' LIMIT 1;';
 
     $res            = $GLOBALS['dbi']->query($local_query);
@@ -1882,7 +1882,7 @@ function PMA_setSessionForEditNext($one_where_clause)
     // must find a unique condition based on unique key,
     // not a combination of all fields
     list($unique_condition, $clause_is_unique)
-        = PMA\libraries\Util::getUniqueCondition(
+        = PhpMyAdmin\Util::getUniqueCondition(
             $res, // handle
             count($meta), // fields_cnt
             $meta, // fields_meta
@@ -1948,7 +1948,7 @@ function PMA_getErrorUrl($url_params)
     if (isset($_REQUEST['err_url'])) {
         return $_REQUEST['err_url'];
     } else {
-        return 'tbl_change.php' . URL::getCommon($url_params);
+        return 'tbl_change.php' . Url::getCommon($url_params);
     }
 }
 
@@ -1970,7 +1970,7 @@ function PMA_buildSqlQuery($is_insertignore, $query_fields, $value_sets)
     }
     $query = array(
         $insert_command . 'INTO '
-        . PMA\libraries\Util::backquote($GLOBALS['table'])
+        . PhpMyAdmin\Util::backquote($GLOBALS['table'])
         . ' (' . implode(', ', $query_fields) . ') VALUES ('
         . implode('), (', $value_sets) . ')'
     );
@@ -2085,10 +2085,10 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison,
     );
     // Field to display from the foreign table?
     if (isset($display_field) && strlen($display_field) > 0) {
-        $dispsql = 'SELECT ' . PMA\libraries\Util::backquote($display_field)
-            . ' FROM ' . PMA\libraries\Util::backquote($foreigner['foreign_db'])
-            . '.' . PMA\libraries\Util::backquote($foreigner['foreign_table'])
-            . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field'])
+        $dispsql = 'SELECT ' . PhpMyAdmin\Util::backquote($display_field)
+            . ' FROM ' . PhpMyAdmin\Util::backquote($foreigner['foreign_db'])
+            . '.' . PhpMyAdmin\Util::backquote($foreigner['foreign_table'])
+            . ' WHERE ' . PhpMyAdmin\Util::backquote($foreigner['foreign_field'])
             . $where_comparison;
         $dispresult  = $GLOBALS['dbi']->tryQuery(
             $dispsql, null, PhpMyAdmin\DatabaseInterface::QUERY_STORE
@@ -2136,13 +2136,13 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field,
         'table' => $foreigner['foreign_table'],
         'pos'   => '0',
         'sql_query' => 'SELECT * FROM '
-            . PMA\libraries\Util::backquote($foreigner['foreign_db'])
-            . '.' . PMA\libraries\Util::backquote($foreigner['foreign_table'])
-            . ' WHERE ' . PMA\libraries\Util::backquote($foreigner['foreign_field'])
+            . PhpMyAdmin\Util::backquote($foreigner['foreign_db'])
+            . '.' . PhpMyAdmin\Util::backquote($foreigner['foreign_table'])
+            . ' WHERE ' . PhpMyAdmin\Util::backquote($foreigner['foreign_field'])
             . $where_comparison
     );
     $output = '<a href="sql.php'
-        . URL::getCommon($_url_params) . '"' . $title . '>';
+        . Url::getCommon($_url_params) . '"' . $title . '>';
 
     if ('D' == $_SESSION['tmpval']['relational_display']) {
         // user chose "relational display field" in the
@@ -2188,7 +2188,7 @@ function PMA_transformEditedValues($db, $table,
             ? $transformation[$type . '_options']
             : ''
         );
-        $transform_options['wrapper_link'] = URL::getCommon($_url_params);
+        $transform_options['wrapper_link'] = Url::getCommon($_url_params);
         $class_name = Transformations::getClassName($include_file);
         /** @var TransformationsPlugin $transformation_plugin */
         $transformation_plugin = new $class_name();
@@ -2296,7 +2296,7 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
             $query_values[] = $current_value_as_an_array;
             // first inserted row so prepare the list of fields
             if (empty($value_sets)) {
-                $query_fields[] = PMA\libraries\Util::backquote(
+                $query_fields[] = PhpMyAdmin\Util::backquote(
                     $multi_edit_columns_name[$key]
                 );
             }
@@ -2310,7 +2310,7 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
         // field had the null checkbox before the update
         // field no longer has the null checkbox
         $query_values[]
-            = PMA\libraries\Util::backquote($multi_edit_columns_name[$key])
+            = PhpMyAdmin\Util::backquote($multi_edit_columns_name[$key])
             . ' = ' . $current_value_as_an_array;
     } elseif (empty($multi_edit_funcs[$key])
         && isset($multi_edit_columns_prev[$key])
@@ -2326,7 +2326,7 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
             || empty($multi_edit_columns_null[$key])
         ) {
              $query_values[]
-                 = PMA\libraries\Util::backquote($multi_edit_columns_name[$key])
+                 = PhpMyAdmin\Util::backquote($multi_edit_columns_name[$key])
                 . ' = ' . $current_value_as_an_array;
         }
     }
@@ -2365,7 +2365,7 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
         && is_array($multi_edit_columns_type) && !empty($where_clause)
     ) {
         $protected_row = $GLOBALS['dbi']->fetchSingleRow(
-            'SELECT * FROM ' . PMA\libraries\Util::backquote($table)
+            'SELECT * FROM ' . PhpMyAdmin\Util::backquote($table)
             . ' WHERE ' . $where_clause . ';'
         );
     }
@@ -2469,10 +2469,10 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
 
     $extra_data['isNeedToRecheck'] = false;
 
-    $sql_for_real_value = 'SELECT ' . PMA\libraries\Util::backquote($table) . '.'
-        . PMA\libraries\Util::backquote($column_name)
-        . ' FROM ' . PMA\libraries\Util::backquote($db) . '.'
-        . PMA\libraries\Util::backquote($table)
+    $sql_for_real_value = 'SELECT ' . PhpMyAdmin\Util::backquote($table) . '.'
+        . PhpMyAdmin\Util::backquote($column_name)
+        . ' FROM ' . PhpMyAdmin\Util::backquote($db) . '.'
+        . PhpMyAdmin\Util::backquote($table)
         . ' WHERE ' . $_REQUEST['where_clause'][0];
 
     $result = $GLOBALS['dbi']->tryQuery($sql_for_real_value);
@@ -2484,7 +2484,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
             || ($meta->type == 'datetime')
             || ($meta->type == 'time')
         ) {
-            $new_value = PMA\libraries\Util::addMicroseconds($new_value);
+            $new_value = PhpMyAdmin\Util::addMicroseconds($new_value);
         }
         $extra_data['isNeedToRecheck'] = true;
         $extra_data['truncatableFieldValue'] = $new_value;
@@ -2764,7 +2764,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     }
 
     $extracted_columnspec
-        = PMA\libraries\Util::extractColumnSpec($column['Type']);
+        = PhpMyAdmin\Util::extractColumnSpec($column['Type']);
 
     if (-1 === $column['len']) {
         $column['len'] = $GLOBALS['dbi']->fieldLen(
@@ -2803,7 +2803,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     } //End if
 
     // Get a list of GIS data types.
-    $gis_data_types = PMA\libraries\Util::getGISDatatypes();
+    $gis_data_types = PhpMyAdmin\Util::getGISDatatypes();
 
     // Prepares the field value
     $real_null_value = false;
@@ -2838,7 +2838,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     $tabindex = $idindex;
 
     // Get a list of data types that are not yet supported.
-    $no_support_types = PMA\libraries\Util::unsupportedDatatypes();
+    $no_support_types = PhpMyAdmin\Util::unsupportedDatatypes();
 
     // The function column
     // -------------------
@@ -2899,7 +2899,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
                 'where_clause'  => $where_clause
             );
             $transformation_options['wrapper_link']
-                = URL::getCommon($_url_params);
+                = Url::getCommon($_url_params);
             $current_value = '';
             if (isset($current_row[$column['Field']])) {
                 $current_value = $current_row[$column['Field']];
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 4921e462ea..307538bda5 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -105,7 +105,7 @@ if (! empty($submit_mult)
             );
             exit;
         case 'show_create':
-            $show_create = PMA\libraries\Template::get(
+            $show_create = PhpMyAdmin\Template::get(
                 'database/structure/show_create'
             )
                 ->render(
@@ -174,7 +174,7 @@ if (!empty($submit_mult) && !empty($what)) {
             $tooltip_truename,
             $tooltip_aliasname,
             $pos
-        ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+        ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
     } else {
         include_once './libraries/server_common.inc.php';
@@ -224,7 +224,7 @@ if (!empty($submit_mult) && !empty($what)) {
         // Gets table primary key
         $GLOBALS['dbi']->selectDb($db);
         $result = $GLOBALS['dbi']->query(
-            'SHOW KEYS FROM ' . PMA\libraries\Util::backquote($table) . ';'
+            'SHOW KEYS FROM ' . PhpMyAdmin\Util::backquote($table) . ';'
         );
         $primary = '';
         while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
@@ -240,7 +240,7 @@ if (!empty($submit_mult) && !empty($what)) {
         || $query_type == 'empty_tbl'
         || $query_type == 'row_delete'
     ) {
-        $default_fk_check_value = PMA\libraries\Util::handleDisableFKCheckInit();
+        $default_fk_check_value = PhpMyAdmin\Util::handleDisableFKCheckInit();
     }
 
     list(
@@ -304,7 +304,7 @@ if (!empty($submit_mult) && !empty($what)) {
         || $query_type == 'empty_tbl'
         || $query_type == 'row_delete'
     ) {
-        PMA\libraries\Util::handleDisableFKCheckCleanup($default_fk_check_value);
+        PhpMyAdmin\Util::handleDisableFKCheckCleanup($default_fk_check_value);
     }
     if ($rebuild_database_list) {
         // avoid a problem with the database list navigator
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index a80784805d..53b3782998 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -9,9 +9,9 @@
  */
 
 use PhpMyAdmin\Sql;
-use PMA\libraries\Table;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
 
 /**
  * Gets url params
@@ -47,7 +47,7 @@ function PMA_getUrlParams(
     foreach ($selected as $sval) {
         if ($what == 'row_delete') {
             $_url_params['selected'][] = 'DELETE FROM '
-                . PMA\libraries\Util::backquote($table)
+                . PhpMyAdmin\Util::backquote($table)
                 . ' WHERE ' . $sval . ' LIMIT 1;';
         } else {
             $_url_params['selected'][] = $sval;
@@ -116,7 +116,7 @@ function PMA_buildOrExecuteQueryForMulti(
         case 'drop_db':
             PMA_relationsCleanupDatabase($selected[$i]);
             $a_query   = 'DROP DATABASE '
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $reload    = 1;
             $run_parts = true;
             $rebuild_database_list = true;
@@ -127,104 +127,104 @@ function PMA_buildOrExecuteQueryForMulti(
             $current = $selected[$i];
             if (!empty($views) && in_array($current, $views)) {
                 $sql_query_views .= (empty($sql_query_views) ? 'DROP VIEW ' : ', ')
-                          . PMA\libraries\Util::backquote($current);
+                          . PhpMyAdmin\Util::backquote($current);
             } else {
                 $sql_query .= (empty($sql_query) ? 'DROP TABLE ' : ', ')
-                           . PMA\libraries\Util::backquote($current);
+                           . PhpMyAdmin\Util::backquote($current);
             }
             $reload    = 1;
             break;
 
         case 'check_tbl':
             $sql_query .= (empty($sql_query) ? 'CHECK TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $execute_query_later = true;
             break;
 
         case 'optimize_tbl':
             $sql_query .= (empty($sql_query) ? 'OPTIMIZE TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $execute_query_later = true;
             break;
 
         case 'analyze_tbl':
             $sql_query .= (empty($sql_query) ? 'ANALYZE TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $execute_query_later = true;
             break;
 
         case 'checksum_tbl':
             $sql_query .= (empty($sql_query) ? 'CHECKSUM TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $execute_query_later = true;
             break;
 
         case 'repair_tbl':
             $sql_query .= (empty($sql_query) ? 'REPAIR TABLE ' : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i]);
+                       . PhpMyAdmin\Util::backquote($selected[$i]);
             $execute_query_later = true;
             break;
 
         case 'empty_tbl':
             $deletes = true;
             $a_query = 'TRUNCATE ';
-            $a_query .= PMA\libraries\Util::backquote($selected[$i]);
+            $a_query .= PhpMyAdmin\Util::backquote($selected[$i]);
             $run_parts = true;
             break;
 
         case 'drop_fld':
             PMA_relationsCleanupColumn($db, $table, $selected[$i]);
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                 : ',')
-                       . ' DROP ' . PMA\libraries\Util::backquote($selected[$i])
+                       . ' DROP ' . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ';' : '');
             break;
 
         case 'primary_fld':
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                     . (empty($primary)
                     ? ''
                     : ' DROP PRIMARY KEY,') . ' ADD PRIMARY KEY( '
                 : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
+                       . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ');' : '');
             break;
 
         case 'index_fld':
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                     . ' ADD INDEX( '
                 : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
+                       . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ');' : '');
             break;
 
         case 'unique_fld':
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                     . ' ADD UNIQUE( '
                 : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
+                       . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ');' : '');
             break;
 
         case 'spatial_fld':
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                     . ' ADD SPATIAL( '
                 : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
+                       . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ');' : '');
             break;
 
         case 'fulltext_fld':
             $sql_query .= (empty($sql_query)
-                ? 'ALTER TABLE ' . PMA\libraries\Util::backquote($table)
+                ? 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($table)
                     . ' ADD FULLTEXT( '
                 : ', ')
-                       . PMA\libraries\Util::backquote($selected[$i])
+                       . PhpMyAdmin\Util::backquote($selected[$i])
                        . (($i == $selected_cnt-1) ? ');' : '');
             break;
 
@@ -232,9 +232,9 @@ function PMA_buildOrExecuteQueryForMulti(
             $newtablename = $_POST['add_prefix'] . $selected[$i];
             // ADD PREFIX TO TABLE NAME
             $a_query = 'ALTER TABLE '
-                . PMA\libraries\Util::backquote($selected[$i])
+                . PhpMyAdmin\Util::backquote($selected[$i])
                 . ' RENAME '
-                . PMA\libraries\Util::backquote($newtablename);
+                . PhpMyAdmin\Util::backquote($newtablename);
             $run_parts = true;
             break;
 
@@ -256,9 +256,9 @@ function PMA_buildOrExecuteQueryForMulti(
             }
             // CHANGE PREFIX PATTERN
             $a_query = 'ALTER TABLE '
-                . PMA\libraries\Util::backquote($selected[$i])
+                . PhpMyAdmin\Util::backquote($selected[$i])
                 . ' RENAME '
-                . PMA\libraries\Util::backquote($newtablename);
+                . PhpMyAdmin\Util::backquote($newtablename);
             $run_parts = true;
             break;
 
@@ -330,7 +330,7 @@ function PMA_buildOrExecuteQueryForMulti(
 function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
 {
     $html = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= URL::getHiddenInputs($_url_params);
+    $html .= Url::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $databases_list = $GLOBALS['dblist']->databases;
     foreach ($databases_list as $key => $db_name)
@@ -375,7 +375,7 @@ function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
 function PMA_getHtmlForReplacePrefixTable($action, $_url_params)
 {
     $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= URL::getHiddenInputs($_url_params);
+    $html .= Url::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $html .= '<table>';
     $html .= '<tr>';
@@ -409,7 +409,7 @@ function PMA_getHtmlForReplacePrefixTable($action, $_url_params)
 function PMA_getHtmlForAddPrefixTable($action, $_url_params)
 {
     $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= URL::getHiddenInputs($_url_params);
+    $html .= Url::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $html .= '<table>';
     $html .= '<tr>';
@@ -440,7 +440,7 @@ function PMA_getHtmlForAddPrefixTable($action, $_url_params)
 function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
 {
     $html = '<form action="' . $action . '" method="post">';
-    $html .= URL::getHiddenInputs($_url_params);
+    $html .= Url::getHiddenInputs($_url_params);
     $html .= '<fieldset class="confirmation">';
     $html .= '<legend>';
     if ($what == 'drop_db') {
@@ -458,7 +458,7 @@ function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
     // Display option to disable foreign key checks while dropping tables
     if ($what === 'drop_tbl' || $what === 'empty_tbl' || $what === 'row_delete') {
         $html .= '<div id="foreignkeychk">';
-        $html .= PMA\libraries\Util::getFKCheckbox();
+        $html .= PhpMyAdmin\Util::getFKCheckbox();
         $html .= '</div>';
     }
     $html .= '<input id="buttonYes" type="submit" name="mult_btn" value="'
@@ -497,7 +497,7 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
         switch ($what) {
         case 'row_delete':
             $full_query .= 'DELETE FROM '
-                . PMA\libraries\Util::backquote(htmlspecialchars($table))
+                . PhpMyAdmin\Util::backquote(htmlspecialchars($table))
                 // Do not append a "LIMIT 1" clause here
                 // (it's not binlog friendly).
                 // We don't need the clause because the calling panel permits
@@ -507,7 +507,7 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
             break;
         case 'drop_db':
             $full_query .= 'DROP DATABASE '
-                . PMA\libraries\Util::backquote(htmlspecialchars($sval))
+                . PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
                 . ';<br />';
             $reload = true;
             break;
@@ -516,31 +516,31 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
             $current = $sval;
             if (!empty($views) && in_array($current, $views)) {
                 $full_query_views .= (empty($full_query_views) ? 'DROP VIEW ' : ', ')
-                    . PMA\libraries\Util::backquote(htmlspecialchars($current));
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($current));
             } else {
                 $full_query .= (empty($full_query) ? 'DROP TABLE ' : ', ')
-                    . PMA\libraries\Util::backquote(htmlspecialchars($current));
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($current));
             }
             break;
 
         case 'empty_tbl':
             $full_query .= 'TRUNCATE ';
-            $full_query .= PMA\libraries\Util::backquote(htmlspecialchars($sval))
+            $full_query .= PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
                         . ';<br />';
             break;
 
         case 'primary_fld':
             if ($full_query == '') {
                 $full_query .= 'ALTER TABLE '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($table))
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($table))
                     . '<br />&nbsp;&nbsp;DROP PRIMARY KEY,'
                     . '<br />&nbsp;&nbsp; ADD PRIMARY KEY('
                     . '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($sval))
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
                     . ',';
             } else {
                 $full_query .= '<br />&nbsp;&nbsp;&nbsp;&nbsp; '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($sval))
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
                     . ',';
             }
             if ($i == $selected_cnt-1) {
@@ -551,10 +551,10 @@ function PMA_getQueryFromSelected($what, $table, $selected, $views)
         case 'drop_fld':
             if ($full_query == '') {
                 $full_query .= 'ALTER TABLE '
-                    . PMA\libraries\Util::backquote(htmlspecialchars($table));
+                    . PhpMyAdmin\Util::backquote(htmlspecialchars($table));
             }
             $full_query .= '<br />&nbsp;&nbsp;DROP '
-                . PMA\libraries\Util::backquote(htmlspecialchars($sval))
+                . PhpMyAdmin\Util::backquote(htmlspecialchars($sval))
                 . ',';
             if ($i == $selected_cnt - 1) {
                 $full_query = preg_replace('@,$@', ';<br />', $full_query);
diff --git a/libraries/navigation/Navigation.php b/libraries/navigation/Navigation.php
index 1d0a7b773c..95b883e3ce 100644
--- a/libraries/navigation/Navigation.php
+++ b/libraries/navigation/Navigation.php
@@ -11,8 +11,8 @@ namespace PMA\libraries\navigation;
 use PMA\libraries\config\PageSettings;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * The navigation panel - displays server, db and table selection tree
@@ -165,7 +165,7 @@ class Navigation
     {
         $html  = '<form method="post" action="navigation.php" class="ajax">';
         $html .= '<fieldset>';
-        $html .= URL::getHiddenInputs($dbName, $tableName);
+        $html .= Url::getHiddenInputs($dbName, $tableName);
 
         $navTable = Util::backquote($GLOBALS['cfgRelation']['db'])
             . "." . Util::backquote($GLOBALS['cfgRelation']['navigationhiding']);
@@ -217,7 +217,7 @@ class Navigation
                         $html .= '<tr>';
                         $html .= '<td>' . htmlspecialchars($hiddenItem) . '</td>';
                         $html .= '<td style="width:80px"><a href="navigation.php'
-                            . URL::getCommon($params) . '"'
+                            . Url::getCommon($params) . '"'
                             . ' class="unhideNavItem ajax">'
                             . Util::getIcon('show.png', __('Show'))
                             .  '</a></td>';
diff --git a/libraries/navigation/NavigationHeader.php b/libraries/navigation/NavigationHeader.php
index fa2cc6386c..aba2b38910 100644
--- a/libraries/navigation/NavigationHeader.php
+++ b/libraries/navigation/NavigationHeader.php
@@ -7,10 +7,10 @@
  */
 namespace PMA\libraries\navigation;
 
-use PMA;
-use PMA\libraries\Template;
-use PMA\libraries\URL;
 use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * This class renders the logo, links, server selection,
@@ -28,9 +28,9 @@ class NavigationHeader
     public function getDisplay()
     {
         if (empty($GLOBALS['url_query'])) {
-            $GLOBALS['url_query'] = URL::getCommon();
+            $GLOBALS['url_query'] = Url::getCommon();
         }
-        $link_url = URL::getCommon(
+        $link_url = Url::getCommon(
             array(
                 'ajax_request' => true,
             )
@@ -55,7 +55,7 @@ class NavigationHeader
         $buffer .= $this->_logo();
         $buffer .= $this->_links();
         $buffer .= $this->_serverChoice();
-        $buffer .= PMA\libraries\Util::getImage(
+        $buffer .= Util::getImage(
             'ajax_clock_small.gif',
             __('Loading…'),
             array(
@@ -124,7 +124,7 @@ class NavigationHeader
                 PHP_URL_HOST
             );
             if (empty($host)) {
-                $logoLink .= URL::getCommon();
+                $logoLink .= Url::getCommon();
             } else {
                 $linkAttriks = 'target="_blank" rel="noopener noreferrer"';
             }
@@ -156,8 +156,8 @@ class NavigationHeader
 
         $retval = '<!-- LINKS START -->';
         $retval .= '<div id="navipanellinks">';
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            'index.php' . URL::getCommon(),
+        $retval .= Util::getNavigationLink(
+            'index.php' . Url::getCommon(),
             $showText,
             __('Home'),
             $showIcon,
@@ -172,7 +172,7 @@ class NavigationHeader
                 $text = __('Empty session data');
             }
             $link = 'logout.php' . $GLOBALS['url_query'];
-            $retval .= PMA\libraries\Util::getNavigationLink(
+            $retval .= Util::getNavigationLink(
                 $link,
                 $showText,
                 $text,
@@ -184,8 +184,8 @@ class NavigationHeader
                 array('logout')
             );
         }
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            PMA\libraries\Util::getDocuLink('index'),
+        $retval .= Util::getNavigationLink(
+            Util::getDocuLink('index'),
             $showText,
             __('phpMyAdmin documentation'),
             $showIcon,
@@ -194,8 +194,8 @@ class NavigationHeader
             false,
             'documentation'
         );
-        $retval .= PMA\libraries\Util::getNavigationLink(
-            PMA\libraries\Util::getMySQLDocuURL('', ''),
+        $retval .= Util::getNavigationLink(
+            Util::getMySQLDocuURL('', ''),
             $showText,
             __('Documentation'),
             $showIcon,
@@ -204,7 +204,7 @@ class NavigationHeader
             false,
             'mysql_doc'
         );
-        $retval .= PMA\libraries\Util::getNavigationLink(
+        $retval .= Util::getNavigationLink(
             '#',
             $showText,
             __('Navigation panel settings'),
@@ -215,7 +215,7 @@ class NavigationHeader
             '',
             defined('PMA_DISABLE_NAVI_SETTINGS') ? array('hide') : array()
         );
-        $retval .= PMA\libraries\Util::getNavigationLink(
+        $retval .= Util::getNavigationLink(
             '#',
             $showText,
             __('Reload navigation panel'),
diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 9d11da5500..d9ffa8a9de 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -14,8 +14,8 @@ use PMA\libraries\navigation\nodes\NodeTableContainer;
 use PMA\libraries\navigation\nodes\NodeViewContainer;
 use PhpMyAdmin\RecentFavoriteTable;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/check_user_privileges.lib.php';
 
@@ -1268,7 +1268,7 @@ class NavigationTree
         );
         $retval .= '<div id="pma_navigation_db_select">';
         $retval .= '<form action="index.php">';
-        $retval .= URL::getHiddenFields($url_params);
+        $retval .= Url::getHiddenFields($url_params);
         $retval .= '<select name="db" class="hide" id="navi_db_select">'
             . '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
             . '(' . __('Databases') . ') ...</option>' . "\n";
@@ -1359,7 +1359,7 @@ class NavigationTree
             );
             $retval .= '<li class="fast_filter db_fast_filter">';
             $retval .= '<form class="ajax fast_filter">';
-            $retval .= URL::getHiddenInputs($url_params);
+            $retval .= Url::getHiddenInputs($url_params);
             $retval .= '<input class="searchClause" type="text"';
             $retval .= ' name="searchClause" accesskey="q"';
             $retval .= " placeholder='"
@@ -1391,7 +1391,7 @@ class NavigationTree
             );
             $retval .= "<li class='fast_filter'>";
             $retval .= "<form class='ajax fast_filter'>";
-            $retval .= URL::getHiddenFields($url_params);
+            $retval .= Url::getHiddenFields($url_params);
             $retval .= "<input class='searchClause' type='text'";
             $retval .= " name='searchClause2'";
             $retval .= " placeholder='"
diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php
index f265fca288..62f4a6c9b5 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/navigation/nodes/Node.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * The Node is the building block for the collapsible navigation tree
diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/navigation/nodes/NodeColumn.php
index 99b8afeaf8..99bcd8978e 100644
--- a/libraries/navigation/nodes/NodeColumn.php
+++ b/libraries/navigation/nodes/NodeColumn.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a columns node in the navigation tree
@@ -27,7 +27,7 @@ class NodeColumn extends Node
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('pause.png', __('Column'));
+        $this->icon = Util::getImage('pause.png', __('Column'));
         $this->links = array(
             'text'  => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s&amp;field=%1$s'
@@ -39,4 +39,3 @@ class NodeColumn extends Node
         );
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/navigation/nodes/NodeColumnContainer.php
index c3eceff6d0..308f00ff0c 100644
--- a/libraries/navigation/nodes/NodeColumnContainer.php
+++ b/libraries/navigation/nodes/NodeColumnContainer.php
@@ -7,9 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for column nodes in the navigation tree
@@ -52,4 +51,3 @@ class NodeColumnContainer extends Node
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/navigation/nodes/NodeDatabase.php
index 821c47febb..bf0b71bbb4 100644
--- a/libraries/navigation/nodes/NodeDatabase.php
+++ b/libraries/navigation/nodes/NodeDatabase.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a database node in the navigation tree
@@ -677,7 +677,7 @@ class NodeDatabase extends Node
                 );
                 $ret = '<span class="dbItemControls">'
                     . '<a href="navigation.php'
-                    . URL::getCommon($params) . '"'
+                    . Url::getCommon($params) . '"'
                     . ' class="showUnhide ajax">'
                     . Util::getImage(
                         'show.png',
@@ -712,4 +712,3 @@ class NodeDatabase extends Node
         return $this->hiddenCount;
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeDatabaseChild.php b/libraries/navigation/nodes/NodeDatabaseChild.php
index 4568bc9f94..bcea8cdede 100644
--- a/libraries/navigation/nodes/NodeDatabaseChild.php
+++ b/libraries/navigation/nodes/NodeDatabaseChild.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a node that is a child of a database node
@@ -48,9 +48,9 @@ abstract class NodeDatabaseChild extends Node
 
             $ret = '<span class="navItemControls">'
                 . '<a href="navigation.php'
-                . URL::getCommon($params) . '"'
+                . Url::getCommon($params) . '"'
                 . ' class="hideNavItem ajax">'
-                . PMA\libraries\Util::getImage('hide.png', __('Hide'))
+                . Util::getImage('hide.png', __('Hide'))
                 . '</a></span>';
         }
 
diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/navigation/nodes/NodeDatabaseContainer.php
index 9c5dc3c788..73fbb5003e 100644
--- a/libraries/navigation/nodes/NodeDatabaseContainer.php
+++ b/libraries/navigation/nodes/NodeDatabaseContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 require_once './libraries/check_user_privileges.lib.php';
 
@@ -36,7 +36,7 @@ class NodeDatabaseContainer extends Node
                 _pgettext('Create new database', 'New')
             );
             $new->isNew = true;
-            $new->icon = PMA\libraries\Util::getImage('b_newdb.png', '');
+            $new->icon = Util::getImage('b_newdb.png', '');
             $new->links = array(
                 'text' => 'server_databases.php?server=' . $GLOBALS['server'],
                 'icon' => 'server_databases.php?server=' . $GLOBALS['server'],
diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/navigation/nodes/NodeEvent.php
index 6723bab43d..45a25f9930 100644
--- a/libraries/navigation/nodes/NodeEvent.php
+++ b/libraries/navigation/nodes/NodeEvent.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a event node in the navigation tree
@@ -27,7 +27,7 @@ class NodeEvent extends NodeDatabaseChild
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_events.png');
+        $this->icon = Util::getImage('b_events.png');
         $this->links = array(
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;edit_item=1',
@@ -47,4 +47,3 @@ class NodeEvent extends NodeDatabaseChild
         return 'event';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/navigation/nodes/NodeEventContainer.php
index 5c3efbad5a..10362c9f1c 100644
--- a/libraries/navigation/nodes/NodeEventContainer.php
+++ b/libraries/navigation/nodes/NodeEventContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for events nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer
     public function __construct()
     {
         parent::__construct(__('Events'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_events.png', '');
+        $this->icon = Util::getImage('b_events.png', '');
         $this->links = array(
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s',
@@ -37,7 +37,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer
             _pgettext('Create new event', 'New')
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_event_add.png', '');
+        $new->icon = Util::getImage('b_event_add.png', '');
         $new->links = array(
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
@@ -48,4 +48,3 @@ class NodeEventContainer extends NodeDatabaseChildContainer
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeFunction.php b/libraries/navigation/nodes/NodeFunction.php
index 1cf75a694c..0523f0bc64 100644
--- a/libraries/navigation/nodes/NodeFunction.php
+++ b/libraries/navigation/nodes/NodeFunction.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a function node in the navigation tree
@@ -27,7 +27,7 @@ class NodeFunction extends NodeDatabaseChild
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_routines.png', __('Function'));
+        $this->icon = Util::getImage('b_routines.png', __('Function'));
         $this->links = array(
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=FUNCTION'
@@ -49,4 +49,3 @@ class NodeFunction extends NodeDatabaseChild
         return 'function';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/navigation/nodes/NodeFunctionContainer.php
index 1c6d510eec..f0864762a3 100644
--- a/libraries/navigation/nodes/NodeFunctionContainer.php
+++ b/libraries/navigation/nodes/NodeFunctionContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for functions nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
     public function __construct()
     {
         parent::__construct(__('Functions'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage(
+        $this->icon = Util::getImage(
             'b_routines.png',
             __('Functions')
         );
@@ -41,7 +41,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
             $new_label
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label);
+        $new->icon = Util::getImage('b_routine_add.png', $new_label);
         $new->links = array(
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1&amp;item_type=FUNCTION',
@@ -52,4 +52,3 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeIndex.php b/libraries/navigation/nodes/NodeIndex.php
index 1cf06f87d6..a836ce89c0 100644
--- a/libraries/navigation/nodes/NodeIndex.php
+++ b/libraries/navigation/nodes/NodeIndex.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a index node in the navigation tree
@@ -27,7 +27,7 @@ class NodeIndex extends Node
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Index'));
+        $this->icon = Util::getImage('b_index.png', __('Index'));
         $this->links = array(
             'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s&amp;index=%1$s',
@@ -37,4 +37,3 @@ class NodeIndex extends Node
         $this->classes = 'index';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/navigation/nodes/NodeIndexContainer.php
index e914cfd6d8..5d34361efe 100644
--- a/libraries/navigation/nodes/NodeIndexContainer.php
+++ b/libraries/navigation/nodes/NodeIndexContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for index nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeIndexContainer extends Node
     public function __construct()
     {
         parent::__construct(__('Indexes'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Indexes'));
+        $this->icon = Util::getImage('b_index.png', __('Indexes'));
         $this->links = array(
             'text' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
@@ -38,7 +38,7 @@ class NodeIndexContainer extends Node
             $new_label
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_index_add.png', $new_label);
+        $new->icon = Util::getImage('b_index_add.png', $new_label);
         $new->links = array(
             'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;create_index=1&amp;added_fields=2'
@@ -51,4 +51,3 @@ class NodeIndexContainer extends Node
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeProcedure.php b/libraries/navigation/nodes/NodeProcedure.php
index 069d7f3df4..be3a891b17 100644
--- a/libraries/navigation/nodes/NodeProcedure.php
+++ b/libraries/navigation/nodes/NodeProcedure.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a procedure node in the navigation tree
@@ -27,7 +27,7 @@ class NodeProcedure extends NodeDatabaseChild
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage(
+        $this->icon = Util::getImage(
             'b_routines.png',
             __('Procedure')
         );
@@ -52,4 +52,3 @@ class NodeProcedure extends NodeDatabaseChild
         return 'procedure';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/navigation/nodes/NodeProcedureContainer.php
index 9e1d5dab97..e88b2e32ed 100644
--- a/libraries/navigation/nodes/NodeProcedureContainer.php
+++ b/libraries/navigation/nodes/NodeProcedureContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for procedure nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
     public function __construct()
     {
         parent::__construct(__('Procedures'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage(
+        $this->icon = Util::getImage(
             'b_routines.png',
             __('Procedures')
         );
@@ -41,7 +41,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
             $new_label
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label);
+        $new->icon = Util::getImage('b_routine_add.png', $new_label);
         $new->links = array(
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
@@ -52,4 +52,3 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeTable.php b/libraries/navigation/nodes/NodeTable.php
index 5c0a04cc2e..65cd08167d 100644
--- a/libraries/navigation/nodes/NodeTable.php
+++ b/libraries/navigation/nodes/NodeTable.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a columns node in the navigation tree
diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/navigation/nodes/NodeTableContainer.php
index 9b506ea2bb..61d993bad9 100644
--- a/libraries/navigation/nodes/NodeTableContainer.php
+++ b/libraries/navigation/nodes/NodeTableContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for table nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer
     public function __construct()
     {
         parent::__construct(__('Tables'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_browse.png', __('Tables'));
+        $this->icon = Util::getImage('b_browse.png', __('Tables'));
         $this->links = array(
             'text' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=table',
@@ -39,7 +39,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer
             $new_label
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_table_add.png', $new_label);
+        $new->icon = Util::getImage('b_table_add.png', $new_label);
         $new->links = array(
             'text' => 'tbl_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
@@ -50,4 +50,3 @@ class NodeTableContainer extends NodeDatabaseChildContainer
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeTrigger.php b/libraries/navigation/nodes/NodeTrigger.php
index a90ddda179..42dff457d3 100644
--- a/libraries/navigation/nodes/NodeTrigger.php
+++ b/libraries/navigation/nodes/NodeTrigger.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a trigger node in the navigation tree
@@ -27,7 +27,7 @@ class NodeTrigger extends Node
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_triggers.png');
+        $this->icon = Util::getImage('b_triggers.png');
         $this->links = array(
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;item_name=%1$s&amp;edit_item=1',
@@ -37,4 +37,3 @@ class NodeTrigger extends Node
         $this->classes = 'trigger';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/navigation/nodes/NodeTriggerContainer.php
index 1cd379017b..422d2708b6 100644
--- a/libraries/navigation/nodes/NodeTriggerContainer.php
+++ b/libraries/navigation/nodes/NodeTriggerContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for trigger nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeTriggerContainer extends Node
     public function __construct()
     {
         parent::__construct(__('Triggers'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_triggers.png');
+        $this->icon = Util::getImage('b_triggers.png');
         $this->links = array(
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
@@ -37,7 +37,7 @@ class NodeTriggerContainer extends Node
             _pgettext('Create new trigger', 'New')
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_trigger_add.png', '');
+        $new->icon = Util::getImage('b_trigger_add.png', '');
         $new->links = array(
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;add_item=1',
@@ -48,4 +48,3 @@ class NodeTriggerContainer extends Node
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeView.php b/libraries/navigation/nodes/NodeView.php
index 2ec500cd34..b4c548f155 100644
--- a/libraries/navigation/nodes/NodeView.php
+++ b/libraries/navigation/nodes/NodeView.php
@@ -7,7 +7,7 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a view node in the navigation tree
@@ -27,7 +27,7 @@ class NodeView extends NodeDatabaseChild
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = PMA\libraries\Util::getImage('b_props.png', __('View'));
+        $this->icon = Util::getImage('b_props.png', __('View'));
         $this->links = array(
             'text' => 'sql.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s&amp;pos=0',
@@ -47,4 +47,3 @@ class NodeView extends NodeDatabaseChild
         return 'view';
     }
 }
-
diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/navigation/nodes/NodeViewContainer.php
index 78df8085c5..dfa5486f88 100644
--- a/libraries/navigation/nodes/NodeViewContainer.php
+++ b/libraries/navigation/nodes/NodeViewContainer.php
@@ -7,8 +7,8 @@
  */
 namespace PMA\libraries\navigation\nodes;
 
-use PMA;
 use PMA\libraries\navigation\NodeFactory;
+use PhpMyAdmin\Util;
 
 /**
  * Represents a container for view nodes in the navigation tree
@@ -23,7 +23,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer
     public function __construct()
     {
         parent::__construct(__('Views'), Node::CONTAINER);
-        $this->icon = PMA\libraries\Util::getImage('b_views.png', __('Views'));
+        $this->icon = Util::getImage('b_views.png', __('Views'));
         $this->links = array(
             'text' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=view',
@@ -39,7 +39,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer
             $new_label
         );
         $new->isNew = true;
-        $new->icon = PMA\libraries\Util::getImage('b_view_add.png', $new_label);
+        $new->icon = Util::getImage('b_view_add.png', $new_label);
         $new->links = array(
             'text' => 'view_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
@@ -50,4 +50,3 @@ class NodeViewContainer extends NodeDatabaseChildContainer
         $this->addChild($new);
     }
 }
-
diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php
index 9c92b1d9fa..1aa0cb023b 100644
--- a/libraries/normalization.lib.php
+++ b/libraries/normalization.lib.php
@@ -6,9 +6,9 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Message;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * build the html for columns of $colTypeCategory category
@@ -102,7 +102,7 @@ function PMA_getHtmlForCreateNewColumn(
         );
     }
 
-    return PMA\libraries\Template::get(
+    return PhpMyAdmin\Template::get(
         'columns_definitions/table_fields_definitions'
     )
         ->render(
@@ -798,7 +798,7 @@ function PMA_getHtmlForNormalizetable()
         . 'name="normalize" '
         . 'id="normalizeTable" '
         . '>'
-        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<input type="hidden" name="step1" value="1">';
     $html_output .= '<fieldset>';
     $html_output .= '<legend>'
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 5c4bdc1974..dac373477f 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -13,9 +13,9 @@ use PhpMyAdmin\Partition;
 use PMA\libraries\plugins\export\ExportSql;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\StorageEngine;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Get HTML output for database comment
@@ -28,7 +28,7 @@ function PMA_getHtmlForDatabaseComment($db)
 {
     $html_output = '<div>'
         . '<form method="post" action="db_operations.php" id="formDatabaseComment">'
-        . URL::getHiddenInputs($db)
+        . Url::getHiddenInputs($db)
         . '<fieldset>'
         . '<legend>';
     if (Util::showIcons('ActionLinksMode')) {
@@ -70,7 +70,7 @@ function PMA_getHtmlForRenameDatabase($db)
     }
     $html_output .= '<input type="hidden" name="what" value="data" />'
         . '<input type="hidden" name="db_rename" value="true" />'
-        . URL::getHiddenInputs($db)
+        . Url::getHiddenInputs($db)
         . '<fieldset>'
         . '<legend>';
 
@@ -192,7 +192,7 @@ function PMA_getHtmlForCopyDatabase($db)
         . 'value="' . $_REQUEST['db_collation'] . '" />' . "\n";
     }
     $html_output .= '<input type="hidden" name="db_copy" value="true" />' . "\n"
-        . URL::getHiddenInputs($db);
+        . Url::getHiddenInputs($db);
     $html_output .= '<fieldset>'
         . '<legend>';
 
@@ -278,7 +278,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
     $html_output .= 'class="ajax" ';
     $html_output .= 'method="post" action="db_operations.php">';
 
-    $html_output .= URL::getHiddenInputs($db, $table);
+    $html_output .= Url::getHiddenInputs($db, $table);
 
     $html_output .= '<fieldset>' . "\n"
        . '    <legend>';
@@ -768,7 +768,7 @@ function PMA_getHtmlForOrderTheTable($columns)
     $html_output = '<div>';
     $html_output .= '<form method="post" id="alterTableOrderby" '
         . 'action="tbl_operations.php">';
-    $html_output .= URL::getHiddenInputs(
+    $html_output .= Url::getHiddenInputs(
         $GLOBALS['db'], $GLOBALS['table']
     );
     $html_output .= '<fieldset id="fieldset_table_order">'
@@ -810,7 +810,7 @@ function PMA_getHtmlForMoveTable()
     $html_output .= '<form method="post" action="tbl_operations.php"'
         . ' id="moveTableForm" class="ajax"'
         . ' onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+        . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
 
     $html_output .= '<input type="hidden" name="reload" value="1" />'
         . '<input type="hidden" name="what" value="data" />'
@@ -892,7 +892,7 @@ function PMA_getTableOptionDiv($pma_table, $comment, $tbl_collation, $tbl_storag
     $html_output = '<div>';
     $html_output .= '<form method="post" action="tbl_operations.php"';
     $html_output .= ' id="tableOptionsForm" class="ajax">';
-    $html_output .= URL::getHiddenInputs(
+    $html_output .= Url::getHiddenInputs(
         $GLOBALS['db'], $GLOBALS['table']
     );
     $html_output .= '<input type="hidden" name="reload" value="1" />';
@@ -1227,7 +1227,7 @@ function PMA_getHtmlForCopytable()
         . 'id="copyTable" '
         . ' class="ajax" '
         . 'onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<input type="hidden" name="reload" value="1" />';
 
     $html_output .= '<fieldset>';
@@ -1480,7 +1480,7 @@ function PMA_getMaintainActionlink($action_message, $params, $url_params, $link)
     return '<li>'
         . '<a class="maintain_action ajax" '
         . 'href="sql.php'
-        . URL::getCommon(array_merge($url_params, $params)) . '">'
+        . Url::getCommon(array_merge($url_params, $params)) . '">'
         . $action_message
         . '</a>'
         . Util::showMySQLDocu($link)
@@ -1539,7 +1539,7 @@ function PMA_getHtmlForDeleteDataOrTable(
 function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $htmlId)
 {
     return  '<li><a '
-        . 'href="sql.php' . URL::getCommon($url_params) . '"'
+        . 'href="sql.php' . Url::getCommon($url_params) . '"'
         . ' id="' . $htmlId . '" class="ajax">'
         . $link . '</a>'
         . Util::showMySQLDocu($syntax)
@@ -1582,7 +1582,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
     $html_output = '<div>'
         . '<form id="partitionsForm" class="ajax" '
         . 'method="post" action="tbl_operations.php" >'
-        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<fieldset>'
         . '<legend>'
         . __('Partition maintenance')
@@ -1619,7 +1619,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
     $html_output .= '<div class="clearfloat" /><br />';
 
     $html_output .= '<a href="sql.php'
-        . URL::getCommon($this_url_params) . '">'
+        . Url::getCommon($this_url_params) . '">'
         . __('Remove partitioning') . '</a>';
 
     $html_output .= '</fieldset>'
@@ -1688,7 +1688,7 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
 
         $html_output .= '<li>'
             . '<a href="sql.php'
-            . URL::getCommon($this_url_params)
+            . Url::getCommon($this_url_params)
             . '">'
             . $master . '&nbsp;->&nbsp;' . $arr['foreign_db'] . '.'
             . $arr['foreign_table'] . '.' . $arr['foreign_field']
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 0376e87e1a..df33d58b0e 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -358,15 +358,15 @@ function PMA_pluginGetOneOption(
         $doc = $propertyGroup->getDoc();
         if ($doc != null) {
             if (count($doc) == 3) {
-                $ret .= PMA\libraries\Util::showMySQLDocu(
+                $ret .= PhpMyAdmin\Util::showMySQLDocu(
                     $doc[1],
                     false,
                     $doc[2]
                 );
             } elseif (count($doc) == 1) {
-                $ret .= PMA\libraries\Util::showDocu('faq', $doc[0]);
+                $ret .= PhpMyAdmin\Util::showDocu('faq', $doc[0]);
             } else {
-                $ret .= PMA\libraries\Util::showMySQLDocu(
+                $ret .= PhpMyAdmin\Util::showMySQLDocu(
                     $doc[1]
                 );
             }
diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/plugins/AuthenticationPlugin.php
index 0eebf5fe51..3edc909226 100644
--- a/libraries/plugins/AuthenticationPlugin.php
+++ b/libraries/plugins/AuthenticationPlugin.php
@@ -9,7 +9,7 @@ namespace PMA\libraries\plugins;
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Provides a common interface that will have to be implemented by all of the
@@ -103,7 +103,7 @@ abstract class AuthenticationPlugin
             /* Redirect to other autenticated server */
             $_SESSION['partial_logout'] = true;
             Core::sendHeaderLocation(
-                './index.php' . URL::getCommonRaw(array('server' => $server))
+                './index.php' . Url::getCommonRaw(array('server' => $server))
             );
         }
     }
diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/plugins/auth/AuthenticationConfig.php
index 0462032e24..2cc12bdc7f 100644
--- a/libraries/plugins/auth/AuthenticationConfig.php
+++ b/libraries/plugins/auth/AuthenticationConfig.php
@@ -9,9 +9,9 @@
 namespace PMA\libraries\plugins\auth;
 
 use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the config authentication method
@@ -136,7 +136,7 @@ class AuthenticationConfig extends AuthenticationPlugin
                     E_USER_WARNING
                 );
             }
-            echo PMA\libraries\Util::mysqlDie(
+            echo Util::mysqlDie(
                 $conn_error,
                 '',
                 true,
@@ -150,11 +150,11 @@ class AuthenticationConfig extends AuthenticationPlugin
         <tr>
             <td>' , "\n";
         echo '<a href="'
-            , PMA\libraries\Util::getScriptNameForOption(
+            , Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'],
                 'server'
             )
-            , URL::getCommon() , '" class="button disableAjax">'
+            , Url::getCommon() , '" class="button disableAjax">'
             , __('Retry to connect')
             , '</a>' , "\n";
         echo '</td>
diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php
index 1d7db7d756..0f2aa5f2e6 100644
--- a/libraries/plugins/auth/AuthenticationCookie.php
+++ b/libraries/plugins/auth/AuthenticationCookie.php
@@ -13,11 +13,11 @@ use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Message;
 use PMA\libraries\plugins\AuthenticationPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use ReCaptcha;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 require_once './libraries/session.lib.php';
 require_once './libraries/hash.lib.php';
@@ -255,7 +255,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         }
         // do not generate a "server" hidden field as we want the "server"
         // drop-down to have priority
-        echo URL::getHiddenInputs($_form_params, '', 0, 'server');
+        echo Url::getHiddenInputs($_form_params, '', 0, 'server');
         echo '</fieldset>
     </form>';
 
@@ -540,7 +540,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 ->disable();
 
             Core::sendHeaderLocation(
-                $redirect_url . URL::getCommonRaw($url_params),
+                $redirect_url . Url::getCommonRaw($url_params),
                 true
             );
             if (! defined('TESTSUITE')) {
diff --git a/libraries/plugins/auth/AuthenticationSignon.php b/libraries/plugins/auth/AuthenticationSignon.php
index 7d5a4d2347..fd5b59f269 100644
--- a/libraries/plugins/auth/AuthenticationSignon.php
+++ b/libraries/plugins/auth/AuthenticationSignon.php
@@ -10,7 +10,7 @@ namespace PMA\libraries\plugins\auth;
 
 use PhpMyAdmin\Core;
 use PMA\libraries\plugins\AuthenticationPlugin;
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the SignOn authentication method
@@ -189,7 +189,7 @@ class AuthenticationSignon extends AuthenticationPlugin
             /**
              * Clear user cache.
              */
-            PMA\libraries\Util::clearUserCache();
+            Util::clearUserCache();
         }
 
         // Returns whether we get authentication settings or not
diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/plugins/export/ExportCodegen.php
index 8cf6c10d50..2fbee9cfd2 100644
--- a/libraries/plugins/export/ExportCodegen.php
+++ b/libraries/plugins/export/ExportCodegen.php
@@ -9,13 +9,13 @@
 namespace PMA\libraries\plugins\export;
 
 use PMA\libraries\plugins\ExportPlugin;
+use PMA\libraries\plugins\export\helpers\TableProperty;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\plugins\export\helpers\TableProperty;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the CodeGen class
@@ -246,8 +246,8 @@ class ExportCodegen extends ExportPlugin
         $result = $GLOBALS['dbi']->query(
             sprintf(
                 'DESC %s.%s',
-                PMA\libraries\Util::backquote($db),
-                PMA\libraries\Util::backquote($table)
+                Util::backquote($db),
+                Util::backquote($table)
             )
         );
         if ($result) {
@@ -355,8 +355,8 @@ class ExportCodegen extends ExportPlugin
         $result = $GLOBALS['dbi']->query(
             sprintf(
                 "DESC %s.%s",
-                PMA\libraries\Util::backquote($db),
-                PMA\libraries\Util::backquote($table)
+                Util::backquote($db),
+                Util::backquote($table)
             )
         );
         if ($result) {
diff --git a/libraries/plugins/export/ExportCsv.php b/libraries/plugins/export/ExportCsv.php
index 97a561b15f..43d2292ee0 100644
--- a/libraries/plugins/export/ExportCsv.php
+++ b/libraries/plugins/export/ExportCsv.php
@@ -10,13 +10,12 @@
 namespace PMA\libraries\plugins\export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
 
 /**
diff --git a/libraries/plugins/export/ExportExcel.php b/libraries/plugins/export/ExportExcel.php
index 63f10b3237..a8b60c7299 100644
--- a/libraries/plugins/export/ExportExcel.php
+++ b/libraries/plugins/export/ExportExcel.php
@@ -8,11 +8,11 @@
  */
 namespace PMA\libraries\plugins\export;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
 
diff --git a/libraries/plugins/export/ExportHtmlword.php b/libraries/plugins/export/ExportHtmlword.php
index 7c1fb3ba93..0d320c2af2 100644
--- a/libraries/plugins/export/ExportHtmlword.php
+++ b/libraries/plugins/export/ExportHtmlword.php
@@ -16,8 +16,8 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the HTML-Word format
diff --git a/libraries/plugins/export/ExportJson.php b/libraries/plugins/export/ExportJson.php
index 860e7c7ba8..24dd893422 100644
--- a/libraries/plugins/export/ExportJson.php
+++ b/libraries/plugins/export/ExportJson.php
@@ -9,13 +9,12 @@
 namespace PMA\libraries\plugins\export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 
 /**
  * Handles the export for the JSON format
diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/plugins/export/ExportLatex.php
index bfd0c29778..a0512427e3 100644
--- a/libraries/plugins/export/ExportLatex.php
+++ b/libraries/plugins/export/ExportLatex.php
@@ -16,8 +16,8 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the Latex format
diff --git a/libraries/plugins/export/ExportMediawiki.php b/libraries/plugins/export/ExportMediawiki.php
index 892103b73d..322b1b6e40 100644
--- a/libraries/plugins/export/ExportMediawiki.php
+++ b/libraries/plugins/export/ExportMediawiki.php
@@ -9,14 +9,14 @@
 namespace PMA\libraries\plugins\export;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
-use PMA;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the MediaWiki class
@@ -204,7 +204,7 @@ class ExportMediawiki extends ExportPlugin
             // Print structure comment
             $output = $this->_exportComment(
                 "Table structure for "
-                . PMA\libraries\Util::backquote($table_alias)
+                . Util::backquote($table_alias)
             );
 
             // Begin the table construction
@@ -290,7 +290,7 @@ class ExportMediawiki extends ExportPlugin
 
         // Print data comment
         $output = $this->_exportComment(
-            "Table data for " . PMA\libraries\Util::backquote($table_alias)
+            "Table data for " . Util::backquote($table_alias)
         );
 
         // Begin the table construction
diff --git a/libraries/plugins/export/ExportOds.php b/libraries/plugins/export/ExportOds.php
index d8bbdf541b..7617d431a0 100644
--- a/libraries/plugins/export/ExportOds.php
+++ b/libraries/plugins/export/ExportOds.php
@@ -8,15 +8,15 @@
  */
 namespace PMA\libraries\plugins\export;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\OpenDocument;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PhpMyAdmin\DatabaseInterface;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PhpMyAdmin\OpenDocument;
 
 $GLOBALS['ods_buffer'] = '';
 
diff --git a/libraries/plugins/export/ExportOdt.php b/libraries/plugins/export/ExportOdt.php
index 70686cbce1..913c51bfbb 100644
--- a/libraries/plugins/export/ExportOdt.php
+++ b/libraries/plugins/export/ExportOdt.php
@@ -9,6 +9,7 @@
 namespace PMA\libraries\plugins\export;
 
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\OpenDocument;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
@@ -16,9 +17,8 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PhpMyAdmin\OpenDocument;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 $GLOBALS['odt_buffer'] = '';
 
diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/plugins/export/ExportPdf.php
index be90da19e4..bac46971b9 100644
--- a/libraries/plugins/export/ExportPdf.php
+++ b/libraries/plugins/export/ExportPdf.php
@@ -9,10 +9,10 @@
 namespace PMA\libraries\plugins\export;
 
 use PMA\libraries\plugins\ExportPlugin;
+use PMA\libraries\plugins\export\helpers\Pdf;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\export\helpers\Pdf;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
 
diff --git a/libraries/plugins/export/ExportPhparray.php b/libraries/plugins/export/ExportPhparray.php
index 030b89c8cb..8c249be2a3 100644
--- a/libraries/plugins/export/ExportPhparray.php
+++ b/libraries/plugins/export/ExportPhparray.php
@@ -15,7 +15,7 @@ use PMA\libraries\properties\plugins\ExportPluginProperties;
 use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the PHP Array class
@@ -122,7 +122,7 @@ class ExportPhparray extends ExportPlugin
         }
         PMA_exportOutputHandler(
             '/**' . $GLOBALS['crlf']
-            . ' * Database ' . $this->commentString(PMA\libraries\Util::backquote($db_alias))
+            . ' * Database ' . $this->commentString(Util::backquote($db_alias))
             . $GLOBALS['crlf'] . ' */' . $GLOBALS['crlf']
         );
 
@@ -222,8 +222,8 @@ class ExportPhparray extends ExportPlugin
         $record_cnt = 0;
         // Output table name as comment
         $buffer .= $crlf . '/* '
-            . $this->commentString(PMA\libraries\Util::backquote($db_alias)) . '.'
-            . $this->commentString(PMA\libraries\Util::backquote($table_alias)) . ' */' . $crlf;
+            . $this->commentString(Util::backquote($db_alias)) . '.'
+            . $this->commentString(Util::backquote($table_alias)) . ' */' . $crlf;
         $buffer .= '$' . $tablefixed . ' = array(';
 
         while ($record = $GLOBALS['dbi']->fetchRow($result)) {
diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
index fad8a88e5e..0a1eb904f9 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/plugins/export/ExportSql.php
@@ -8,11 +8,6 @@
  */
 namespace PMA\libraries\plugins\export;
 
-use PhpMyAdmin\SqlParser\Components\CreateDefinition;
-use PhpMyAdmin\SqlParser\Context;
-use PhpMyAdmin\SqlParser\Parser;
-use PhpMyAdmin\SqlParser\Statements\SelectStatement;
-use PhpMyAdmin\SqlParser\Token;
 use PhpMyAdmin\Charsets;
 use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\plugins\ExportPlugin;
@@ -26,8 +21,13 @@ use PMA\libraries\properties\options\items\NumberPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\SqlParser\Components\CreateDefinition;
+use PhpMyAdmin\SqlParser\Context;
+use PhpMyAdmin\SqlParser\Parser;
+use PhpMyAdmin\SqlParser\Statements\SelectStatement;
+use PhpMyAdmin\SqlParser\Token;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the SQL class
diff --git a/libraries/plugins/export/ExportTexytext.php b/libraries/plugins/export/ExportTexytext.php
index f3b0c375ab..51f88d4db3 100644
--- a/libraries/plugins/export/ExportTexytext.php
+++ b/libraries/plugins/export/ExportTexytext.php
@@ -16,8 +16,8 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the export for the Texy! text class
diff --git a/libraries/plugins/export/ExportXml.php b/libraries/plugins/export/ExportXml.php
index 47613218b4..4a683ea254 100644
--- a/libraries/plugins/export/ExportXml.php
+++ b/libraries/plugins/export/ExportXml.php
@@ -8,14 +8,14 @@
  */
 namespace PMA\libraries\plugins\export;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
-use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
-use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
-use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\plugins\ExportPlugin;
-use PMA\libraries\Util;
+use PMA\libraries\properties\plugins\ExportPluginProperties;
+use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
+use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
+use PhpMyAdmin\Util;
 
 if (strlen($GLOBALS['db']) === 0) { /* Can't do server export */
     $GLOBALS['skip_import'] = true;
diff --git a/libraries/plugins/export/ExportYaml.php b/libraries/plugins/export/ExportYaml.php
index d0f2b3d96d..6c001f67f1 100644
--- a/libraries/plugins/export/ExportYaml.php
+++ b/libraries/plugins/export/ExportYaml.php
@@ -12,10 +12,9 @@ namespace PMA\libraries\plugins\export;
 use PhpMyAdmin\DatabaseInterface;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
-use PMA\libraries\properties\options\items\HiddenPropertyItem;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
+use PMA\libraries\properties\options\items\HiddenPropertyItem;
 
 /**
  * Handles the export for the YAML format
diff --git a/libraries/plugins/export/helpers/Pdf.php b/libraries/plugins/export/helpers/Pdf.php
index edf89ee62d..60623b34ae 100644
--- a/libraries/plugins/export/helpers/Pdf.php
+++ b/libraries/plugins/export/helpers/Pdf.php
@@ -10,8 +10,8 @@ namespace PMA\libraries\plugins\export\helpers;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Pdf as PdfLib;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 use TCPDF_STATIC;
 
 /**
diff --git a/libraries/plugins/import/ImportCsv.php b/libraries/plugins/import/ImportCsv.php
index c4a8e408a5..2566cf9861 100644
--- a/libraries/plugins/import/ImportCsv.php
+++ b/libraries/plugins/import/ImportCsv.php
@@ -12,7 +12,7 @@ namespace PMA\libraries\plugins\import;
 use PhpMyAdmin\Message;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Handles the import for the CSV format
diff --git a/libraries/plugins/import/ImportLdi.php b/libraries/plugins/import/ImportLdi.php
index c9d1437814..f6c42e4693 100644
--- a/libraries/plugins/import/ImportLdi.php
+++ b/libraries/plugins/import/ImportLdi.php
@@ -12,7 +12,7 @@ use PhpMyAdmin\Message;
 use PMA\libraries\plugins\import\AbstractImportCsv;
 use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugins/import/ImportMediawiki.php b/libraries/plugins/import/ImportMediawiki.php
index 504a412815..0e5e30c240 100644
--- a/libraries/plugins/import/ImportMediawiki.php
+++ b/libraries/plugins/import/ImportMediawiki.php
@@ -8,9 +8,9 @@
  */
 namespace PMA\libraries\plugins\import;
 
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
+use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\properties\plugins\ImportPluginProperties;
 
 /**
  * Handles the import for the MediaWiki format
@@ -271,7 +271,7 @@ class ImportMediawiki extends ImportPlugin
                 } else {
                     // If it's none of the above, then the current line has a bad
                     // format
-                    $message = PhpMyAdmin\Message::error(
+                    $message = Message::error(
                         __('Invalid format of mediawiki input on line: <br />%s.')
                     );
                     $message->addParam($cur_buffer_line);
diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php
index 6c509e485a..1f610b9dc9 100644
--- a/libraries/plugins/import/ImportOds.php
+++ b/libraries/plugins/import/ImportOds.php
@@ -10,12 +10,12 @@
  */
 namespace PMA\libraries\plugins\import;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PhpMyAdmin\Message;
+use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\properties\plugins\ImportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
 use SimpleXMLElement;
 
 /**
@@ -146,7 +146,7 @@ class ImportOds extends ImportPlugin
 
         if ($xml === false) {
             $sheets = array();
-            $GLOBALS['message'] = PhpMyAdmin\Message::error(
+            $GLOBALS['message'] = Message::error(
                 __(
                     'The XML file specified was either malformed or incomplete.'
                     . ' Please correct the issue and try again.'
@@ -158,7 +158,7 @@ class ImportOds extends ImportPlugin
             $root = $xml->children('office', true)->{'body'}->{'spreadsheet'};
             if (empty($root)) {
                 $sheets = array();
-                $GLOBALS['message'] = PhpMyAdmin\Message::error(
+                $GLOBALS['message'] = Message::error(
                     __('Could not parse OpenDocument Spreadsheet!')
                 );
                 $GLOBALS['error'] = true;
diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php
index dd044ea506..1d3cfb8372 100644
--- a/libraries/plugins/import/ImportShp.php
+++ b/libraries/plugins/import/ImportShp.php
@@ -8,14 +8,15 @@
  */
 namespace PMA\libraries\plugins\import;
 
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISMultilinestring;
 use PMA\libraries\gis\GISMultipoint;
 use PMA\libraries\gis\GISPoint;
 use PMA\libraries\gis\GISPolygon;
+use PhpMyAdmin\Message;
+use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Sanitize;
 use PhpMyAdmin\ZipExtension;
 
 /**
@@ -74,7 +75,7 @@ class ImportShp extends ImportPlugin
             && ZipExtension::getNumberOfFiles($import_file) > 1
         ) {
             if ($GLOBALS['import_handle']->openZip('/^.*\.shp$/i') === false) {
-                $message = PhpMyAdmin\Message::error(
+                $message = Message::error(
                     __('There was an error importing the ESRI shape file: "%s".')
                 );
                 $message->addParam($GLOBALS['import_handle']->getError());
@@ -147,7 +148,7 @@ class ImportShp extends ImportPlugin
         $shp->loadFromFile('');
         if ($shp->lastError != "") {
             $error = true;
-            $message = PhpMyAdmin\Message::error(
+            $message = Message::error(
                 __('There was an error importing the ESRI shape file: "%s".')
             );
             $message->addParam($shp->lastError);
@@ -177,7 +178,7 @@ class ImportShp extends ImportPlugin
             break;
         default:
             $error = true;
-            $message = PhpMyAdmin\Message::error(
+            $message = Message::error(
                 __('MySQL Spatial Extension does not support ESRI type "%s".')
             );
             $message->addParam($shp->getShapeName());
@@ -224,7 +225,7 @@ class ImportShp extends ImportPlugin
 
         if (count($rows) == 0) {
             $error = true;
-            $message = PhpMyAdmin\Message::error(
+            $message = Message::error(
                 __('The imported file does not contain any data!')
             );
 
diff --git a/libraries/plugins/import/ImportSql.php b/libraries/plugins/import/ImportSql.php
index 726de09542..db64280de2 100644
--- a/libraries/plugins/import/ImportSql.php
+++ b/libraries/plugins/import/ImportSql.php
@@ -8,13 +8,13 @@
  */
 namespace PMA\libraries\plugins\import;
 
-use PMA\libraries\properties\options\items\BoolPropertyItem;
+use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\properties\plugins\ImportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA;
-use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\properties\options\items\BoolPropertyItem;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
+use PhpMyAdmin\SqlParser\Utils\BufferedQuery;
 
 /**
  * Handles the import for the SQL format
@@ -110,7 +110,7 @@ class ImportSql extends ImportPlugin
         // Handle compatibility options.
         $this->_setSQLMode($GLOBALS['dbi'], $_REQUEST);
 
-        $bq = new \PhpMyAdmin\SqlParser\Utils\BufferedQuery();
+        $bq = new BufferedQuery();
         if (isset($_POST['sql_delimiter'])) {
             $bq->setDelimiter($_POST['sql_delimiter']);
         }
diff --git a/libraries/plugins/import/ImportXml.php b/libraries/plugins/import/ImportXml.php
index fccd959ee4..0a068f4aad 100644
--- a/libraries/plugins/import/ImportXml.php
+++ b/libraries/plugins/import/ImportXml.php
@@ -10,9 +10,10 @@
 
 namespace PMA\libraries\plugins\import;
 
-use PMA\libraries\properties\plugins\ImportPluginProperties;
-use PMA;
+use PhpMyAdmin\Message;
 use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\properties\plugins\ImportPluginProperties;
+use PhpMyAdmin\Util;
 use SimpleXMLElement;
 
 /**
@@ -105,7 +106,7 @@ class ImportXml extends ImportPlugin
          * The XML was malformed
          */
         if ($xml === false) {
-            PhpMyAdmin\Message::error(
+            Message::error(
                 __(
                     'The XML file specified was either malformed or incomplete.'
                     . ' Please correct the issue and try again.'
@@ -170,7 +171,7 @@ class ImportXml extends ImportPlugin
          * The XML was malformed
          */
         if ($db_name === null) {
-            PhpMyAdmin\Message::error(
+            Message::error(
                 __(
                     'The XML file specified was either malformed or incomplete.'
                     . ' Please correct the issue and try again.'
@@ -208,7 +209,7 @@ class ImportXml extends ImportPlugin
                      */
                     $attrs = $val2->attributes();
                     $create[] = "USE "
-                        . PMA\libraries\Util::backquote(
+                        . Util::backquote(
                             $attrs["name"]
                         );
 
diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php
index 43fb5feb18..d829d331e5 100644
--- a/libraries/plugins/schema/ExportRelationSchema.php
+++ b/libraries/plugins/schema/ExportRelationSchema.php
@@ -8,8 +8,8 @@
  */
 namespace PMA\libraries\plugins\schema;
 
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * This class is inherited by all schema classes
@@ -294,7 +294,7 @@ class ExportRelationSchema
         echo '    ' , $error_message , "\n";
         echo '</p>' , "\n";
         echo '<a href="db_designer.php'
-            , URL::getCommon(array('db' => $GLOBALS['db']))
+            , Url::getCommon(array('db' => $GLOBALS['db']))
             , '&page=' . htmlspecialchars($pageNumber) , '">' , __('Back') , '</a>';
         echo "\n";
         exit;
diff --git a/libraries/plugins/schema/TableStats.php b/libraries/plugins/schema/TableStats.php
index 66df3c2e52..2afefee5a0 100644
--- a/libraries/plugins/schema/TableStats.php
+++ b/libraries/plugins/schema/TableStats.php
@@ -9,7 +9,7 @@ namespace PMA\libraries\plugins\schema;
 
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Index;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Table preferences/statistics
diff --git a/libraries/plugins/schema/dia/Dia.php b/libraries/plugins/schema/dia/Dia.php
index caedee371b..f0bf07c252 100644
--- a/libraries/plugins/schema/dia/Dia.php
+++ b/libraries/plugins/schema/dia/Dia.php
@@ -7,7 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema\dia;
 
-use PMA;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
 use XMLWriter;
diff --git a/libraries/plugins/schema/eps/TableStatsEps.php b/libraries/plugins/schema/eps/TableStatsEps.php
index 9d4a3c2a0c..af05156383 100644
--- a/libraries/plugins/schema/eps/TableStatsEps.php
+++ b/libraries/plugins/schema/eps/TableStatsEps.php
@@ -8,7 +8,6 @@
 namespace PMA\libraries\plugins\schema\eps;
 
 use PhpMyAdmin\Font;
-use PMA;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
diff --git a/libraries/plugins/schema/pdf/Pdf.php b/libraries/plugins/schema/pdf/Pdf.php
index 5be822653b..1194a4fd32 100644
--- a/libraries/plugins/schema/pdf/Pdf.php
+++ b/libraries/plugins/schema/pdf/Pdf.php
@@ -8,7 +8,7 @@
 namespace PMA\libraries\plugins\schema\pdf;
 
 use PhpMyAdmin\Pdf as PdfLib;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Skip the plugin if TCPDF is not available.
diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/plugins/schema/pdf/PdfRelationSchema.php
index 6cd797750b..9f57233fd8 100644
--- a/libraries/plugins/schema/pdf/PdfRelationSchema.php
+++ b/libraries/plugins/schema/pdf/PdfRelationSchema.php
@@ -9,8 +9,8 @@ namespace PMA\libraries\plugins\schema\pdf;
 
 use PhpMyAdmin\Pdf as PdfLib;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
-use PMA\libraries\Transformations;
-use PMA\libraries\Util;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Util;
 
 /**
  * Skip the plugin if TCPDF is not available.
diff --git a/libraries/plugins/schema/svg/Svg.php b/libraries/plugins/schema/svg/Svg.php
index 692f602040..5c8a6ae45f 100644
--- a/libraries/plugins/schema/svg/Svg.php
+++ b/libraries/plugins/schema/svg/Svg.php
@@ -7,7 +7,6 @@
  */
 namespace PMA\libraries\plugins\schema\svg;
 
-use PMA;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
 use XMLWriter;
diff --git a/libraries/plugins/schema/svg/TableStatsSvg.php b/libraries/plugins/schema/svg/TableStatsSvg.php
index 4239fdb256..2684f6930a 100644
--- a/libraries/plugins/schema/svg/TableStatsSvg.php
+++ b/libraries/plugins/schema/svg/TableStatsSvg.php
@@ -8,7 +8,6 @@
 namespace PMA\libraries\plugins\schema\svg;
 
 use PhpMyAdmin\Font;
-use PMA;
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 use PMA\libraries\plugins\schema\TableStats;
 
diff --git a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
index 894d29a8b5..b692a2c540 100644
--- a/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
@@ -8,9 +8,9 @@
  */
 namespace PMA\libraries\plugins\transformations\abs;
 
-use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Util;
 
 /**
  * Provides common methods for all of the date format transformations plugins.
@@ -137,7 +137,7 @@ abstract class DateFormatTransformationsPlugin extends TransformationsPlugin
             $timestamp -= $options[0] * 60 * 60;
             $source = $buffer;
             if ($options[2] == 'local') {
-                $text = PMA\libraries\Util::localisedDate(
+                $text = Util::localisedDate(
                     $timestamp,
                     $options[1]
                 );
diff --git a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php b/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
index ae054e40e3..db92704be0 100644
--- a/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
+++ b/libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
@@ -8,8 +8,8 @@
  */
 namespace PMA\libraries\plugins\transformations\abs;
 
-use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
+use PhpMyAdmin\Util;
 
 /**
  * Provides common methods for all of the SQL transformations plugins.
@@ -42,7 +42,7 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin
     public function applyTransformation($buffer, $options = array(), $meta = '')
     {
         // see PMA_highlightSQL()
-        $result = PMA\libraries\Util::formatSql($buffer);
+        $result = Util::formatSql($buffer);
 
         return $result;
     }
diff --git a/libraries/plugins/transformations/output/Text_Plain_Json.php b/libraries/plugins/transformations/output/Text_Plain_Json.php
index 800d764968..f464e0e4a0 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Json.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Json.php
@@ -8,7 +8,6 @@
  */
 namespace PMA\libraries\plugins\transformations\output;
 
-use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 
diff --git a/libraries/plugins/transformations/output/Text_Plain_Xml.php b/libraries/plugins/transformations/output/Text_Plain_Xml.php
index e1316a2aee..52a11fef51 100644
--- a/libraries/plugins/transformations/output/Text_Plain_Xml.php
+++ b/libraries/plugins/transformations/output/Text_Plain_Xml.php
@@ -8,7 +8,6 @@
  */
 namespace PMA\libraries\plugins\transformations\output;
 
-use PMA;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PhpMyAdmin\Response;
 
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 4af26bbcd3..19859cf4e5 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Designer
  */
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 
 /**
  * Block attempts to directly run this script
@@ -119,7 +119,7 @@ function PMA_getScriptContr()
     $con["C_NAME"] = array();
     $i = 0;
     $alltab_rs = $GLOBALS['dbi']->query(
-        'SHOW TABLES FROM ' . PMA\libraries\Util::backquote($GLOBALS['db']),
+        'SHOW TABLES FROM ' . PhpMyAdmin\Util::backquote($GLOBALS['db']),
         null,
         PhpMyAdmin\DatabaseInterface::QUERY_STORE
     );
@@ -230,7 +230,7 @@ function PMA_getScriptTabs()
 
     for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) {
         $j = 0;
-        if (PMA\libraries\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
+        if (PhpMyAdmin\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
             $j = 1;
         }
         $retval['j_tabs'][$GLOBALS['PMD_URL']['TABLE_NAME'][$i]] = $j;
@@ -259,8 +259,8 @@ function PMA_getTablePositions($pg)
             `y` AS `Y`,
             1 AS `V`,
             1 AS `H`
-        FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords']) . "
+        FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['table_coords']) . "
         WHERE pdf_page_number = " . intval($pg);
 
     $tab_pos = $GLOBALS['dbi']->fetchResult(
@@ -288,9 +288,9 @@ function PMA_getPageName($pg)
     }
 
     $query = "SELECT `page_descr`"
-        . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-        . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg);
+        . " FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
+        . " WHERE " . PhpMyAdmin\Util::backquote('page_nr') . " = " . intval($pg);
     $page_name = $GLOBALS['dbi']->fetchResult(
         $query,
         null,
@@ -315,17 +315,17 @@ function PMA_deletePage($pg)
         return false;
     }
 
-    $query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
-        . " WHERE " . PMA\libraries\Util::backquote('pdf_page_number') . " = " . intval($pg);
+    $query = "DELETE FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['table_coords'])
+        . " WHERE " . PhpMyAdmin\Util::backquote('pdf_page_number') . " = " . intval($pg);
     $success = PMA_queryAsControlUser(
         $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE
     );
 
     if ($success) {
-        $query = "DELETE FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
-            . " WHERE " . PMA\libraries\Util::backquote('page_nr') . " = " . intval($pg);
+        $query = "DELETE FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
+            . " WHERE " . PhpMyAdmin\Util::backquote('page_nr') . " = " . intval($pg);
         $success = PMA_queryAsControlUser(
             $query, true, PhpMyAdmin\DatabaseInterface::QUERY_STORE
         );
@@ -350,8 +350,8 @@ function PMA_getDefaultPage($db)
     }
 
     $query = "SELECT `page_nr`"
-        . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
+        . " FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
         . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($db) . "'"
         . " AND `page_descr` = '" .  $GLOBALS['dbi']->escapeString($db) . "'";
 
@@ -391,8 +391,8 @@ function PMA_getLoadingPage($db)
         $page_no = $default_page_no;
     } else {
         $query = "SELECT MIN(`page_nr`)"
-            . " FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
+            . " FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
             . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($db) . "'";
 
         $min_page_no = $GLOBALS['dbi']->fetchResult(
@@ -446,8 +446,8 @@ function PMA_saveTablePositions($pg)
     }
 
     $query =  "DELETE FROM "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
-        . "." . PMA\libraries\Util::backquote(
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db'])
+        . "." . PhpMyAdmin\Util::backquote(
             $GLOBALS['cfgRelation']['table_coords']
         )
         . " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($_REQUEST['db'])
@@ -472,8 +472,8 @@ function PMA_saveTablePositions($pg)
         }
 
         $query = "INSERT INTO "
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
+            . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
+            . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
             . " (`db_name`, `table_name`, `pdf_page_number`, `x`, `y`)"
             . " VALUES ("
             . "'" . $GLOBALS['dbi']->escapeString($DB) . "', "
@@ -538,8 +538,8 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
     $type_T2 = mb_strtoupper($tables[$T2]['ENGINE']);
 
     // native foreign key
-    if (PMA\libraries\Util::isForeignKeySupported($type_T1)
-        && PMA\libraries\Util::isForeignKeySupported($type_T2)
+    if (PhpMyAdmin\Util::isForeignKeySupported($type_T1)
+        && PhpMyAdmin\Util::isForeignKeySupported($type_T2)
         && $type_T1 == $type_T2
     ) {
         // relation exists?
@@ -554,8 +554,8 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
         // or UNIQUE key
         // improve: check all other requirements for InnoDB relations
         $result = $GLOBALS['dbi']->query(
-            'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($db)
-            . '.' . PMA\libraries\Util::backquote($T1) . ';'
+            'SHOW INDEX FROM ' . PhpMyAdmin\Util::backquote($db)
+            . '.' . PhpMyAdmin\Util::backquote($T1) . ';'
         );
 
         // will be use to emphasis prim. keys in the table view
@@ -566,8 +566,8 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
         $GLOBALS['dbi']->freeResult($result);
 
         $result = $GLOBALS['dbi']->query(
-            'SHOW INDEX FROM ' . PMA\libraries\Util::backquote($db)
-            . '.' . PMA\libraries\Util::backquote($T2) . ';'
+            'SHOW INDEX FROM ' . PhpMyAdmin\Util::backquote($db)
+            . '.' . PhpMyAdmin\Util::backquote($T2) . ';'
         );
         // will be used to emphasis prim. keys in the table view
         $index_array2 = array();
@@ -577,14 +577,14 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
         $GLOBALS['dbi']->freeResult($result);
 
         if (! empty($index_array1[$F1]) && ! empty($index_array2[$F2])) {
-            $upd_query  = 'ALTER TABLE ' . PMA\libraries\Util::backquote($db)
-                . '.' . PMA\libraries\Util::backquote($T2)
+            $upd_query  = 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($db)
+                . '.' . PhpMyAdmin\Util::backquote($T2)
                 . ' ADD FOREIGN KEY ('
-                . PMA\libraries\Util::backquote($F2) . ')'
+                . PhpMyAdmin\Util::backquote($F2) . ')'
                 . ' REFERENCES '
-                . PMA\libraries\Util::backquote($db) . '.'
-                . PMA\libraries\Util::backquote($T1) . '('
-                . PMA\libraries\Util::backquote($F1) . ')';
+                . PhpMyAdmin\Util::backquote($db) . '.'
+                . PhpMyAdmin\Util::backquote($T1) . '('
+                . PhpMyAdmin\Util::backquote($F1) . ')';
 
             if ($on_delete != 'nix') {
                 $upd_query   .= ' ON DELETE ' . $on_delete;
@@ -617,9 +617,9 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update)
     // this was checked on the interface part
 
     $q  = "INSERT INTO "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db'])
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db'])
         . "."
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['relation'])
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['relation'])
         . "(master_db, master_table, master_field, "
         . "foreign_db, foreign_table, foreign_field)"
         . " values("
@@ -663,8 +663,8 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
     $tables = $GLOBALS['dbi']->getTablesFull($DB2, $T2);
     $type_T2 = mb_strtoupper($tables[$T2]['ENGINE']);
 
-    if (PMA\libraries\Util::isForeignKeySupported($type_T1)
-        && PMA\libraries\Util::isForeignKeySupported($type_T2)
+    if (PhpMyAdmin\Util::isForeignKeySupported($type_T1)
+        && PhpMyAdmin\Util::isForeignKeySupported($type_T2)
         && $type_T1 == $type_T2
     ) {
         // InnoDB
@@ -672,9 +672,9 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
         $foreigner = PMA_searchColumnInForeigners($existrel_foreign, $F2);
 
         if (isset($foreigner['constraint'])) {
-            $upd_query = 'ALTER TABLE ' . PMA\libraries\Util::backquote($DB2)
-                . '.' . PMA\libraries\Util::backquote($T2) . ' DROP FOREIGN KEY '
-                . PMA\libraries\Util::backquote($foreigner['constraint']) . ';';
+            $upd_query = 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($DB2)
+                . '.' . PhpMyAdmin\Util::backquote($T2) . ' DROP FOREIGN KEY '
+                . PhpMyAdmin\Util::backquote($foreigner['constraint']) . ';';
             if ($GLOBALS['dbi']->query($upd_query)) {
                 return array(true, __('FOREIGN KEY relationship has been removed.'));
             }
@@ -690,7 +690,7 @@ function PMA_removeRelation($T1, $F1, $T2, $F2)
 
     // internal relations
     $delete_query = "DELETE FROM "
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
         . $GLOBALS['cfgRelation']['relation'] . " WHERE "
         . "master_db = '" . $GLOBALS['dbi']->escapeString($DB2) . "'"
         . " AND master_table = '" . $GLOBALS['dbi']->escapeString($T2) . "'"
@@ -737,8 +737,8 @@ function PMA_saveDesignerSetting($index, $value)
     if ($GLOBALS['cfgRelation']['designersettingswork']) {
 
         $orig_data_query = "SELECT settings_data"
-            . " FROM " . PMA\libraries\Util::backquote($cfgDesigner['db'])
-            . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
+            . " FROM " . PhpMyAdmin\Util::backquote($cfgDesigner['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgDesigner['table'])
             . " WHERE username = '"
             . $GLOBALS['dbi']->escapeString($cfgDesigner['user']) . "';";
 
@@ -752,8 +752,8 @@ function PMA_saveDesignerSetting($index, $value)
             $orig_data = json_encode($orig_data);
 
             $save_query = "UPDATE "
-                . PMA\libraries\Util::backquote($cfgDesigner['db'])
-                . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
+                . PhpMyAdmin\Util::backquote($cfgDesigner['db'])
+                . "." . PhpMyAdmin\Util::backquote($cfgDesigner['table'])
                 . " SET settings_data = '" . $orig_data . "'"
                 . " WHERE username = '"
                 . $GLOBALS['dbi']->escapeString($cfgDesigner['user']) . "';";
@@ -763,8 +763,8 @@ function PMA_saveDesignerSetting($index, $value)
             $save_data = array($index => $value);
 
             $query = "INSERT INTO "
-                . PMA\libraries\Util::backquote($cfgDesigner['db'])
-                . "." . PMA\libraries\Util::backquote($cfgDesigner['table'])
+                . PhpMyAdmin\Util::backquote($cfgDesigner['db'])
+                . "." . PhpMyAdmin\Util::backquote($cfgDesigner['table'])
                 . " (username, settings_data)"
                 . " VALUES('" . $cfgDesigner['user'] . "',"
                 . " '" . json_encode($save_data) . "');";
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 0904c4fdaa..263222c497 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -8,9 +8,9 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 use PhpMyAdmin\RecentFavoriteTable;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Executes a query as controluser if possible, otherwise as normal user
@@ -102,7 +102,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
     if (empty($cfgRelation['db'])) {
         $retval .= __('Configuration of pmadb…') . ' '
              . $messages['error']
-             . PMA\libraries\Util::showDocu('setup', 'linked-tables')
+             . PhpMyAdmin\Util::showDocu('setup', 'linked-tables')
              . '<br />' . "\n"
              . __('General relation features')
              . ' <font color="green">' . __('Disabled')
@@ -195,7 +195,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
                 'Please see the documentation on how to'
                 . ' update your column_info table.'
             );
-            $retval .= PMA\libraries\Util::showDocu(
+            $retval .= PhpMyAdmin\Util::showDocu(
                 'config',
                 'cfg_Servers_column_info'
             );
@@ -364,19 +364,19 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
                     . '<code>%screate_tables.sql</code>.'
                 ),
                 htmlspecialchars(SQL_DIR)
-            ) . ' ' . PMA\libraries\Util::showDocu('setup', 'linked-tables');
+            ) . ' ' . PhpMyAdmin\Util::showDocu('setup', 'linked-tables');
             $items[] = __('Create a pma user and give access to these tables.') . ' '
-                . PMA\libraries\Util::showDocu('config', 'cfg_Servers_controluser');
+                . PhpMyAdmin\Util::showDocu('config', 'cfg_Servers_controluser');
             $items[] = __(
                 'Enable advanced features in configuration file '
                 . '(<code>config.inc.php</code>), for example by '
                 . 'starting from <code>config.sample.inc.php</code>.'
-            ) . ' ' . PMA\libraries\Util::showDocu('setup', 'quick-install');
+            ) . ' ' . PhpMyAdmin\Util::showDocu('setup', 'quick-install');
             $items[] = __(
                 'Re-login to phpMyAdmin to load the updated configuration file.'
             );
 
-            $retval .= PMA\libraries\Template::get('list/unordered')->render(
+            $retval .= PhpMyAdmin\Template::get('list/unordered')->render(
                 array('items' => $items,)
             );
         }
@@ -434,7 +434,7 @@ function PMA_getDiagMessageForParameter($parameter,
     } else {
         $retval .= sprintf(
             $messages['error'],
-            PMA\libraries\Util::getDocuLink('config', 'cfg_Servers_' . $docAnchor)
+            PhpMyAdmin\Util::getDocuLink('config', 'cfg_Servers_' . $docAnchor)
         );
     }
     $retval .= '</td></tr>' . "\n";
@@ -506,7 +506,7 @@ function PMA_checkRelationsParam()
     //  fear it might be too slow
 
     $tab_query = 'SHOW TABLES FROM '
-        . PMA\libraries\Util::backquote(
+        . PhpMyAdmin\Util::backquote(
             $GLOBALS['cfg']['Server']['pmadb']
         );
     $tab_rs    = PMA_queryAsControlUser(
@@ -682,8 +682,8 @@ function PMA_tryUpgradeTransformations()
         "input_transformation_options"
     );
     $query = 'SHOW COLUMNS FROM '
-        . PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
-        . '.' . PMA\libraries\Util::backquote(
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
+        . '.' . PhpMyAdmin\Util::backquote(
             $GLOBALS['cfg']['Server']['column_info']
         )
         . ' WHERE Field IN (\'' . implode('\', \'', $new_cols) . '\')';
@@ -704,14 +704,14 @@ function PMA_tryUpgradeTransformations()
             // replace database name from query to with set in config.inc.php
             $query = str_replace(
                 '`phpmyadmin`',
-                PMA\libraries\Util::backquote($GLOBALS['cfg']['Server']['pmadb']),
+                PhpMyAdmin\Util::backquote($GLOBALS['cfg']['Server']['pmadb']),
                 $query
             );
             // replace pma__column_info table name from query
             // to with set in config.inc.php
             $query = str_replace(
                 '`pma__column_info`',
-                PMA\libraries\Util::backquote(
+                PhpMyAdmin\Util::backquote(
                     $GLOBALS['cfg']['Server']['column_info']
                 ),
                 $query
@@ -756,8 +756,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both')
                 `foreign_db`,
                 `foreign_table`,
                 `foreign_field`
-            FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . '.' . PMA\libraries\Util::backquote($cfgRelation['relation']) . '
+            FROM ' . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+                . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation']) . '
             WHERE `master_db`    = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
                 AND `master_table` = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\' ';
@@ -835,8 +835,8 @@ function PMA_getDisplayField($db, $table)
     if ($cfgRelation['displaywork']) {
         $disp_query = '
             SELECT `display_field`
-            FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info']) . '
+            FROM ' . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+                . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_info']) . '
             WHERE `db_name`    = \'' . $GLOBALS['dbi']->escapeString($db) . '\'
                 AND `table_name` = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\'';
@@ -929,8 +929,8 @@ function PMA_getDbComment($db)
         // pmadb internal db comment
         $com_qry = "
             SELECT `comment`
-            FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+                . "." . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
                 . "
             WHERE db_name     = '" . $GLOBALS['dbi']->escapeString($db) . "'
                 AND table_name  = ''
@@ -965,8 +965,8 @@ function PMA_getDbComments()
         // pmadb internal db comment
         $com_qry = "
             SELECT `db_name`, `comment`
-            FROM " . PMA\libraries\Util::backquote($cfgRelation['db'])
-                . "." . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            FROM " . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+                . "." . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
                 . "
             WHERE `column_name` = '(db_comment)'";
         $com_rs = PMA_queryAsControlUser(
@@ -1004,8 +1004,8 @@ function PMA_setDbComment($db, $comment = '')
 
     if (strlen($comment) > 0) {
         $upd_query = 'INSERT INTO '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
             . ' (`db_name`, `table_name`, `column_name`, `comment`)'
             . ' VALUES (\''
             . $GLOBALS['dbi']->escapeString($db)
@@ -1016,8 +1016,8 @@ function PMA_setDbComment($db, $comment = '')
             . "`comment` = '" . $GLOBALS['dbi']->escapeString($comment) . "'";
     } else {
         $upd_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
             . ' WHERE `db_name`     = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\'
                 AND `table_name`  = \'\'
@@ -1076,8 +1076,8 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
 
     PMA_queryAsControlUser(
         'INSERT INTO '
-        . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['history']) . '
+        . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+        . PhpMyAdmin\Util::backquote($cfgRelation['history']) . '
               (`username`,
                 `db`,
                 `table`,
@@ -1128,8 +1128,8 @@ function PMA_getHistory($username)
                 `table`,
                 `sqlquery`,
                 `timevalue`
-           FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['history']) . '
+           FROM ' . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['history']) . '
           WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username) . '\'
        ORDER BY `id` DESC';
 
@@ -1163,8 +1163,8 @@ function PMA_purgeHistory($username)
 
     $search_query = '
         SELECT `timevalue`
-        FROM ' . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['history']) . '
+        FROM ' . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['history']) . '
         WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username) . '\'
         ORDER BY `timevalue` DESC
         LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1';
@@ -1174,8 +1174,8 @@ function PMA_purgeHistory($username)
     )) {
         PMA_queryAsControlUser(
             'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['history']) . '
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['history']) . '
               WHERE `username` = \'' . $GLOBALS['dbi']->escapeString($username)
             . '\'
                 AND `timevalue` <= \'' . $max_time . '\''
@@ -1390,27 +1390,27 @@ function PMA_getForeignData(
             // foreign_display can be false if no display field defined:
             $foreign_display = PMA_getDisplayField($foreign_db, $foreign_table);
 
-            $f_query_main = 'SELECT ' . PMA\libraries\Util::backquote($foreign_field)
+            $f_query_main = 'SELECT ' . PhpMyAdmin\Util::backquote($foreign_field)
                 . (
                     ($foreign_display == false)
                         ? ''
-                        : ', ' . PMA\libraries\Util::backquote($foreign_display)
+                        : ', ' . PhpMyAdmin\Util::backquote($foreign_display)
                 );
-            $f_query_from = ' FROM ' . PMA\libraries\Util::backquote($foreign_db)
-                . '.' . PMA\libraries\Util::backquote($foreign_table);
+            $f_query_from = ' FROM ' . PhpMyAdmin\Util::backquote($foreign_db)
+                . '.' . PhpMyAdmin\Util::backquote($foreign_table);
             $f_query_filter = empty($foreign_filter) ? '' : ' WHERE '
-                . PMA\libraries\Util::backquote($foreign_field)
+                . PhpMyAdmin\Util::backquote($foreign_field)
                 . ' LIKE "%' . $GLOBALS['dbi']->escapeString($foreign_filter) . '%"'
                 . (
                 ($foreign_display == false)
                     ? ''
-                    : ' OR ' . PMA\libraries\Util::backquote($foreign_display)
+                    : ' OR ' . PhpMyAdmin\Util::backquote($foreign_display)
                     . ' LIKE "%' . $GLOBALS['dbi']->escapeString($foreign_filter)
                     . '%"'
                 );
             $f_query_order = ($foreign_display == false) ? '' :' ORDER BY '
-                . PMA\libraries\Util::backquote($foreign_table) . '.'
-                . PMA\libraries\Util::backquote($foreign_display);
+                . PhpMyAdmin\Util::backquote($foreign_table) . '.'
+                . PhpMyAdmin\Util::backquote($foreign_display);
 
             $f_query_limit = ! empty($foreign_limit) ? ($foreign_limit) : '';
 
@@ -1485,8 +1485,8 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
 
     if ($cfgRelation['displaywork']) {
         $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['table_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['table_info'])
             . '   SET display_field = \'' . $GLOBALS['dbi']->escapeString(
                 $new_name
             ) . '\''
@@ -1501,8 +1501,8 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
 
     if ($cfgRelation['relwork']) {
         $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . '   SET master_field = \'' . $GLOBALS['dbi']->escapeString(
                 $new_name
             ) . '\''
@@ -1515,8 +1515,8 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
         PMA_queryAsControlUser($table_query);
 
         $table_query = 'UPDATE '
-            . PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-            . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+            . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . '   SET foreign_field = \'' . $GLOBALS['dbi']->escapeString(
                 $new_name
             ) . '\''
@@ -1551,8 +1551,8 @@ function PMA_REL_renameSingleTable($table,
     $db_field, $table_field
 ) {
     $query = 'UPDATE '
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation'][$table])
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation'][$table])
         . ' SET '
         . $db_field . ' = \'' . $GLOBALS['dbi']->escapeString($target_db)
         . '\', '
@@ -1632,8 +1632,8 @@ function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_tabl
             // if the table is moved out of the database we can no loger keep the
             // record for table coordinate
             $remove_query = "DELETE FROM "
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-                . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
+                . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
+                . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['table_coords'])
                 . " WHERE db_name  = '" . $GLOBALS['dbi']->escapeString($source_db) . "'"
                 . " AND table_name = '" . $GLOBALS['dbi']->escapeString($source_table)
                 . "'";
@@ -1661,8 +1661,8 @@ function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_tabl
 
         // update data for hidden table
         $query = "UPDATE "
-            . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
-            . PMA\libraries\Util::backquote(
+            . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . "."
+            . PhpMyAdmin\Util::backquote(
                 $GLOBALS['cfgRelation']['navigationhiding']
             )
             . " SET db_name = '" . $GLOBALS['dbi']->escapeString($target_db)
@@ -1693,8 +1693,8 @@ function PMA_REL_createPage($newpage, $cfgRelation, $db)
         $newpage = __('no description');
     }
     $ins_query   = 'INSERT INTO '
-        . PMA\libraries\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
+        . PhpMyAdmin\Util::backquote($GLOBALS['cfgRelation']['db']) . '.'
+        . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
         . ' (db_name, page_descr)'
         . ' VALUES (\''
         . $GLOBALS['dbi']->escapeString($db) . '\', \''
@@ -1789,8 +1789,8 @@ function PMA_checkChildForeignReferences(
             foreach ($child_references as $columns) {
                 array_push(
                     $column_status['references'],
-                    PMA\libraries\Util::backquote($columns['table_schema'])
-                    . '.' . PMA\libraries\Util::backquote($columns['table_name'])
+                    PhpMyAdmin\Util::backquote($columns['table_schema'])
+                    . '.' . PhpMyAdmin\Util::backquote($columns['table_name'])
                 );
             }
         }
@@ -1992,7 +1992,7 @@ function PMA_getHtmlFixPMATables($allTables, $createDb = false)
 {
     $retval = '';
 
-    $url_query = URL::getCommon(array('db' => $GLOBALS['db']));
+    $url_query = Url::getCommon(array('db' => $GLOBALS['db']));
     if ($allTables) {
         if ($createDb) {
             $url_query .= '&amp;goto=db_operations.php&amp;create_pmadb=1';
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index ac4a94cd1a..1cb5bf2dc8 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -21,8 +21,8 @@ function PMA_relationsCleanupColumn($db, $table, $column)
 
     if ($cfgRelation['commwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\''
@@ -33,8 +33,8 @@ function PMA_relationsCleanupColumn($db, $table, $column)
 
     if ($cfgRelation['displaywork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\''
@@ -45,8 +45,8 @@ function PMA_relationsCleanupColumn($db, $table, $column)
 
     if ($cfgRelation['relwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE master_db  = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\''
             . ' AND master_table = \'' . $GLOBALS['dbi']->escapeString($table)
@@ -56,8 +56,8 @@ function PMA_relationsCleanupColumn($db, $table, $column)
         PMA_queryAsControlUser($remove_query);
 
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\''
             . ' AND foreign_table = \'' . $GLOBALS['dbi']->escapeString($table)
@@ -82,8 +82,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['commwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\'';
@@ -92,8 +92,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['displaywork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\'';
@@ -102,8 +102,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['pdfwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_coords'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\'';
@@ -112,8 +112,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['relwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE master_db  = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\''
             . ' AND master_table = \'' . $GLOBALS['dbi']->escapeString($table)
@@ -121,8 +121,8 @@ function PMA_relationsCleanupTable($db, $table)
         PMA_queryAsControlUser($remove_query);
 
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\''
             . ' AND foreign_table = \'' . $GLOBALS['dbi']->escapeString($table)
@@ -132,8 +132,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['uiprefswork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_uiprefs'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\'';
@@ -142,8 +142,8 @@ function PMA_relationsCleanupTable($db, $table)
 
     if ($cfgRelation['navwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['navigationhiding'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\''
             . ' AND (table_name = \'' . $GLOBALS['dbi']->escapeString($table)
             . '\''
@@ -167,53 +167,53 @@ function PMA_relationsCleanupDatabase($db)
 
     if ($cfgRelation['commwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['column_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['column_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['bookmarkwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['bookmark'])
             . ' WHERE dbase  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['displaywork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_info'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_info'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['pdfwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['pdf_pages'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['pdf_pages'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
 
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_coords'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_coords'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['relwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE master_db  = \''
             . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
 
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['relation'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['relation'])
             . ' WHERE foreign_db  = \'' . $GLOBALS['dbi']->escapeString($db)
             . '\'';
         PMA_queryAsControlUser($remove_query);
@@ -221,32 +221,32 @@ function PMA_relationsCleanupDatabase($db)
 
     if ($cfgRelation['uiprefswork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['table_uiprefs'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['navwork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['navigationhiding'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['savedsearcheswork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['savedsearches'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
 
     if ($cfgRelation['centralcolumnswork']) {
         $remove_query = 'DELETE FROM '
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . '.' . PMA\libraries\Util::backquote($cfgRelation['central_columns'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . '.' . PhpMyAdmin\Util::backquote($cfgRelation['central_columns'])
             . ' WHERE db_name  = \'' . $GLOBALS['dbi']->escapeString($db) . '\'';
         PMA_queryAsControlUser($remove_query);
     }
@@ -265,8 +265,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['bookmarkwork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['bookmark'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['bookmark'])
             . " WHERE `user`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -274,8 +274,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['historywork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['history'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['history'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -283,8 +283,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['recentwork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['recent'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['recent'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -292,8 +292,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['favoritework']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['favorite'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['favorite'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -301,8 +301,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['uiprefswork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['table_uiprefs'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['table_uiprefs'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -310,8 +310,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['userconfigwork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['userconfig'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['userconfig'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -319,8 +319,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['menuswork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['users'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['users'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -328,8 +328,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['navwork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['navigationhiding'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['navigationhiding'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -337,8 +337,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['savedsearcheswork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['savedsearches'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['savedsearches'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
@@ -346,8 +346,8 @@ function PMA_relationsCleanupUser($username)
 
     if ($cfgRelation['designersettingswork']) {
         $remove_query = "DELETE FROM "
-            . PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['designer_settings'])
+            . PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['designer_settings'])
             . " WHERE `username`  = '" . $GLOBALS['dbi']->escapeString($username)
             . "'";
         PMA_queryAsControlUser($remove_query);
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 0484f5bb96..cfc1dfe393 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * returns HTML for error message
@@ -63,7 +63,7 @@ function PMA_getHtmlForMasterReplication()
         $_url_params['repl_clear_scr'] = true;
 
         $html .= '  <li><a href="server_replication.php';
-        $html .= URL::getCommon($_url_params)
+        $html .= Url::getCommon($_url_params)
             . '" id="master_addslaveuser_href">';
         $html .= __('Add slave replication user') . '</a></li>';
     }
@@ -120,7 +120,7 @@ function PMA_getHtmlForMasterConfiguration()
     $html .= '</fieldset>';
     $html .= '<fieldset class="tblFooters">';
     $html .= ' <form method="post" action="server_replication.php" >';
-    $html .= URL::getHiddenInputs('', '');
+    $html .= Url::getHiddenInputs('', '');
     $html .= '  <input type="submit" value="' . __('Go') . '" id="goButton" />';
     $html .= ' </form>';
     $html .= '</fieldset>';
@@ -150,7 +150,7 @@ function PMA_getHtmlForSlaveConfiguration(
     if ($server_slave_multi_replication) {
         $html .= __('Master connection:');
         $html .= '<form method="get" action="server_replication.php">';
-        $html .= URL::getHiddenInputs($GLOBALS['url_params']);
+        $html .= Url::getHiddenInputs($GLOBALS['url_params']);
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($server_slave_multi_replication as $server) {
@@ -179,7 +179,7 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = 'IO_THREAD';
         $slave_control_io_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
             $_url_params['sr_slave_action'] = 'start';
@@ -189,7 +189,7 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = 'SQL_THREAD';
         $slave_control_sql_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_IO_Running'] == 'No'
             || $server_slave_replication[0]['Slave_SQL_Running'] == 'No'
@@ -201,17 +201,17 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = null;
         $slave_control_full_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         $_url_params['sr_slave_action'] = 'reset';
         $slave_control_reset_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         $_url_params = $GLOBALS['url_params'];
         $_url_params['sr_take_action'] = true;
         $_url_params['sr_slave_skip_error'] = true;
         $slave_skip_error_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
             $html .= Message::error(
@@ -229,7 +229,7 @@ function PMA_getHtmlForSlaveConfiguration(
         $_url_params['repl_clear_scr'] = true;
 
         $reconfiguremaster_link = 'server_replication.php'
-            . URL::getCommon($_url_params);
+            . Url::getCommon($_url_params);
 
         $html .= __(
             'Server is configured as slave in a replication process. Would you ' .
@@ -289,7 +289,7 @@ function PMA_getHtmlForSlaveConfiguration(
                 'This server is not configured as slave in a replication process. '
                 . 'Would you like to <a href="%s">configure</a> it?'
             ),
-            'server_replication.php' . URL::getCommon($_url_params)
+            'server_replication.php' . Url::getCommon($_url_params)
         );
     }
     $html .= '</fieldset>';
@@ -318,7 +318,7 @@ function PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link)
     $html .= __('Skip current error') . '</a></li>';
     $html .= '   <li>';
     $html .= '    <form method="post" action="server_replication.php">';
-    $html .= URL::getHiddenInputs('', '');
+    $html .= Url::getHiddenInputs('', '');
     $html .= sprintf(
         __('Skip next %s errors.'),
         '<input type="text" name="sr_skip_errors_count" value="1" '
@@ -350,7 +350,7 @@ function PMA_getHtmlForNotServerReplication()
             'This server is not configured as master in a replication process. '
             . 'Would you like to <a href="%s">configure</a> it?'
         ),
-        'server_replication.php' . URL::getCommon($_url_params)
+        'server_replication.php' . Url::getCommon($_url_params)
     );
     $html .= '</fieldset>';
     return $html;
@@ -399,7 +399,7 @@ function PMA_getHtmlForReplicationChangeMaster($submitname)
         = PMA_replicationGetUsernameHostnameLength();
 
     $html .= '<form method="post" action="server_replication.php">';
-    $html .= URL::getHiddenInputs('', '');
+    $html .= Url::getHiddenInputs('', '');
     $html .= ' <fieldset id="fieldset_add_user_login">';
     $html .= '  <legend>' . __('Slave configuration');
     $html .= ' - ' . __('Change or reconfigure master server') . '</legend>';
@@ -690,7 +690,7 @@ function PMA_getHtmlForReplicationMasterAddSlaveuser()
     $html .= '<form autocomplete="off" method="post" ';
     $html .= 'action="server_privileges.php"';
     $html .= ' onsubmit="return checkAddUser(this);">';
-    $html .= URL::getHiddenInputs('', '');
+    $html .= Url::getHiddenInputs('', '');
     $html .= '<fieldset id="fieldset_add_user_login">'
         . '<legend>' . __('Add slave replication user') . '</legend>'
         . PMA_getHtmlForAddUserLoginForm($username_length)
@@ -835,7 +835,7 @@ function PMA_getHtmlForTableInfoForm($hostname_length)
         . (isset($_REQUEST['hostname']) ? htmlspecialchars($_REQUEST['hostname']) : '')
         . '" title="' . __('Host')
         . '" />'
-        . PMA\libraries\Util::showHint(
+        . PhpMyAdmin\Util::showHint(
             __(
                 'When Host table is used, this field is ignored '
                 . 'and values stored in Host table are used instead.'
@@ -946,7 +946,7 @@ function PMA_handleControlRequest()
             } else {
                 Core::sendHeaderLocation(
                     './server_replication.php'
-                    . URL::getCommonRaw($GLOBALS['url_params'])
+                    . Url::getCommonRaw($GLOBALS['url_params'])
                 );
             }
         }
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index 4b34376bcd..8204db63d1 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -102,7 +102,7 @@ function PMA_EVN_handleEditor()
                     $_REQUEST['item_original_name']
                 );
                 $drop_item = "DROP EVENT "
-                    . PMA\libraries\Util::backquote($_REQUEST['item_original_name'])
+                    . PhpMyAdmin\Util::backquote($_REQUEST['item_original_name'])
                     . ";\n";
                 $result = $GLOBALS['dbi']->tryQuery($drop_item);
                 if (! $result) {
@@ -137,7 +137,7 @@ function PMA_EVN_handleEditor()
                             __('Event %1$s has been modified.')
                         );
                         $message->addParam(
-                            PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                            PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                         );
                         $sql_query = $drop_item . $item_query;
                     }
@@ -157,7 +157,7 @@ function PMA_EVN_handleEditor()
                         __('Event %1$s has been created.')
                     );
                     $message->addParam(
-                        PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                        PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                     );
                     $sql_query = $item_query;
                 }
@@ -179,7 +179,7 @@ function PMA_EVN_handleEditor()
             $message->addHtml('</ul>');
         }
 
-        $output = PMA\libraries\Util::getMessage($message, $sql_query);
+        $output = PhpMyAdmin\Util::getMessage($message, $sql_query);
         $response = Response::getInstance();
         if ($response->isAjax()) {
             if ($message->isSuccess()) {
@@ -287,7 +287,7 @@ function PMA_EVN_getDataFromName($name)
     $columns = "`EVENT_NAME`, `STATUS`, `EVENT_TYPE`, `EXECUTE_AT`, "
              . "`INTERVAL_VALUE`, `INTERVAL_FIELD`, `STARTS`, `ENDS`, "
              . "`EVENT_DEFINITION`, `ON_COMPLETION`, `DEFINER`, `EVENT_COMMENT`";
-    $where   = "EVENT_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
+    $where   = "EVENT_SCHEMA " . PhpMyAdmin\Util::getCollateForIS() . "="
              . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
              . "AND EVENT_NAME='" . $GLOBALS['dbi']->escapeString($name) . "'";
     $query   = "SELECT $columns FROM `INFORMATION_SCHEMA`.`EVENTS` WHERE $where;";
@@ -385,7 +385,7 @@ function PMA_EVN_getEditorForm($mode, $operation, $item)
     $retval .= "<form class='rte_form' action='db_events.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_data;
-    $retval .= URL::getHiddenInputs($db, $table) . "\n";
+    $retval .= Url::getHiddenInputs($db, $table) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
@@ -535,15 +535,15 @@ function PMA_EVN_getQueryFromRequest()
         if (mb_strpos($_REQUEST['item_definer'], '@') !== false
         ) {
             $arr = explode('@', $_REQUEST['item_definer']);
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
+            $query .= 'DEFINER=' . PhpMyAdmin\Util::backquote($arr[0]);
+            $query .= '@' . PhpMyAdmin\Util::backquote($arr[1]) . ' ';
         } else {
             $errors[] = __('The definer must be in the "username@hostname" format!');
         }
     }
     $query .= 'EVENT ';
     if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']) . ' ';
+        $query .= PhpMyAdmin\Util::backquote($_REQUEST['item_name']) . ' ';
     } else {
         $errors[] = __('You must provide an event name!');
     }
diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php
index 9c37c838de..595e41249f 100644
--- a/libraries/rte/rte_export.lib.php
+++ b/libraries/rte/rte_export.lib.php
@@ -26,7 +26,7 @@ function PMA_RTE_handleExport($export_data)
 
     $response = Response::getInstance();
 
-    $item_name = htmlspecialchars(PMA\libraries\Util::backquote($_GET['item_name']));
+    $item_name = htmlspecialchars(PhpMyAdmin\Util::backquote($_GET['item_name']));
     if ($export_data !== false) {
         $export_data = htmlspecialchars(trim($export_data));
         $title = sprintf(PMA_RTE_getWord('export'), $item_name);
@@ -43,7 +43,7 @@ function PMA_RTE_handleExport($export_data)
                , "</fieldset>\n";
         }
     } else {
-        $_db = htmlspecialchars(PMA\libraries\Util::backquote($db));
+        $_db = htmlspecialchars(PhpMyAdmin\Util::backquote($db));
         $message  = __('Error in processing request:') . ' '
                   . sprintf(PMA_RTE_getWord('no_view'), $item_name, $_db);
         $message = Message::error($message);
diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php
index b4fc0b57fc..2953074c36 100644
--- a/libraries/rte/rte_footer.lib.php
+++ b/libraries/rte/rte_footer.lib.php
@@ -28,20 +28,20 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
     $retval .= "<fieldset class='left'>\n";
     $retval .= "<legend>" . _pgettext('Create new procedure', 'New') . "</legend>\n";
     $retval .= "        <div class='wrap'>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege($priv, $db, $table)) {
+    if (PhpMyAdmin\Util::currentUserHasPrivilege($priv, $db, $table)) {
         $retval .= "            <a {$ajax_class['add']} ";
         $retval .= "href='db_" . mb_strtolower($name) . "s.php";
         $retval .= "$url_query&amp;add_item=1' ";
         $retval .= "onclick='$.datepicker.initialized = false;'>";
         $icon = 'b_' . $icon;
-        $retval .= PMA\libraries\Util::getIcon($icon);
+        $retval .= PhpMyAdmin\Util::getIcon($icon);
         $retval .= PMA_RTE_getWord('add') . "</a>\n";
     } else {
         $icon = 'bd_' . $icon;
-        $retval .= PMA\libraries\Util::getIcon($icon);
+        $retval .= PhpMyAdmin\Util::getIcon($icon);
         $retval .= PMA_RTE_getWord('add') . "\n";
     }
-    $retval .= "            " . PMA\libraries\Util::showMySQLDocu($docu) . "\n";
+    $retval .= "            " . PhpMyAdmin\Util::showMySQLDocu($docu) . "\n";
     $retval .= "        </div>\n";
     $retval .= "</fieldset>\n";
     $retval .= "<!-- ADD " . $name . " FORM END -->\n\n";
@@ -112,7 +112,7 @@ function PMA_EVN_getFooterLinks()
     $retval .= "        </legend>\n";
     $retval .= "        <div class='wrap'>\n";
     // show the toggle button
-    $retval .= PMA\libraries\Util::toggleButton(
+    $retval .= PhpMyAdmin\Util::toggleButton(
         "sql.php$url_query&amp;goto=db_events.php" . urlencode("?db=$db"),
         'sql_query',
         $options,
diff --git a/libraries/rte/rte_general.lib.php b/libraries/rte/rte_general.lib.php
index 80c2fca54a..ec6f42b460 100644
--- a/libraries/rte/rte_general.lib.php
+++ b/libraries/rte/rte_general.lib.php
@@ -75,8 +75,8 @@ function PMA_RTE_sendEditor($type, $mode, $item, $title, $db, $operation = null)
         $message  = __('Error in processing request:') . ' ';
         $message .= sprintf(
             PMA_RTE_getWord('not_found'),
-            htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-            htmlspecialchars(PMA\libraries\Util::backquote($db))
+            htmlspecialchars(PhpMyAdmin\Util::backquote($_REQUEST['item_name'])),
+            htmlspecialchars(PhpMyAdmin\Util::backquote($db))
         );
         $message = Message::error($message);
         if ($response->isAjax()) {
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 92c22f2976..827fae0dbc 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
-use PMA\libraries\Template;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\SqlParser\Statements\CreateStatement;
 
 if (! defined('PHPMYADMIN')) {
@@ -59,12 +59,12 @@ function PMA_RTE_getList($type, $items)
         break;
     }
     $retval .= '">';
-    $retval .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $retval .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $retval .= "<fieldset>\n";
     $retval .= "    <legend>\n";
     $retval .= "        " . PMA_RTE_getWord('title') . "\n";
     $retval .= "        "
-        . PMA\libraries\Util::showMySQLDocu(PMA_RTE_getWord('docu')) . "\n";
+        . PhpMyAdmin\Util::showMySQLDocu(PMA_RTE_getWord('docu')) . "\n";
     $retval .= "    </legend>\n";
     $retval .= "    <div class='$class1' id='nothing2display'>\n";
     $retval .= "      " . PMA_RTE_getWord('nothing') . "\n";
@@ -154,11 +154,11 @@ function PMA_RTE_getList($type, $items)
                     'form_name'       => 'rteListForm',
                 )
             );
-        $retval .= PMA\libraries\Util::getButtonOrImage(
+        $retval .= PhpMyAdmin\Util::getButtonOrImage(
             'submit_mult', 'mult_submit',
             __('Export'), 'b_export.png', 'export'
         );
-        $retval .= PMA\libraries\Util::getButtonOrImage(
+        $retval .= PhpMyAdmin\Util::getButtonOrImage(
             'submit_mult', 'mult_submit',
             __('Drop'), 'b_drop.png', 'drop'
         );
@@ -187,7 +187,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
     $sql_drop = sprintf(
         'DROP %s IF EXISTS %s',
         $routine['type'],
-        PMA\libraries\Util::backquote($routine['name'])
+        PhpMyAdmin\Util::backquote($routine['name'])
     );
     $type_link = "item_type={$routine['type']}";
 
@@ -209,7 +209,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
 
     // this is for our purpose to decide whether to
     // show the edit link or not, so we need the DEFINER for the routine
-    $where = "ROUTINE_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
+    $where = "ROUTINE_SCHEMA " . PhpMyAdmin\Util::getCollateForIS() . "="
         . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
         . "AND SPECIFIC_NAME='" . $GLOBALS['dbi']->escapeString($routine['name']) . "'"
         . "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($routine['type']) . "'";
@@ -220,7 +220,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
 
     // Since editing a procedure involved dropping and recreating, check also for
     // CREATE ROUTINE privilege to avoid lost procedures.
-    if ((PMA\libraries\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
+    if ((PhpMyAdmin\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
         && $curr_user == $routine_definer)
         || $GLOBALS['is_superuser']
     ) {
@@ -238,7 +238,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
 
-    // There is a problem with PMA\libraries\Util::currentUserHasPrivilege():
+    // There is a problem with PhpMyAdmin\Util::currentUserHasPrivilege():
     // it does not detect all kinds of privileges, for example
     // a direct privilege on a specific routine. So, at this point,
     // we show the Execute link, hoping that the user has the correct rights.
@@ -262,7 +262,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
 
         $params = PhpMyAdmin\SqlParser\Utils\Routine::getParameters($stmt);
 
-        if (PMA\libraries\Util::currentUserHasPrivilege('EXECUTE', $db)) {
+        if (PhpMyAdmin\Util::currentUserHasPrivilege('EXECUTE', $db)) {
             $execute_action = 'execute_routine';
             for ($i = 0; $i < $params['num']; $i++) {
                 if ($routine['type'] == 'PROCEDURE'
@@ -288,7 +288,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
 
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
-    if ((PMA\libraries\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
+    if ((PhpMyAdmin\Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
         && $curr_user == $routine_definer)
         || $GLOBALS['is_superuser']
     ) {
@@ -358,7 +358,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
         $retval .= "            </td>\n";
     }
     $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('TRIGGER', $db, $table)) {
+    if (PhpMyAdmin\Util::currentUserHasPrivilege('TRIGGER', $db, $table)) {
         $retval .= '                <a ' . $ajax_class['edit']
                                          . ' href="db_triggers.php'
                                          . $url_query
@@ -380,7 +380,7 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
                                          . '">' . $titles['Export'] . "</a>\n";
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('TRIGGER', $db)) {
+    if (PhpMyAdmin\Util::currentUserHasPrivilege('TRIGGER', $db)) {
         $retval .= '                <a ' . $ajax_class['drop']
                                          . ' href="sql.php'
                                          . $url_query
@@ -418,7 +418,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
 
     $sql_drop = sprintf(
         'DROP EVENT IF EXISTS %s',
-        PMA\libraries\Util::backquote($event['name'])
+        PhpMyAdmin\Util::backquote($event['name'])
     );
 
     $retval  = "        <tr class='$rowclass'>\n";
@@ -439,7 +439,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
     $retval .= "                 {$event['status']}\n";
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('EVENT', $db)) {
+    if (PhpMyAdmin\Util::currentUserHasPrivilege('EVENT', $db)) {
         $retval .= '                <a ' . $ajax_class['edit']
                                          . ' href="db_events.php'
                                          . $url_query
@@ -461,7 +461,7 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
                                      . '">' . $titles['Export'] . "</a>\n";
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
-    if (PMA\libraries\Util::currentUserHasPrivilege('EVENT', $db)) {
+    if (PhpMyAdmin\Util::currentUserHasPrivilege('EVENT', $db)) {
         $retval .= '                <a ' . $ajax_class['drop']
                                          . ' href="sql.php'
                                          . $url_query
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 7ac8e3ca4f..52f764b012 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 if (! defined('PHPMYADMIN')) {
@@ -44,7 +44,7 @@ if (! $response->isAjax()) {
             $tooltip_truename,
             $tooltip_aliasname,
             $pos
-        ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+        ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
     }
 } else {
     /**
@@ -55,7 +55,7 @@ if (! $response->isAjax()) {
     if (strlen($db) > 0) {
         $GLOBALS['dbi']->selectDb($db);
         if (! isset($url_query)) {
-            $url_query = URL::getCommon(
+            $url_query = Url::getCommon(
                 array(
                     'db' => $db, 'table' => $table
                 )
@@ -79,7 +79,7 @@ $ajax_class = array(
 /**
  * Create labels for the list
  */
-$titles = PMA\libraries\Util::buildActionTitles();
+$titles = PhpMyAdmin\Util::buildActionTitles();
 
 /**
  * Keep a list of errors that occurred while
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index b2bab9bba3..06c670c3f1 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -9,8 +9,8 @@ use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\SqlParser\Statements\CreateStatement;
 
 if (! defined('PHPMYADMIN')) {
@@ -160,9 +160,9 @@ function PMA_RTN_handleEditor()
             $message .= sprintf(
                 PMA_RTE_getWord('no_edit'),
                 htmlspecialchars(
-                    PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                    PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                 ),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
+                htmlspecialchars(PhpMyAdmin\Util::backquote($db))
             );
 
             $message = Message::error($message);
@@ -219,7 +219,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
                 $privilegesBackup = PMA_RTN_backupPrivileges();
 
                 $drop_routine = "DROP {$_REQUEST['item_original_type']} "
-                    . PMA\libraries\Util::backquote($_REQUEST['item_original_name'])
+                    . PhpMyAdmin\Util::backquote($_REQUEST['item_original_name'])
                     . ";\n";
                 $result = $GLOBALS['dbi']->tryQuery($drop_routine);
                 if (!$result) {
@@ -261,7 +261,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
                     __('Routine %1$s has been created.')
                 );
                 $message->addParam(
-                    PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                    PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                 );
                 $sql_query = $routine_query;
             }
@@ -282,7 +282,7 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
         $message->addHtml('</ul>');
     }
 
-    $output = PMA\libraries\Util::getMessage($message, $sql_query);
+    $output = PhpMyAdmin\Util::getMessage($message, $sql_query);
     $response = Response::getInstance();
     if (!$response->isAjax()) {
         return $errors;
@@ -331,10 +331,10 @@ function PMA_RTN_backupPrivileges()
         return array();
     }
 
-    $privilegesBackupQuery = 'SELECT * FROM ' . PMA\libraries\Util::backquote(
+    $privilegesBackupQuery = 'SELECT * FROM ' . PhpMyAdmin\Util::backquote(
         'mysql'
     )
-    . '.' . PMA\libraries\Util::backquote('procs_priv')
+    . '.' . PhpMyAdmin\Util::backquote('procs_priv')
     . ' where Routine_name = "' . $_REQUEST['item_original_name']
     . '" AND Routine_type = "' . $_REQUEST['item_original_type']
     . '";';
@@ -442,7 +442,7 @@ function PMA_RTN_flushPrivileges($flushPrivileges)
         );
     }
     $message->addParam(
-        PMA\libraries\Util::backquote($_REQUEST['item_name'])
+        PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
     );
 
     return $message;
@@ -514,7 +514,7 @@ function PMA_RTN_getDataFromRequest()
         $retval['item_param_name'] = $_REQUEST['item_param_name'];
         $retval['item_param_type'] = $_REQUEST['item_param_type'];
         foreach ($retval['item_param_type'] as $key => $value) {
-            if (! in_array($value, PMA\libraries\Util::getSupportedDatatypes(), true)) {
+            if (! in_array($value, PhpMyAdmin\Util::getSupportedDatatypes(), true)) {
                 $retval['item_param_type'][$key] = '';
             }
         }
@@ -531,7 +531,7 @@ function PMA_RTN_getDataFromRequest()
     }
     $retval['item_returntype'] = '';
     if (isset($_REQUEST['item_returntype'])
-        && in_array($_REQUEST['item_returntype'], PMA\libraries\Util::getSupportedDatatypes())
+        && in_array($_REQUEST['item_returntype'], PhpMyAdmin\Util::getSupportedDatatypes())
     ) {
         $retval['item_returntype'] = $_REQUEST['item_returntype'];
     }
@@ -581,7 +581,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true)
     $fields  = "SPECIFIC_NAME, ROUTINE_TYPE, DTD_IDENTIFIER, "
              . "ROUTINE_DEFINITION, IS_DETERMINISTIC, SQL_DATA_ACCESS, "
              . "ROUTINE_COMMENT, SECURITY_TYPE";
-    $where   = "ROUTINE_SCHEMA " . PMA\libraries\Util::getCollateForIS() . "="
+    $where   = "ROUTINE_SCHEMA " . PhpMyAdmin\Util::getCollateForIS() . "="
              . "'" . $GLOBALS['dbi']->escapeString($db) . "' "
              . "AND SPECIFIC_NAME='" . $GLOBALS['dbi']->escapeString($name) . "'"
              . "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($type) . "'";
@@ -733,7 +733,7 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
     $retval .= "            <td><input name='item_param_name[$index]' type='text'\n"
         . " value='{$routine['item_param_name'][$i]}' /></td>\n";
     $retval .= "            <td><select name='item_param_type[$index]'>";
-    $retval .= PMA\libraries\Util::getSupportedDatatypes(
+    $retval .= PhpMyAdmin\Util::getSupportedDatatypes(
         true, $routine['item_param_type'][$i]
     ) . "\n";
     $retval .= "            </select></td>\n";
@@ -744,7 +744,7 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
     $retval .= "                <div class='enum_hint'>\n";
     $retval .= "                    <a href='#' class='open_enum_editor'>\n";
     $retval .= "                        "
-        . PMA\libraries\Util::getImage('b_edit', '', array('title'=>__('ENUM/SET editor')))
+        . PhpMyAdmin\Util::getImage('b_edit', '', array('title'=>__('ENUM/SET editor')))
         . "\n";
     $retval .= "                    </a>\n";
     $retval .= "                </div>\n";
@@ -885,7 +885,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<form class='rte_form' action='db_routines.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_routine;
-    $retval .= URL::getHiddenInputs($db) . "\n";
+    $retval .= Url::getHiddenInputs($db) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
@@ -956,7 +956,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
     $retval .= "    <td>" . __('Return type') . "</td>";
     $retval .= "    <td><select name='item_returntype'>";
-    $retval .= PMA\libraries\Util::getSupportedDatatypes(true, $routine['item_returntype']);
+    $retval .= PhpMyAdmin\Util::getSupportedDatatypes(true, $routine['item_returntype']);
     $retval .= "    </select></td>";
     $retval .= "</tr>";
     $retval .= "<tr class='routine_return_row" . $isfunction_class . "'>";
@@ -1005,7 +1005,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     ) {
         $retval .= "<tr>";
         $retval .= "    <td>" . __('Adjust privileges');
-        $retval .= PMA\libraries\Util::showDocu('faq', 'faq6-39');
+        $retval .= PhpMyAdmin\Util::showDocu('faq', 'faq6-39');
         $retval .= "</td>";
         if ($GLOBALS['proc_priv']
             && $GLOBALS['is_reload_priv']
@@ -1096,7 +1096,7 @@ function PMA_RTN_getQueryFromRequest()
             ) {
                 $do_backquote = false;
             }
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0], $do_backquote);
+            $query .= 'DEFINER=' . PhpMyAdmin\Util::backquote($arr[0], $do_backquote);
 
             $do_backquote = true;
             if (substr($arr[1], 0, 1) === "`"
@@ -1104,7 +1104,7 @@ function PMA_RTN_getQueryFromRequest()
             ) {
                 $do_backquote = false;
             }
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1], $do_backquote) . ' ';
+            $query .= '@' . PhpMyAdmin\Util::backquote($arr[1], $do_backquote) . ' ';
         } else {
             $errors[] = __('The definer must be in the "username@hostname" format!');
         }
@@ -1120,7 +1120,7 @@ function PMA_RTN_getQueryFromRequest()
         );
     }
     if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']);
+        $query .= PhpMyAdmin\Util::backquote($_REQUEST['item_name']);
     } else {
         $errors[] = __('You must provide a routine name!');
     }
@@ -1148,10 +1148,10 @@ function PMA_RTN_getQueryFromRequest()
                     && in_array($_REQUEST['item_param_dir'][$i], $param_directions)
                 ) {
                     $params .= $_REQUEST['item_param_dir'][$i] . " "
-                        . PMA\libraries\Util::backquote($item_param_name[$i])
+                        . PhpMyAdmin\Util::backquote($item_param_name[$i])
                         . " " . $item_param_type[$i];
                 } else if ($_REQUEST['item_type'] == 'FUNCTION') {
-                    $params .= PMA\libraries\Util::backquote($item_param_name[$i])
+                    $params .= PhpMyAdmin\Util::backquote($item_param_name[$i])
                         . " " . $item_param_type[$i];
                 } else if (! $warned_about_dir) {
                     $warned_about_dir = true;
@@ -1218,7 +1218,7 @@ function PMA_RTN_getQueryFromRequest()
 
         if (! empty($item_returntype)
             && in_array(
-                $item_returntype, PMA\libraries\Util::getSupportedDatatypes()
+                $item_returntype, PhpMyAdmin\Util::getSupportedDatatypes()
             )
         ) {
             $query .= "RETURNS " . $item_returntype;
@@ -1312,8 +1312,8 @@ function PMA_RTN_handleExecute()
             $message  = __('Error in processing request:') . ' ';
             $message .= sprintf(
                 PMA_RTE_getWord('not_found'),
-                htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
+                htmlspecialchars(PhpMyAdmin\Util::backquote($_REQUEST['item_name'])),
+                htmlspecialchars(PhpMyAdmin\Util::backquote($db))
             );
             $message = Message::error($message);
             if ($response->isAjax()) {
@@ -1358,20 +1358,20 @@ function PMA_RTN_handleExecute()
                     || $routine['item_param_dir'][$i] == 'INOUT'
                 ) {
                     $end_query[] = "@p$i AS "
-                        . PMA\libraries\Util::backquote($routine['item_param_name'][$i]);
+                        . PhpMyAdmin\Util::backquote($routine['item_param_name'][$i]);
                 }
             }
         }
         if ($routine['item_type'] == 'PROCEDURE') {
-            $queries[] = "CALL " . PMA\libraries\Util::backquote($routine['item_name'])
+            $queries[] = "CALL " . PhpMyAdmin\Util::backquote($routine['item_name'])
                        . "(" . implode(', ', $args) . ");\n";
             if (count($end_query)) {
                 $queries[] = "SELECT " . implode(', ', $end_query) . ";\n";
             }
         } else {
-            $queries[] = "SELECT " . PMA\libraries\Util::backquote($routine['item_name'])
+            $queries[] = "SELECT " . PhpMyAdmin\Util::backquote($routine['item_name'])
                        . "(" . implode(', ', $args) . ") "
-                       . "AS " . PMA\libraries\Util::backquote($routine['item_name'])
+                       . "AS " . PhpMyAdmin\Util::backquote($routine['item_name'])
                         . ";\n";
         }
 
@@ -1390,13 +1390,13 @@ function PMA_RTN_handleExecute()
         if ($outcome) {
 
             // Pass the SQL queries through the "pretty printer"
-            $output  = PMA\libraries\Util::formatSql(implode($queries, "\n"));
+            $output  = PhpMyAdmin\Util::formatSql(implode($queries, "\n"));
 
             // Display results
             $output .= "<fieldset><legend>";
             $output .= sprintf(
                 __('Execution results of routine %s'),
-                PMA\libraries\Util::backquote(htmlspecialchars($routine['item_name']))
+                PhpMyAdmin\Util::backquote(htmlspecialchars($routine['item_name']))
             );
             $output .= "</legend>";
 
@@ -1507,7 +1507,7 @@ function PMA_RTN_handleExecute()
         if ($routine !== false) {
             $form = PMA_RTN_getExecuteForm($routine);
             if ($response->isAjax()) {
-                $title = __("Execute routine") . " " . PMA\libraries\Util::backquote(
+                $title = __("Execute routine") . " " . PhpMyAdmin\Util::backquote(
                     htmlentities($_GET['item_name'], ENT_QUOTES)
                 );
                 $response->addJSON('message', $form);
@@ -1522,8 +1522,8 @@ function PMA_RTN_handleExecute()
             $message  = __('Error in processing request:') . ' ';
             $message .= sprintf(
                 PMA_RTE_getWord('not_found'),
-                htmlspecialchars(PMA\libraries\Util::backquote($_REQUEST['item_name'])),
-                htmlspecialchars(PMA\libraries\Util::backquote($db))
+                htmlspecialchars(PhpMyAdmin\Util::backquote($_REQUEST['item_name'])),
+                htmlspecialchars(PhpMyAdmin\Util::backquote($db))
             );
             $message = Message::error($message);
 
@@ -1587,7 +1587,7 @@ function PMA_RTN_getExecuteForm($routine)
     $retval .= "       value='{$routine['item_name']}' />\n";
     $retval .= "<input type='hidden' name='item_type'\n";
     $retval .= "       value='{$routine['item_type']}' />\n";
-    $retval .= URL::getHiddenInputs($db) . "\n";
+    $retval .= Url::getHiddenInputs($db) . "\n";
     $retval .= "<fieldset>\n";
     if (! $response->isAjax()) {
         $retval .= "<legend>{$routine['item_name']}</legend>\n";
@@ -1608,7 +1608,7 @@ function PMA_RTN_getExecuteForm($routine)
     $retval .= "<th>" . __('Value')    . "</th>\n";
     $retval .= "</tr>\n";
     // Get a list of data types that are not yet supported.
-    $no_support_types = PMA\libraries\Util::unsupportedDatatypes();
+    $no_support_types = PhpMyAdmin\Util::unsupportedDatatypes();
     for ($i = 0; $i < $routine['item_num_params']; $i++) { // Each parameter
         if ($routine['item_type'] == 'PROCEDURE'
             && $routine['item_param_dir'][$i] == 'OUT'
@@ -1641,7 +1641,7 @@ function PMA_RTN_getExecuteForm($routine)
                 );
                 $retval .= "<select name='funcs["
                     . $routine['item_param_name'][$i] . "]'>";
-                $retval .= PMA\libraries\Util::getFunctionsForField($field, false, array());
+                $retval .= PhpMyAdmin\Util::getFunctionsForField($field, false, array());
                 $retval .= "</select>";
             }
             $retval .= "</td>\n";
@@ -1664,7 +1664,7 @@ function PMA_RTN_getExecuteForm($routine)
                 $input_type = 'checkbox';
             }
             foreach ($routine['item_param_length_arr'][$i] as $value) {
-                $value = htmlentities(PMA\libraries\Util::unquote($value), ENT_QUOTES);
+                $value = htmlentities(PhpMyAdmin\Util::unquote($value), ENT_QUOTES);
                 $retval .= "<input name='params["
                     . $routine['item_param_name'][$i] . "][]' "
                     . "value='" . $value . "' type='"
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index 165be114fd..c042ef5f83 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -113,7 +113,7 @@ function PMA_TRI_handleEditor()
                             __('Trigger %1$s has been modified.')
                         );
                         $message->addParam(
-                            PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                            PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                         );
                         $sql_query = $drop_item . $item_query;
                     }
@@ -133,7 +133,7 @@ function PMA_TRI_handleEditor()
                         __('Trigger %1$s has been created.')
                     );
                     $message->addParam(
-                        PMA\libraries\Util::backquote($_REQUEST['item_name'])
+                        PhpMyAdmin\Util::backquote($_REQUEST['item_name'])
                     );
                     $sql_query = $item_query;
                 }
@@ -155,7 +155,7 @@ function PMA_TRI_handleEditor()
             $message->addHtml('</ul>');
         }
 
-        $output = PMA\libraries\Util::getMessage($message, $sql_query);
+        $output = PhpMyAdmin\Util::getMessage($message, $sql_query);
         $response = Response::getInstance();
         if ($response->isAjax()) {
             if ($message->isSuccess()) {
@@ -322,7 +322,7 @@ function PMA_TRI_getEditorForm($mode, $item)
     $retval .= "<form class='rte_form' action='db_triggers.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_data;
-    $retval .= URL::getHiddenInputs($db, $table) . "\n";
+    $retval .= Url::getHiddenInputs($db, $table) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
@@ -420,15 +420,15 @@ function PMA_TRI_getQueryFromRequest()
         if (mb_strpos($_REQUEST['item_definer'], '@') !== false
         ) {
             $arr = explode('@', $_REQUEST['item_definer']);
-            $query .= 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-            $query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
+            $query .= 'DEFINER=' . PhpMyAdmin\Util::backquote($arr[0]);
+            $query .= '@' . PhpMyAdmin\Util::backquote($arr[1]) . ' ';
         } else {
             $errors[] = __('The definer must be in the "username@hostname" format!');
         }
     }
     $query .= 'TRIGGER ';
     if (! empty($_REQUEST['item_name'])) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_name']) . ' ';
+        $query .= PhpMyAdmin\Util::backquote($_REQUEST['item_name']) . ' ';
     } else {
         $errors[] = __('You must provide a trigger name!');
     }
@@ -450,7 +450,7 @@ function PMA_TRI_getQueryFromRequest()
     if (! empty($_REQUEST['item_table'])
         && in_array($_REQUEST['item_table'], $GLOBALS['dbi']->getTables($db))
     ) {
-        $query .= PMA\libraries\Util::backquote($_REQUEST['item_table']);
+        $query .= PhpMyAdmin\Util::backquote($_REQUEST['item_table']);
     } else {
         $errors[] = __('You must provide a valid table name!');
     }
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 7718baba9b..49bac63dd2 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Renders the server selection in list or selectbox form, or option tags only
@@ -30,7 +30,7 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
 
     if ($not_only_options) {
         $retval .= '<form method="post" action="'
-            . PMA\libraries\Util::getScriptNameForOption(
+            . PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             )
             . '" class="disableAjax">';
@@ -39,7 +39,7 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
             $retval .= '<fieldset>';
         }
 
-        $retval .= URL::getHiddenFields(array());
+        $retval .= Url::getHiddenFields(array());
         $retval .= '<label for="select_server">'
             . __('Current server:') . '</label> ';
 
@@ -87,10 +87,10 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
             } else {
 
                 $retval .= '<a class="disableAjax item" href="'
-                    . PMA\libraries\Util::getScriptNameForOption(
+                    . PhpMyAdmin\Util::getScriptNameForOption(
                         $GLOBALS['cfg']['DefaultTabServer'], 'server'
                     )
-                    . URL::getCommon(array('server' => $key))
+                    . Url::getCommon(array('server' => $key))
                     . '" >' . htmlspecialchars($label) . '</a>';
             }
             $retval .= '</li>';
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 3eda81e850..25107a96d1 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -24,7 +24,7 @@ if (empty($viewing_mode)) {
 /**
  * Set parameters for links
  */
-$GLOBALS['url_query'] = URL::getCommon();
+$GLOBALS['url_query'] = Url::getCommon();
 
 /**
  * Defines the urls to return to in case of error in a sql statement
diff --git a/libraries/server_common.lib.php b/libraries/server_common.lib.php
index 7e3a2ca94c..8564f4e0ef 100644
--- a/libraries/server_common.lib.php
+++ b/libraries/server_common.lib.php
@@ -49,12 +49,12 @@ function PMA_getHtmlForSubPageHeader($type, $link='', $is_image=true)
 
     if ($is_image) {
         $html = '<h2>' . "\n"
-            . PMA\libraries\Util::getImage($header[$type]['image'])
+            . PhpMyAdmin\Util::getImage($header[$type]['image'])
             . '    ' . $header[$type]['text'] . "\n"
             . $link . '</h2>' . "\n";
     } else {
         $html = '<h2>' . "\n"
-            . PMA\libraries\Util::getIcon($header[$type]['image'])
+            . PhpMyAdmin\Util::getIcon($header[$type]['image'])
             . '    ' . $header[$type]['text'] . "\n"
             . $link . '</h2>' . "\n";
     }
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f2e467dfb7..f53d45ca32 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -10,9 +10,9 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Template;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Get Html for User Group Dialog
@@ -2141,7 +2141,7 @@ function PMA_getHtmlForAddUser($dbname)
        . '<form name="usersForm" id="addUsersForm"'
        . ' onsubmit="return checkAddUser(this);"'
        . ' action="server_privileges.php" method="post" autocomplete="off" >' . "\n"
-       . URL::getHiddenInputs('', '')
+       . Url::getHiddenInputs('', '')
        . PMA_getHtmlForLoginInformationFields('new');
 
     $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n"
@@ -2331,7 +2331,7 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
     if ($GLOBALS['is_superuser']) {
         // check the privileges for a particular database.
         $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= URL::getHiddenInputs($db);
+        $html_output .= Url::getHiddenInputs($db);
         $html_output .= '<fieldset>';
         $html_output .= '<legend>' . "\n"
             . Util::getIcon('b_usrcheck.png')
@@ -2341,7 +2341,7 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
                 '<a href="' . Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 )
-                . URL::getCommon(array('db' => $db)) . '">'
+                . Url::getCommon(array('db' => $db)) . '">'
                 .  htmlspecialchars($db)
                 . '</a>'
             )
@@ -2403,7 +2403,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
     if ($GLOBALS['is_superuser']) {
         // check the privileges for a particular table.
         $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= URL::getHiddenInputs($db, $table);
+        $html_output .= Url::getHiddenInputs($db, $table);
         $html_output .= '<fieldset>';
         $html_output .= '<legend>'
             . Util::getIcon('b_usrcheck.png')
@@ -2412,7 +2412,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
                 '<a href="' . Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'db' => $db,
                         'table' => $table,
@@ -2782,7 +2782,7 @@ function PMA_getUserLink(
     }
 
     $html .= ' href="server_privileges.php'
-        . URL::getCommon($params)
+        . Url::getCommon($params)
         . '">';
 
     switch($linktype) {
@@ -2812,7 +2812,7 @@ function PMA_getUserGroupEditLink($username)
 {
      return '<a class="edit_user_group_anchor ajax"'
         . ' href="server_privileges.php'
-        . URL::getCommon(array('username' => $username))
+        . Url::getCommon(array('username' => $username))
         . '">'
         . Util::getIcon('b_usrlist.png', __('Edit user group'))
         . '</a>';
@@ -2985,7 +2985,7 @@ function PMA_getExtraDataForAjaxBehavior(
             mb_substr($username, 0, 1)
         );
         $newUserInitialString = '<a href="server_privileges.php'
-            . URL::getCommon(array('initial' => $new_user_initial)) . '">'
+            . Url::getCommon(array('initial' => $new_user_initial)) . '">'
             . $new_user_initial . '</a>';
         $extra_data['new_user_initial'] = $new_user_initial;
         $extra_data['new_user_initial_string'] = $newUserInitialString;
@@ -3044,7 +3044,7 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
     $html_output = '<form action="server_privileges.php" '
         . 'onsubmit="return checkAddUser(this);" '
         . 'method="post" class="copyUserForm submenu-item">' . "\n"
-        . URL::getHiddenInputs('', '')
+        . Url::getHiddenInputs('', '')
         . '<input type="hidden" name="old_username" '
         . 'value="' . htmlspecialchars($username) . '" />' . "\n"
         . '<input type="hidden" name="old_hostname" '
@@ -3097,7 +3097,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
         . ' <a href="' . Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
         )
-        . URL::getCommon(
+        . Url::getCommon(
             array(
                 'db' => $url_dbname,
                 'reload' => 1
@@ -3115,7 +3115,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
             . Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabTable'], 'table'
             )
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'db' => $url_dbname,
                     'table' => $tablename,
@@ -3483,7 +3483,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
     $html_output
         = '<form name="usersForm" id="usersForm" action="server_privileges.php" '
         . 'method="post">' . "\n"
-        . URL::getHiddenInputs('', '')
+        . Url::getHiddenInputs('', '')
         . '<table id="tableuserrights" class="data">' . "\n"
         . '<thead>' . "\n"
         . '<tr><th></th>' . "\n"
@@ -4473,7 +4473,7 @@ function PMA_getHtmlHeaderForUserProperties(
     if (! empty($dbname)) {
         $html_output .= ' <i><a class="edit_user_anchor"'
             . ' href="server_privileges.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'username' => $username,
                     'hostname' => $hostname,
@@ -4491,7 +4491,7 @@ function PMA_getHtmlHeaderForUserProperties(
             ? __('Databases') : __('Database');
         if (! empty($entity_name) && $entity_type === 'table') {
             $html_output .= ' <i><a href="server_privileges.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'username' => $username,
                         'hostname' => $hostname,
@@ -4506,7 +4506,7 @@ function PMA_getHtmlHeaderForUserProperties(
                 . ' <i>' . htmlspecialchars($entity_name) . '</i>';
         } elseif (! empty($entity_name)) {
             $html_output .= ' <i><a href="server_privileges.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'username' => $username,
                         'hostname' => $hostname,
@@ -4682,7 +4682,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
                 );
                 $flushnote->addParamHtml(
                     '<a href="server_privileges.php'
-                    . URL::getCommon(array('flush_privileges' => 1))
+                    . Url::getCommon(array('flush_privileges' => 1))
                     . '" id="reload_privileges_anchor">'
                 );
                 $flushnote->addParamHtml('</a>');
@@ -4760,7 +4760,7 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
 
     $html_output .= '<form class="submenu-item" name="usersForm" '
         . 'id="addUsersForm" action="server_privileges.php" method="post">' . "\n";
-    $html_output .= URL::getHiddenInputs($_params);
+    $html_output .= Url::getHiddenInputs($_params);
     $html_output .= PMA_getHtmlToDisplayPrivilegesTable(
         // If $dbname is an array, pass any one db as all have same privs.
         Core::ifSetOr($dbname, (is_array($dbname)) ? $dbname[0] : '*', 'length'),
diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php
index cad682538f..cc5e81a43a 100644
--- a/libraries/server_status.lib.php
+++ b/libraries/server_status.lib.php
@@ -57,7 +57,7 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
         __('Network traffic since startup: %s'),
         implode(
             ' ',
-            PMA\libraries\Util::formatByteDown(
+            PhpMyAdmin\Util::formatByteDown(
                 $bytes_received + $bytes_sent,
                 3,
                 1
@@ -68,8 +68,8 @@ function PMA_getHtmlForServerStateGeneralInfo($ServerStatusData)
     $retval .= '<p>';
     $retval .= sprintf(
         __('This MySQL server has been running for %1$s. It started up on %2$s.'),
-        PMA\libraries\Util::timespanFormat($ServerStatusData->status['Uptime']),
-        PMA\libraries\Util::localisedDate($start_time)
+        PhpMyAdmin\Util::timespanFormat($ServerStatusData->status['Uptime']),
+        PhpMyAdmin\Util::localisedDate($start_time)
     ) . "\n";
     $retval .= '</p>';
 
@@ -138,7 +138,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $retval .= '<tr>';
     $retval .= '<th>';
     $retval .= __('Traffic') . '&nbsp;';
-    $retval .=  PMA\libraries\Util::showHint(
+    $retval .=  PhpMyAdmin\Util::showHint(
         __(
             'On a busy server, the byte counters may overrun, so those statistics '
             . 'as reported by the MySQL server may be incorrect.'
@@ -155,7 +155,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $retval .= '<td class="value">';
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             $ServerStatusData->status['Bytes_received'], 3, 1
         )
     );
@@ -163,7 +163,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $retval .= '<td class="value">';
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             $ServerStatusData->status['Bytes_received'] * $hour_factor, 3, 1
         )
     );
@@ -174,7 +174,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $retval .= '<td class="value">';
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             $ServerStatusData->status['Bytes_sent'], 3, 1
         )
     );
@@ -182,7 +182,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $retval .= '<td class="value">';
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             $ServerStatusData->status['Bytes_sent'] * $hour_factor, 3, 1
         )
     );
@@ -195,7 +195,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $bytes_sent = $ServerStatusData->status['Bytes_sent'];
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             $bytes_received + $bytes_sent, 3, 1
         )
     );
@@ -205,7 +205,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
     $bytes_sent = $ServerStatusData->status['Bytes_sent'];
     $retval .= implode(
         ' ',
-        PMA\libraries\Util::formatByteDown(
+        PhpMyAdmin\Util::formatByteDown(
             ($bytes_received + $bytes_sent) * $hour_factor, 3, 1
         )
     );
@@ -239,7 +239,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
     $retval .= '<tr>';
     $retval .= '<th class="name">' . __('Max. concurrent connections') . '</th>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Max_used_connections'], 0
     );
     $retval .= '</td>';
@@ -249,12 +249,12 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
     $retval .= '<tr>';
     $retval .= '<th class="name">' . __('Failed attempts') . '</th>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Aborted_connects'], 4, 1, true
     );
     $retval .= '</td>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Aborted_connects'] * $hour_factor, 4, 2, true
     );
     $retval .= '</td>';
@@ -263,7 +263,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
         $abortNum = $ServerStatusData->status['Aborted_connects'];
         $connectNum = $ServerStatusData->status['Connections'];
 
-        $retval .= PMA\libraries\Util::formatNumber(
+        $retval .= PhpMyAdmin\Util::formatNumber(
             $abortNum * 100 / $connectNum,
             0, 2, true
         );
@@ -276,12 +276,12 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
     $retval .= '<tr>';
     $retval .= '<th class="name">' . __('Aborted') . '</th>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Aborted_clients'], 4, 1, true
     );
     $retval .= '</td>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Aborted_clients'] * $hour_factor, 4, 2, true
     );
     $retval .= '</td>';
@@ -290,7 +290,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
         $abortNum = $ServerStatusData->status['Aborted_clients'];
         $connectNum = $ServerStatusData->status['Connections'];
 
-        $retval .= PMA\libraries\Util::formatNumber(
+        $retval .= PhpMyAdmin\Util::formatNumber(
             $abortNum * 100 / $connectNum,
             0, 2, true
         );
@@ -303,17 +303,17 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
     $retval .= '<tr>';
     $retval .= '<th class="name">' . __('Total') . '</th>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Connections'], 4, 0
     );
     $retval .= '</td>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $ServerStatusData->status['Connections'] * $hour_factor, 4, 2
     );
     $retval .= '</td>';
     $retval .= '<td class="value">';
-    $retval .= PMA\libraries\Util::formatNumber(100, 0, 2);
+    $retval .= PhpMyAdmin\Util::formatNumber(100, 0, 2);
     $retval .= '%</td>';
     $retval .= '</tr>';
     $retval .= '</tbody>';
diff --git a/libraries/server_status_advisor.lib.php b/libraries/server_status_advisor.lib.php
index 0b27de674b..a0361a0011 100644
--- a/libraries/server_status_advisor.lib.php
+++ b/libraries/server_status_advisor.lib.php
@@ -16,7 +16,7 @@
 function PMA_getHtmlForAdvisor()
 {
     $output  = '<a href="#openAdvisorInstructions">';
-    $output .= PMA\libraries\Util::getIcon('b_help.png', __('Instructions'));
+    $output .= PhpMyAdmin\Util::getIcon('b_help.png', __('Instructions'));
     $output .= '</a>';
     $output .= '<div id="statustabs_advisor"></div>';
     $output .= '<div id="advisorInstructionsDialog" class="hide">';
diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index 20318209c7..a8947ccf94 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -8,7 +8,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * Prints html with monitor
@@ -138,7 +138,7 @@ function PMA_getHtmlForInstructionsDialog()
     );
     $retval .= '</p>';
     $retval .= '<p>';
-    $retval .= PMA\libraries\Util::getImage('s_attention.png');
+    $retval .= PhpMyAdmin\Util::getImage('s_attention.png');
     $retval .= '<strong>';
     $retval .= __('Please note:');
     $retval .= '</strong><br />';
@@ -247,10 +247,10 @@ function PMA_getHtmlForTabLinks()
 {
     $retval  = '<div class="tabLinks">';
     $retval .= '<a href="#pauseCharts">';
-    $retval .= PMA\libraries\Util::getImage('play.png') . __('Start Monitor');
+    $retval .= PhpMyAdmin\Util::getImage('play.png') . __('Start Monitor');
     $retval .= '</a>';
     $retval .= '<a href="#settingsPopup" class="popupLink">';
-    $retval .= PMA\libraries\Util::getImage('s_cog.png') .  __('Settings');
+    $retval .= PhpMyAdmin\Util::getImage('s_cog.png') .  __('Settings');
     $retval .= '</a>';
     $retval .= '<a href="#monitorInstructionsDialog">';
     $retval .= Util::getImage('b_help.png') . __('Instructions/Setup');
@@ -272,10 +272,10 @@ function PMA_getHtmlForSettingsDialog()
 {
     $retval  = '<div class="popupContent settingsPopup">';
     $retval .= '<a href="#addNewChart">';
-    $retval .= PMA\libraries\Util::getImage('b_chart.png') . __('Add chart');
+    $retval .= PhpMyAdmin\Util::getImage('b_chart.png') . __('Add chart');
     $retval .= '</a>';
     $retval .= '<a href="#rearrangeCharts">';
-    $retval .= PMA\libraries\Util::getImage('b_tblops.png')
+    $retval .= PhpMyAdmin\Util::getImage('b_tblops.png')
         . __('Enable charts dragging');
     $retval .= '</a>';
     $retval .= '<div class="clearfloat paddingtop"></div>';
@@ -302,7 +302,7 @@ function PMA_getHtmlForSettingsDialog()
     $retval .= '</div>';
     $retval .= '<div class="clearfloat paddingtop">';
     $retval .= '<b>' . __('Chart arrangement') . '</b> ';
-    $retval .= PMA\libraries\Util::showHint(
+    $retval .= PhpMyAdmin\Util::showHint(
         __(
             'The arrangement of the charts is stored to the browsers local storage. '
             . 'You may want to export it if you have a complicated set up.'
@@ -350,10 +350,10 @@ function PMA_getHtmlForClientSideDataAndLinks($ServerStatusData)
      * Define some links used on client side
      */
     $links  = '<div id="profiling_docu" class="hide">';
-    $links .= PMA\libraries\Util::showMySQLDocu('general-thread-states');
+    $links .= PhpMyAdmin\Util::showMySQLDocu('general-thread-states');
     $links .= '</div>';
     $links .= '<div id="explain_docu" class="hide">';
-    $links .= PMA\libraries\Util::showMySQLDocu('explain-output');
+    $links .= PhpMyAdmin\Util::showMySQLDocu('explain-output');
     $links .= '</div>';
 
     return $form . $links;
@@ -587,7 +587,7 @@ function PMA_getJsonForLogDataTypeSlow($start, $end)
             if (mb_strlen($row['sql_text']) > 220) {
                 $implode_sql_text = implode(
                     ' ',
-                    PMA\libraries\Util::formatByteDown(
+                    PhpMyAdmin\Util::formatByteDown(
                         mb_strlen($row['sql_text']), 2, 2
                     )
                 );
@@ -695,7 +695,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
                     . '... ['
                     .  implode(
                         ' ',
-                        PMA\libraries\Util::formatByteDown(
+                        PhpMyAdmin\Util::formatByteDown(
                             mb_strlen($row['argument']),
                             2,
                             2
@@ -779,7 +779,7 @@ function PMA_getJsonForQueryAnalyzer()
         $GLOBALS['dbi']->selectDb($_REQUEST['database']);
     }
 
-    if ($profiling = PMA\libraries\Util::profilingSupported()) {
+    if ($profiling = PhpMyAdmin\Util::profilingSupported()) {
         $GLOBALS['dbi']->query('SET PROFILING=1;');
     }
 
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index 6be36e8d45..ce8ebc4daf 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -9,8 +9,8 @@
  */
 use PhpMyAdmin\Message;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Prints html for auto refreshing processes list
@@ -52,11 +52,11 @@ function PMA_getHtmlForServerProcesslist()
     $show_full_sql = ! empty($_REQUEST['full']);
     if ($show_full_sql) {
         $url_params['full'] = 1;
-        $full_text_link = 'server_status_processes.php' . URL::getCommon(
+        $full_text_link = 'server_status_processes.php' . Url::getCommon(
             array(), '?'
         );
     } else {
-        $full_text_link = 'server_status_processes.php' . URL::getCommon(
+        $full_text_link = 'server_status_processes.php' . Url::getCommon(
             array('full' => 1)
         );
     }
@@ -143,7 +143,7 @@ function PMA_getHtmlForServerProcesslist()
         }
 
         $retval .= '<th>';
-        $columnUrl = URL::getCommon($column);
+        $columnUrl = Url::getCommon($column);
         $retval .= '<a href="server_status_processes.php' . $columnUrl . '" class="sortlink">';
 
         $retval .= $column['column_name'];
@@ -224,7 +224,7 @@ function PMA_getHtmlForProcessListFilter()
     $retval .= '<fieldset id="tableFilter">';
     $retval .= '<legend>' . __('Filters') . '</legend>';
     $retval .= '<form action="server_status_processes.php">';
-    $retval .= URL::getHiddenInputs($url_params);
+    $retval .= Url::getHiddenInputs($url_params);
     $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
     $retval .= '<div class="formelement">';
     $retval .= '<input' . $showExecuting . ' type="checkbox" name="showExecuting"'
@@ -267,7 +267,7 @@ function PMA_getHtmlForServerProcessItem($process, $show_full_sql)
         'kill' => $process['Id'],
         'ajax_request' => true
     );
-    $kill_process = 'server_status_processes.php' . URL::getCommon($url_params);
+    $kill_process = 'server_status_processes.php' . Url::getCommon($url_params);
 
     $retval  = '<tr>';
     $retval .= '<td><a class="ajax kill_process" href="' . $kill_process . '">'
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index 1eea51a72c..74aa8c6766 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -28,10 +28,10 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
     /* l10n: Questions is the name of a MySQL Status variable */
     $retval .= sprintf(
         __('Questions since startup: %s'),
-        PMA\libraries\Util::formatNumber($total_queries, 0)
+        PhpMyAdmin\Util::formatNumber($total_queries, 0)
     );
     $retval .= ' ';
-    $retval .= PMA\libraries\Util::showMySQLDocu(
+    $retval .= PhpMyAdmin\Util::showMySQLDocu(
         'server-status-variables',
         false,
         'statvar_Questions'
@@ -39,17 +39,17 @@ function PMA_getHtmlForQueryStatistics($ServerStatusData)
     $retval .= '<br />';
     $retval .= '<span>';
     $retval .= '&oslash; ' . __('per hour:') . ' ';
-    $retval .= PMA\libraries\Util::formatNumber($total_queries * $hour_factor, 0);
+    $retval .= PhpMyAdmin\Util::formatNumber($total_queries * $hour_factor, 0);
     $retval .= '<br />';
     $retval .= '&oslash; ' . __('per minute:') . ' ';
-    $retval .= PMA\libraries\Util::formatNumber(
+    $retval .= PhpMyAdmin\Util::formatNumber(
         $total_queries * 60 / $ServerStatusData->status['Uptime'],
         0
     );
     $retval .= '<br />';
     if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
         $retval .= '&oslash; ' . __('per second:') . ' ';
-        $retval .= PMA\libraries\Util::formatNumber(
+        $retval .= PhpMyAdmin\Util::formatNumber(
             $total_queries / $ServerStatusData->status['Uptime'],
             0
         );
@@ -116,17 +116,17 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
         $retval .= '<th class="name">' . htmlspecialchars($name) . '</th>';
         $retval .= '<td class="value">';
         $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value, 5, 0, true)
+            PhpMyAdmin\Util::formatNumber($value, 5, 0, true)
         );
         $retval .= '</td>';
         $retval .= '<td class="value">';
         $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value * $hour_factor, 4, 1, true)
+            PhpMyAdmin\Util::formatNumber($value * $hour_factor, 4, 1, true)
         );
         $retval .= '</td>';
         $retval .= '<td class="value">';
         $retval .= htmlspecialchars(
-            PMA\libraries\Util::formatNumber($value * $perc_factor, 0, 2)
+            PhpMyAdmin\Util::formatNumber($value * $perc_factor, 0, 2)
         );
         $retval .= '</td>';
         $retval .= '</tr>';
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 4b1b314986..f6a45e0826 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -8,7 +8,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Returns the html for the list filter
@@ -36,7 +36,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
     $retval .= '<fieldset id="tableFilter">';
     $retval .= '<legend>' . __('Filters') . '</legend>';
     $retval .= '<form action="server_status_variables.php'
-        . URL::getCommon() . '">';
+        . Url::getCommon() . '">';
     $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
     $retval .= '<div class="formelement">';
     $retval .= '<label for="filterText">' . __('Containing the word:') . '</label>';
@@ -101,7 +101,7 @@ function PMA_getHtmlForLinkSuggestions($ServerStatusData)
                 $retval .= ', ';
             }
             if ('doc' == $link_name) {
-                $retval .= PMA\libraries\Util::showMySQLDocu($link_url);
+                $retval .= PhpMyAdmin\Util::showMySQLDocu($link_url);
             } else {
                 $retval .= '<a href="' . $link_url . '">' . $link_name . '</a>';
             }
@@ -231,7 +231,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
         // Fields containing % are calculated,
         // they can not be described in MySQL documentation
         if (mb_strpos($name, '%') === false) {
-            $retval .= PMA\libraries\Util::showMySQLDocu(
+            $retval .= PhpMyAdmin\Util::showMySQLDocu(
                 'server-status-variables',
                 false,
                 'statvar_' . $name
@@ -249,22 +249,22 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
         }
         if (substr($name, -1) === '%') {
             $retval .= htmlspecialchars(
-                PMA\libraries\Util::formatNumber($value, 0, 2)
+                PhpMyAdmin\Util::formatNumber($value, 0, 2)
             ) . ' %';
         } elseif (strpos($name, 'Uptime') !== false) {
             $retval .= htmlspecialchars(
-                PMA\libraries\Util::timespanFormat($value)
+                PhpMyAdmin\Util::timespanFormat($value)
             );
         } elseif (is_numeric($value) && $value > 1000) {
             $retval .= '<abbr title="'
                 // makes available the raw value as a title
-                . htmlspecialchars(PMA\libraries\Util::formatNumber($value, 0))
+                . htmlspecialchars(PhpMyAdmin\Util::formatNumber($value, 0))
                 . '">'
-                . htmlspecialchars(PMA\libraries\Util::formatNumber($value, 3, 1))
+                . htmlspecialchars(PhpMyAdmin\Util::formatNumber($value, 3, 1))
                 . '</abbr>';
         } elseif (is_numeric($value)) {
             $retval .= htmlspecialchars(
-                PMA\libraries\Util::formatNumber($value, 3, 1)
+                PhpMyAdmin\Util::formatNumber($value, 3, 1)
             );
         } else {
             $retval .= htmlspecialchars($value);
@@ -296,7 +296,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
         if (isset($ServerStatusData->links[$name])) {
             foreach ($ServerStatusData->links[$name] as $link_name => $link_url) {
                 if ('doc' == $link_name) {
-                    $retval .= PMA\libraries\Util::showMySQLDocu($link_url);
+                    $retval .= PhpMyAdmin\Util::showMySQLDocu($link_url);
                 } else {
                     $retval .= ' <a href="' . $link_url . '">' . $link_name . '</a>';
                 }
diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php
index d10f638ed4..3412ebc417 100644
--- a/libraries/server_user_groups.lib.php
+++ b/libraries/server_user_groups.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Return HTML to list the users belonging to a given user group
@@ -21,8 +21,8 @@ function PMA_getHtmlForListingUsersofAGroup($userGroup)
         . '</h2>';
 
     $cfgRelation = PMA_getRelationsParam();
-    $usersTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['users']);
+    $usersTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['users']);
     $sql_query = "SELECT `username` FROM " . $usersTable
         . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
         . "'";
@@ -61,15 +61,15 @@ function PMA_getHtmlForUserGroupsTable()
 {
     $html_output  = '<h2>' . __('User groups') . '</h2>';
     $cfgRelation = PMA_getRelationsParam();
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
+    $groupTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['usergroups']);
     $sql_query = "SELECT * FROM " . $groupTable . " ORDER BY `usergroup` ASC";
     $result = PMA_queryAsControlUser($sql_query, false);
 
     if ($result && $GLOBALS['dbi']->numRows($result)) {
         $html_output .= '<form name="userGroupsForm" id="userGroupsForm"'
             . ' action="server_privileges.php" method="post">';
-        $html_output .= URL::getHiddenInputs();
+        $html_output .= Url::getHiddenInputs();
         $html_output .= '<table id="userGroupsTable">';
         $html_output .= '<thead><tr>';
         $html_output .= '<th style="white-space: nowrap">'
@@ -98,33 +98,33 @@ function PMA_getHtmlForUserGroupsTable()
 
             $html_output .= '<td>';
             $html_output .= '<a class="" href="server_user_groups.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'viewUsers' => 1, 'userGroup' => $groupName
                     )
                 )
                 . '">'
-                . PMA\libraries\Util::getIcon('b_usrlist.png', __('View users'))
+                . PhpMyAdmin\Util::getIcon('b_usrlist.png', __('View users'))
                 . '</a>';
             $html_output .= '&nbsp;&nbsp;';
             $html_output .= '<a class="" href="server_user_groups.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'editUserGroup' => 1, 'userGroup' => $groupName
                     )
                 )
                 . '">'
-                . PMA\libraries\Util::getIcon('b_edit.png', __('Edit')) . '</a>';
+                . PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit')) . '</a>';
             $html_output .= '&nbsp;&nbsp;';
             $html_output .= '<a class="deleteUserGroup ajax"'
                 . ' href="server_user_groups.php'
-                . URL::getCommon(
+                . Url::getCommon(
                     array(
                         'deleteUserGroup' => 1, 'userGroup' => $groupName
                     )
                 )
                 . '">'
-                . PMA\libraries\Util::getIcon('b_drop.png', __('Delete')) . '</a>';
+                . PhpMyAdmin\Util::getIcon('b_drop.png', __('Delete')) . '</a>';
             $html_output .= '</td>';
 
             $html_output .= '</tr>';
@@ -138,8 +138,8 @@ function PMA_getHtmlForUserGroupsTable()
 
     $html_output .= '<fieldset id="fieldset_add_user_group">';
     $html_output .= '<a href="server_user_groups.php'
-        . URL::getCommon(array('addUserGroup' => 1)) . '">'
-        . PMA\libraries\Util::getIcon('b_usradd.png')
+        . Url::getCommon(array('addUserGroup' => 1)) . '">'
+        . PhpMyAdmin\Util::getIcon('b_usradd.png')
         . __('Add user group') . '</a>';
     $html_output .= '</fieldset>';
 
@@ -158,7 +158,7 @@ function PMA_getHtmlForUserGroupsTable()
 function _getAllowedTabNames($row, $level)
 {
     $tabNames = array();
-    $tabs = PMA\libraries\Util::getMenuTabList($level);
+    $tabs = PhpMyAdmin\Util::getMenuTabList($level);
     foreach ($tabs as $tab => $tabName) {
         if (! isset($row[$level . '_' . $tab])
             || $row[$level . '_' . $tab] == 'Y'
@@ -179,10 +179,10 @@ function _getAllowedTabNames($row, $level)
 function PMA_deleteUserGroup($userGroup)
 {
     $cfgRelation = PMA_getRelationsParam();
-    $userTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['users']);
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
+    $userTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['users']);
+    $groupTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['usergroups']);
     $sql_query = "DELETE FROM " . $userTable
         . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
         . "'";
@@ -220,7 +220,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
     } else {
         $urlParams['addUserGroupSubmit'] = '1';
     }
-    $html_output .= URL::getHiddenInputs($urlParams);
+    $html_output .= Url::getHiddenInputs($urlParams);
 
     $html_output .= '<fieldset id="fieldset_user_group_rights">';
     $html_output .= '<legend>' . __('User group menu assignments')
@@ -244,8 +244,8 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
     );
     if ($userGroup != null) {
         $cfgRelation = PMA_getRelationsParam();
-        $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-            . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
+        $groupTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+            . "." . PhpMyAdmin\Util::backquote($cfgRelation['usergroups']);
         $sql_query = "SELECT * FROM " . $groupTable
             . " WHERE `usergroup`='" . $GLOBALS['dbi']->escapeString($userGroup)
             . "'";
@@ -300,7 +300,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
  */
 function _getTabList($title, $level, $selected)
 {
-    $tabs = PMA\libraries\Util::getMenuTabList($level);
+    $tabs = PhpMyAdmin\Util::getMenuTabList($level);
     $html_output = '<fieldset>';
     $html_output .= '<legend>' . $title . '</legend>';
     foreach ($tabs as $tab => $tabName) {
@@ -327,10 +327,10 @@ function _getTabList($title, $level, $selected)
  */
 function PMA_editUserGroup($userGroup, $new = false)
 {
-    $tabs = PMA\libraries\Util::getMenuTabList();
+    $tabs = PhpMyAdmin\Util::getMenuTabList();
     $cfgRelation = PMA_getRelationsParam();
-    $groupTable = PMA\libraries\Util::backquote($cfgRelation['db'])
-        . "." . PMA\libraries\Util::backquote($cfgRelation['usergroups']);
+    $groupTable = PhpMyAdmin\Util::backquote($cfgRelation['db'])
+        . "." . PhpMyAdmin\Util::backquote($cfgRelation['usergroups']);
 
     if (! $new) {
         $sql_query = "DELETE FROM " . $groupTable
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
index 2100444162..e4dba4ea84 100644
--- a/libraries/server_users.lib.php
+++ b/libraries/server_users.lib.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Get HTML for secondary level menu tabs on 'Users' page
@@ -20,7 +20,7 @@ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
         array(
             'name' => __('User accounts overview'),
             'url' => 'server_privileges.php',
-            'params' => URL::getCommon(array('viewing_mode' => 'server')),
+            'params' => Url::getCommon(array('viewing_mode' => 'server')),
         )
     );
 
@@ -28,7 +28,7 @@ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
         $items[] = array(
             'name' => __('User groups'),
             'url' => 'server_user_groups.php',
-            'params' => URL::getCommon(),
+            'params' => Url::getCommon(),
         );
     }
 
diff --git a/libraries/session.lib.php b/libraries/session.lib.php
index d784e27edb..f38e14216e 100644
--- a/libraries/session.lib.php
+++ b/libraries/session.lib.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 /**
  * tries to secure session from hijacking and fixation
diff --git a/libraries/special_schema_links.lib.php b/libraries/special_schema_links.lib.php
index b37694c95a..bab8b5be88 100644
--- a/libraries/special_schema_links.lib.php
+++ b/libraries/special_schema_links.lib.php
@@ -65,7 +65,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'Db'
                     ),
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -118,7 +118,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'database_name'
                     ),
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -146,7 +146,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'database_name'
                     ),
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -238,7 +238,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'Db'
                     ),
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -266,7 +266,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -294,7 +294,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'constraint_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -320,7 +320,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'referenced_table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -348,7 +348,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             )
@@ -374,7 +374,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'constraint_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -386,7 +386,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'constraint_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             )
@@ -410,7 +410,7 @@ $GLOBALS['special_schema_links'] = array(
         'schemata' => array(
             'schema_name' => array(
                 'link_param' => 'db',
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             )
@@ -424,7 +424,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -452,7 +452,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -466,7 +466,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
@@ -480,7 +480,7 @@ $GLOBALS['special_schema_links'] = array(
                         'column_name' => 'table_schema'
                     )
                 ),
-                'default_page' => './' . PMA\libraries\Util::getScriptNameForOption(
+                'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
             ),
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 9033e359e7..296716823c 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -11,7 +11,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Encoding;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Bookmark;
 
 if (! defined('PHPMYADMIN')) {
@@ -84,7 +84,7 @@ function PMA_getHtmlForSqlQueryForm(
     $html .= ' id="sqlqueryform" name="sqlform">' . "\n";
 
     $html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
-        . "\n" . URL::getHiddenInputs($db, $table) . "\n"
+        . "\n" . Url::getHiddenInputs($db, $table) . "\n"
         . '<input type="hidden" name="pos" value="0" />' . "\n"
         . '<input type="hidden" name="goto" value="'
         . htmlspecialchars($goto) . '" />' . "\n"
@@ -147,15 +147,15 @@ function PMA_initQueryForm($query)
         // prepare for db related
         $db     = $GLOBALS['db'];
         // if you want navigation:
-        $tmp_db_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
+        $tmp_db_link = '<a href="' . PhpMyAdmin\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
         )
-            . URL::getCommon(array('db' => $db)) . '"';
+            . Url::getCommon(array('db' => $db)) . '"';
         $tmp_db_link .= '>'
             . htmlspecialchars($db) . '</a>';
         $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
         if (empty($query)) {
-            $query = PMA\libraries\Util::expandUserString(
+            $query = PhpMyAdmin\Util::expandUserString(
                 $GLOBALS['cfg']['DefaultQueryDatabase'], 'backquote'
             );
         }
@@ -169,19 +169,19 @@ function PMA_initQueryForm($query)
             $db, $GLOBALS['table'], null, true
         );
 
-        $tmp_tbl_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
+        $tmp_tbl_link = '<a href="' . PhpMyAdmin\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabTable'], 'table'
-        ) . URL::getCommon(array('db' => $db, 'table' => $table)) . '" >';
+        ) . Url::getCommon(array('db' => $db, 'table' => $table)) . '" >';
         $tmp_tbl_link .= htmlspecialchars($db)
             . '.' . htmlspecialchars($table) . '</a>';
         $legend = sprintf(__('Run SQL query/queries on table %s'), $tmp_tbl_link);
         if (empty($query)) {
-            $query = PMA\libraries\Util::expandUserString(
+            $query = PhpMyAdmin\Util::expandUserString(
                 $GLOBALS['cfg']['DefaultQueryTable'], 'backquote'
             );
         }
     }
-    $legend .= ': ' . PMA\libraries\Util::showMySQLDocu('SELECT');
+    $legend .= ': ' . PhpMyAdmin\Util::showMySQLDocu('SELECT');
 
     return array($legend, $query, $columns_list);
 }
@@ -257,7 +257,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
     $html .= '<div>';
     $html .= '<input type="checkbox" name="parameterized" id="parameterized" />';
     $html .= '<label for="parameterized">' . __('Bind parameters') . '</label>';
-    $html .= PMA\libraries\Util::showDocu('faq', 'faq6-40');
+    $html .= PhpMyAdmin\Util::showDocu('faq', 'faq6-40');
     $html .= '<div id="parametersDiv"></div>';
     $html .= '</div>';
 
@@ -271,7 +271,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
             . 'multiple="multiple" ondblclick="insertValueQuery()">';
         foreach ($columns_list as $field) {
             $html .= '<option value="'
-                . PMA\libraries\Util::backquote(htmlspecialchars($field['Field']))
+                . PhpMyAdmin\Util::backquote(htmlspecialchars($field['Field']))
                 . '"';
             if (isset($field['Field'])
                 && strlen($field['Field']) > 0
@@ -283,7 +283,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
         }
         $html .= '</select>'
             . '<div id="tablefieldinsertbuttoncontainer">';
-        if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
+        if (PhpMyAdmin\Util::showIcons('ActionLinksMode')) {
             $html .= '<input type="button" class="button" name="insert"'
                 . ' value="&lt;&lt;" onclick="insertValueQuery()"'
                 . ' title="' . __('Insert') . '" />';
@@ -365,7 +365,7 @@ function PMA_getHtmlForSqlQueryFormInsert(
 
     // Disable/Enable foreign key checks
     $html .= '<div class="formelement">';
-    $html .= PMA\libraries\Util::getFKCheckbox();
+    $html .= PhpMyAdmin\Util::getFKCheckbox();
     $html .= '</div>';
 
     $html .= '<input type="submit" id="button_submit_query" name="SQL"';
@@ -425,7 +425,7 @@ function PMA_getHtmlForSqlQueryFormBookmark()
     $html .= '<div class="clearfloat"></div>' . "\n";
     $html .= '<div class="formelement hide">' . "\n";
     $html .= __('Variables');
-    $html .= PMA\libraries\Util::showDocu('faq', 'faqbookmark');
+    $html .= PhpMyAdmin\Util::showDocu('faq', 'faqbookmark');
     $html .= '<div id="bookmark_variables"></div>';
     $html .= '</div>' . "\n";
     $html .= '</fieldset>' . "\n";
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index ad74d8f3ab..297d97a7d2 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -7,8 +7,8 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Transformations;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Transformations;
 use PMA\Util;
 
 if (!defined('PHPMYADMIN')) {
@@ -20,7 +20,7 @@ if (!defined('PHPMYADMIN')) {
  */
 require_once 'libraries/util.lib.php';
 
-PMA\libraries\Util::checkParameters(
+PhpMyAdmin\Util::checkParameters(
     array('server', 'db', 'table', 'action', 'num_fields')
 );
 
@@ -262,12 +262,12 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
     }
 
     if (isset($columnMeta['Type'])) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
+        $extracted_columnspec = PhpMyAdmin\Util::extractColumnSpec(
             $columnMeta['Type']
         );
         if ($extracted_columnspec['type'] == 'bit') {
             $columnMeta['Default']
-                = PMA\libraries\Util::convertBitDefaultValue($columnMeta['Default']);
+                = PhpMyAdmin\Util::convertBitDefaultValue($columnMeta['Default']);
         }
         $type = $extracted_columnspec['type'];
         if ($length == '') {
@@ -390,7 +390,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
 } // end for
 
 include 'libraries/tbl_partition_definition.inc.php';
-$html = PMA\libraries\Template::get('columns_definitions/column_definitions_form')
+$html = PhpMyAdmin\Template::get('columns_definitions/column_definitions_form')
     ->render(
         array(
             'is_backup'        => $is_backup,
diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php
index 7ff5f288be..650b23da27 100644
--- a/libraries/tbl_common.inc.php
+++ b/libraries/tbl_common.inc.php
@@ -5,14 +5,14 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
 }
 
 // Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table'));
+PhpMyAdmin\Util::checkParameters(array('db', 'table'));
 
 $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
 
@@ -20,7 +20,7 @@ $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
  * Set parameters for links
  * @deprecated
  */
-$url_query = URL::getCommon(array('db' => $db, 'table' => $table));
+$url_query = Url::getCommon(array('db' => $db, 'table' => $table));
 
 /**
  * Set parameters for links
@@ -32,15 +32,15 @@ $url_params['table'] = $table;
 /**
  * Defines the urls to return to in case of error in a sql statement
  */
-$err_url_0 = PMA\libraries\Util::getScriptNameForOption(
+$err_url_0 = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . URL::getCommon(array('db' => $db));
+    . Url::getCommon(array('db' => $db));
 
-$err_url = PMA\libraries\Util::getScriptNameForOption(
+$err_url = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabTable'], 'table'
 )
-    . URL::getCommon($url_params);
+    . Url::getCommon($url_params);
 
 
 /**
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 85050fdb41..3a89ae6026 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -9,8 +9,8 @@
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Tracker;
-use PMA\libraries\URL;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 /**
@@ -63,7 +63,7 @@ function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query,
 ) {
     $html  = '<div id="div_create_version">';
     $html .= '<form method="post" action="' . $url_query . '">';
-    $html .= URL::getHiddenInputs($db);
+    $html .= Url::getHiddenInputs($db);
     foreach ($selected as $selected_table) {
         $html .= '<input type="hidden" name="selected[]"'
             . ' value="' . htmlspecialchars($selected_table) . '" />';
@@ -201,7 +201,7 @@ function PMA_getHtmlForActivateDeactivateTracking(
 ) {
     $html = '<div>';
     $html .= '<form method="post" action="tbl_tracking.php' . $url_query . '">';
-    $html .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $html .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $html .= '<fieldset>';
     $html .= '<legend>';
 
@@ -247,8 +247,8 @@ function PMA_getListOfVersionsOfTable()
 {
     $cfgRelation = PMA_getRelationsParam();
     $sql_query = " SELECT * FROM " .
-        PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
-        PMA\libraries\Util::backquote($cfgRelation['tracking']) .
+        PhpMyAdmin\Util::backquote($cfgRelation['db']) . "." .
+        PhpMyAdmin\Util::backquote($cfgRelation['tracking']) .
         " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($_REQUEST['db']) .
         "' " .
         " AND table_name = '" .
@@ -278,7 +278,7 @@ function PMA_getHtmlForTableVersionDetails(
 
     $html  = '<form method="post" action="tbl_tracking.php" name="versionsForm"'
         . ' id="versionsForm" class="ajax">';
-    $html .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $html .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $html .= '<table id="versions" class="data">';
     $html .= '<thead>';
     $html .= '<tr>';
@@ -294,9 +294,9 @@ function PMA_getHtmlForTableVersionDetails(
     $html .= '<tbody>';
 
     $GLOBALS['dbi']->dataSeek($sql_result, 0);
-    $delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete version'));
-    $report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
-    $structure = PMA\libraries\Util::getIcon(
+    $delete = PhpMyAdmin\Util::getIcon('b_drop.png', __('Delete version'));
+    $report = PhpMyAdmin\Util::getIcon('b_report.png', __('Tracking report'));
+    $structure = PhpMyAdmin\Util::getIcon(
         'b_props.png',
         __('Structure snapshot')
     );
@@ -330,7 +330,7 @@ function PMA_getHtmlForTableVersionDetails(
         $html .= '<td><a class="delete_version_anchor ajax"'
             . ' href="' . $delete_link . '" >' . $delete . '</a></td>';
         $html .= '<td><a href="tbl_tracking.php';
-        $html .= URL::getCommon(
+        $html .= Url::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $version['version']
             )
@@ -338,7 +338,7 @@ function PMA_getHtmlForTableVersionDetails(
         $html .= '">' . $report . '</a>';
         $html .= '&nbsp;&nbsp;';
         $html .= '<a href="tbl_tracking.php';
-        $html .= URL::getCommon(
+        $html .= Url::getCommon(
             $url_params + array(
                 'snapshot' => 'true', 'version' => $version['version']
             )
@@ -351,7 +351,7 @@ function PMA_getHtmlForTableVersionDetails(
     $html .= '</tbody>';
     $html .= '</table>';
 
-    $html .= PMA\libraries\Template::get('select_all')
+    $html .= PhpMyAdmin\Template::get('select_all')
         ->render(
             array(
                 'pma_theme_image' => $pmaThemeImage,
@@ -359,7 +359,7 @@ function PMA_getHtmlForTableVersionDetails(
                 'form_name'       => 'versionsForm',
             )
         );
-    $html .= PMA\libraries\Util::getButtonOrImage(
+    $html .= PhpMyAdmin\Util::getButtonOrImage(
         'submit_mult', 'mult_submit',
         __('Delete version'), 'b_drop.png', 'delete_version'
     );
@@ -403,8 +403,8 @@ function PMA_getSQLResultForSelectableTables()
     $cfgRelation = PMA_getRelationsParam();
 
     $sql_query = " SELECT DISTINCT db_name, table_name FROM " .
-        PMA\libraries\Util::backquote($cfgRelation['db']) . "." .
-        PMA\libraries\Util::backquote($cfgRelation['tracking']) .
+        PhpMyAdmin\Util::backquote($cfgRelation['db']) . "." .
+        PhpMyAdmin\Util::backquote($cfgRelation['tracking']) .
         " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($GLOBALS['db']) .
         "' " .
         " ORDER BY db_name, table_name";
@@ -423,7 +423,7 @@ function PMA_getSQLResultForSelectableTables()
 function PMA_getHtmlForSelectableTables($selectable_tables_sql_result, $url_query)
 {
     $html = '<form method="post" action="tbl_tracking.php' . $url_query . '">';
-    $html .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $html .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $html .= '<select name="table" class="autosubmit">';
     while ($entries = $GLOBALS['dbi']->fetchArray($selectable_tables_sql_result)) {
         if (Tracker::isTracked($entries['db_name'], $entries['table_name'])) {
@@ -481,12 +481,12 @@ function PMA_getHtmlForTrackingReport($url_query, $data, $url_params,
 
     // Prepare delete link content here
     $drop_image_or_text = '';
-    if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
-        $drop_image_or_text .= PMA\libraries\Util::getImage(
+    if (PhpMyAdmin\Util::showIcons('ActionLinksMode')) {
+        $drop_image_or_text .= PhpMyAdmin\Util::getImage(
             'b_drop.png', __('Delete tracking data row from report')
         );
     }
-    if (PMA\libraries\Util::showText('ActionLinksMode')) {
+    if (PhpMyAdmin\Util::showText('ActionLinksMode')) {
         $drop_image_or_text .= __('Delete');
     }
 
@@ -575,13 +575,13 @@ function PMA_getHtmlForTrackingReportExportForm1(
     $ddlog_count = 0;
 
     $html = '<form method="post" action="tbl_tracking.php'
-        . URL::getCommon(
+        . Url::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $_REQUEST['version']
             )
         )
         . '">';
-    $html .= URL::getHiddenInputs();
+    $html .= Url::getHiddenInputs();
 
     $html .= sprintf(
         __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
@@ -626,13 +626,13 @@ function PMA_getHtmlForTrackingReportExportForm2(
     $url_params, $str1, $str2, $str3, $str4, $str5
 ) {
     $html = '<form method="post" action="tbl_tracking.php'
-        . URL::getCommon(
+        . Url::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $_REQUEST['version']
             )
         )
         . '">';
-    $html .= URL::getHiddenInputs();
+    $html .= Url::getHiddenInputs();
     $html .= sprintf(
         __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
         $str1, $str2, $str3, $str4, $str5
@@ -640,12 +640,12 @@ function PMA_getHtmlForTrackingReportExportForm2(
     $html .= '</form>';
 
     $html .= '<form class="disableAjax" method="post" action="tbl_tracking.php'
-        . URL::getCommon(
+        . Url::getCommon(
             $url_params
             + array('report' => 'true', 'version' => $_REQUEST['version'])
         )
         . '">';
-    $html .= URL::getHiddenInputs();
+    $html .= Url::getHiddenInputs();
     $html .= '<input type="hidden" name="logtype" value="'
         . htmlspecialchars($_REQUEST['logtype']) . '" />';
     $html .= '<input type="hidden" name="date_from" value="'
@@ -720,7 +720,7 @@ function PMA_getHtmlForOneStatement($entry, $filter_users,
     $filter_ts_from, $filter_ts_to, $line_number, $url_params, $offset,
     $drop_image_or_text, $delete_param
 ) {
-    $statement  = PMA\libraries\Util::formatSql($entry['statement'], true);
+    $statement  = PhpMyAdmin\Util::formatSql($entry['statement'], true);
     $timestamp = strtotime($entry['date']);
     $filtered_user = in_array($entry['username'], $filter_users);
     $html = null;
@@ -738,7 +738,7 @@ function PMA_getHtmlForOneStatement($entry, $filter_users,
         $html .= '<td>' . $statement . '</td>';
         $html .= '<td class="nowrap"><a  class="delete_entry_anchor ajax"'
             . ' href="tbl_tracking.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 $url_params + array(
                     'report' => 'true',
                     'version' => $_REQUEST['version'],
@@ -849,7 +849,7 @@ function PMA_getHtmlForSchemaSnapshot($url_query)
         $drop_create_statements .= $data['ddlog'][1]['statement'];
     }
     // Print SQL code
-    $html .= PMA\libraries\Util::getMessage(
+    $html .= PhpMyAdmin\Util::getMessage(
         sprintf(
             __('Version %s snapshot (SQL code)'),
             htmlspecialchars($_REQUEST['version'])
@@ -923,11 +923,11 @@ function PMA_getHtmlForField($index, $field)
     $html .= '<td>' . $index . '</td>';
     $html .= '<td><b>' . htmlspecialchars($field['Field']);
     if ($field['Key'] == 'PRI') {
-        $html .= ' ' . PMA\libraries\Util::getImage(
+        $html .= ' ' . PhpMyAdmin\Util::getImage(
             'b_primary.png', __('Primary')
         );
     } elseif (! empty($field['Key'])) {
-        $html .= ' ' . PMA\libraries\Util::getImage(
+        $html .= ' ' . PhpMyAdmin\Util::getImage(
             'bd_primary.png', __('Index')
         );
     }
@@ -938,12 +938,12 @@ function PMA_getHtmlForField($index, $field)
     $html .= '<td>' . (($field['Null'] == 'YES') ? __('Yes') : __('No')) . '</td>';
     $html .= '<td>';
     if (isset($field['Default'])) {
-        $extracted_columnspec = PMA\libraries\Util::extractColumnSpec(
+        $extracted_columnspec = PhpMyAdmin\Util::extractColumnSpec(
             $field['Type']
         );
         if ($extracted_columnspec['type'] == 'bit') {
             // here, $field['Default'] contains something like b'010'
-            $html .= PMA\libraries\Util::convertBitDefaultValue($field['Default']);
+            $html .= PhpMyAdmin\Util::convertBitDefaultValue($field['Default']);
         } else {
             $html .= htmlspecialchars($field['Default']);
         }
@@ -1451,7 +1451,7 @@ function PMA_displayUntrackedTables(
     <form method="post" action="db_tracking.php" name="untrackedForm"
         id="untrackedForm" class="ajax">
     <?php
-    echo URL::getHiddenInputs($db)
+    echo Url::getHiddenInputs($db)
     ?>
     <table id="noversions" class="data">
     <thead>
@@ -1472,7 +1472,7 @@ function PMA_displayUntrackedTables(
     </tbody>
     </table>
     <?php
-    echo PMA\libraries\Template::get('select_all')
+    echo PhpMyAdmin\Template::get('select_all')
         ->render(
             array(
                 'pma_theme_image' => $pmaThemeImage,
@@ -1480,7 +1480,7 @@ function PMA_displayUntrackedTables(
                 'form_name'       => 'untrackedForm',
             )
         );
-    echo PMA\libraries\Util::getButtonOrImage(
+    echo PhpMyAdmin\Util::getButtonOrImage(
         'submit_mult', 'mult_submit',
         __('Track table'), 'eye.png', 'track'
     );
@@ -1505,7 +1505,7 @@ function PMA_displayOneUntrackedTable($db, $tablename, $url_query)
     if (Tracker::getVersion($db, $tablename) == -1) {
         $my_link = '<a href="tbl_tracking.php' . $url_query
             . '&amp;table=' . htmlspecialchars($tablename) . '">';
-        $my_link .= PMA\libraries\Util::getIcon('eye.png', __('Track table'));
+        $my_link .= PhpMyAdmin\Util::getIcon('eye.png', __('Track table'));
         $my_link .= '</a>';
         ?>
         <tr>
@@ -1563,7 +1563,7 @@ function PMA_extractTableNames($table_list, $db, $testing = false) {
  */
 function PMA_getUntrackedTables($db)
 {
-    $table_list = PMA\libraries\Util::getTableList($db);
+    $table_list = PhpMyAdmin\Util::getTableList($db);
     $untracked_tables = PMA_extractTableNames($table_list, $db);  //Use helper function to get table list recursively.
     return $untracked_tables;
 }
@@ -1590,7 +1590,7 @@ function PMA_displayTrackedTables(
     <form method="post" action="db_tracking.php" name="trackedForm"
         id="trackedForm" class="ajax">
     <?php
-    echo URL::getHiddenInputs($db)
+    echo Url::getHiddenInputs($db)
     ?>
     <table id="versions" class="data">
     <thead>
@@ -1610,10 +1610,10 @@ function PMA_displayTrackedTables(
 
     // Print out information about versions
 
-    $delete = PMA\libraries\Util::getIcon('b_drop.png', __('Delete tracking'));
-    $versions = PMA\libraries\Util::getIcon('b_versions.png', __('Versions'));
-    $report = PMA\libraries\Util::getIcon('b_report.png', __('Tracking report'));
-    $structure = PMA\libraries\Util::getIcon(
+    $delete = PhpMyAdmin\Util::getIcon('b_drop.png', __('Delete tracking'));
+    $versions = PhpMyAdmin\Util::getIcon('b_versions.png', __('Versions'));
+    $report = PhpMyAdmin\Util::getIcon('b_report.png', __('Tracking report'));
+    $structure = PhpMyAdmin\Util::getIcon(
         'b_props.png',
         __('Structure snapshot')
     );
@@ -1621,8 +1621,8 @@ function PMA_displayTrackedTables(
     while ($one_result = $GLOBALS['dbi']->fetchArray($all_tables_result)) {
         list($table_name, $version_number) = $one_result;
         $table_query = ' SELECT * FROM ' .
-             PMA\libraries\Util::backquote($cfgRelation['db']) . '.' .
-             PMA\libraries\Util::backquote($cfgRelation['tracking']) .
+             PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.' .
+             PhpMyAdmin\Util::backquote($cfgRelation['tracking']) .
              ' WHERE `db_name` = \''
              . $GLOBALS['dbi']->escapeString($_REQUEST['db'])
              . '\' AND `table_name`  = \''
@@ -1680,7 +1680,7 @@ function PMA_displayTrackedTables(
     </tbody>
     </table>
     <?php
-    echo PMA\libraries\Template::get('select_all')
+    echo PhpMyAdmin\Template::get('select_all')
         ->render(
             array(
                 'pma_theme_image' => $pmaThemeImage,
@@ -1688,7 +1688,7 @@ function PMA_displayTrackedTables(
                 'form_name'       => 'trackedForm',
             )
         );
-    echo PMA\libraries\Util::getButtonOrImage(
+    echo PhpMyAdmin\Util::getButtonOrImage(
         'submit_mult', 'mult_submit',
         __('Delete tracking'), 'b_drop.png', 'delete_tracking'
     );
@@ -1721,7 +1721,7 @@ function PMA_displayStatusButton($version_data, $tbl_link)
             'selected' => ($state == 'active')
         )
     );
-    echo PMA\libraries\Util::toggleButton(
+    echo PhpMyAdmin\Util::toggleButton(
         $tbl_link . '&amp;version=' . $version_data['version'],
         'toggle_activation',
         $options,
diff --git a/libraries/twig/UrlExtension.php b/libraries/twig/UrlExtension.php
index 839caa6cb3..22915b9fb8 100644
--- a/libraries/twig/UrlExtension.php
+++ b/libraries/twig/UrlExtension.php
@@ -27,17 +27,17 @@ class UrlExtension extends Twig_Extension
         return array(
             new Twig_SimpleFunction(
                 'URL_getHiddenInputs',
-                'PMA\libraries\URL::getHiddenInputs',
+                'PhpMyAdmin\Url::getHiddenInputs',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'URL_getHiddenFields',
-                'PMA\libraries\URL::getHiddenFields',
+                'PhpMyAdmin\Url::getHiddenFields',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'URL_getCommon',
-                'PMA\libraries\URL::getCommon',
+                'PhpMyAdmin\Url::getCommon',
                 array('is_safe' => array('html'))
             )
         );
diff --git a/libraries/twig/UtilExtension.php b/libraries/twig/UtilExtension.php
index 9a332e2901..8d1199259a 100644
--- a/libraries/twig/UtilExtension.php
+++ b/libraries/twig/UtilExtension.php
@@ -27,85 +27,85 @@ class UtilExtension extends Twig_Extension
         return array(
             new Twig_SimpleFunction(
                 'Util_backquote',
-                'PMA\libraries\Util::backquote'
+                'PhpMyAdmin\Util::backquote'
             ),
             new Twig_SimpleFunction(
                 'Util_convertBitDefaultValue',
-                'PMA\libraries\Util::convertBitDefaultValue'
+                'PhpMyAdmin\Util::convertBitDefaultValue'
             ),
             new Twig_SimpleFunction(
                 'Util_escapeMysqlWildcards',
-                'PMA\libraries\Util::escapeMysqlWildcards'
+                'PhpMyAdmin\Util::escapeMysqlWildcards'
             ),
             new Twig_SimpleFunction(
                 'Util_formatByteDown',
-                'PMA\libraries\Util::formatByteDown'
+                'PhpMyAdmin\Util::formatByteDown'
             ),
             new Twig_SimpleFunction(
                 'Util_formatNumber',
-                'PMA\libraries\Util::formatNumber'
+                'PhpMyAdmin\Util::formatNumber'
             ),
             new Twig_SimpleFunction(
                 'Util_formatSql',
-                'PMA\libraries\Util::formatSql',
+                'PhpMyAdmin\Util::formatSql',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getButtonOrImage',
-                'PMA\libraries\Util::getButtonOrImage',
+                'PhpMyAdmin\Util::getButtonOrImage',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getDivForSliderEffect',
-                'PMA\libraries\Util::getDivForSliderEffect',
+                'PhpMyAdmin\Util::getDivForSliderEffect',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getDropdown',
-                'PMA\libraries\Util::getDropdown',
+                'PhpMyAdmin\Util::getDropdown',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getHtmlTab',
-                'PMA\libraries\Util::getHtmlTab',
+                'PhpMyAdmin\Util::getHtmlTab',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getIcon',
-                'PMA\libraries\Util::getIcon',
+                'PhpMyAdmin\Util::getIcon',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getImage',
-                'PMA\libraries\Util::getImage',
+                'PhpMyAdmin\Util::getImage',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_getSupportedDatatypes',
-                'PMA\libraries\Util::getSupportedDatatypes',
+                'PhpMyAdmin\Util::getSupportedDatatypes',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_linkOrButton',
-                'PMA\libraries\Util::linkOrButton',
+                'PhpMyAdmin\Util::linkOrButton',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_localisedDate',
-                'PMA\libraries\Util::localisedDate'
+                'PhpMyAdmin\Util::localisedDate'
             ),
             new Twig_SimpleFunction(
                 'Util_showHint',
-                'PMA\libraries\Util::showHint',
+                'PhpMyAdmin\Util::showHint',
                 array('is_safe' => array('html'))
             ),
             new Twig_SimpleFunction(
                 'Util_showIcons',
-                'PMA\libraries\Util::showIcons'
+                'PhpMyAdmin\Util::showIcons'
             ),
             new Twig_SimpleFunction(
                 'Util_showMySQLDocu',
-                'PMA\libraries\Util::showMySQLDocu',
+                'PhpMyAdmin\Util::showMySQLDocu',
                 array('is_safe' => array('html'))
             ),
         );
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 2107c6b8bc..e6c470ba97 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -26,7 +26,7 @@ $tabs_icons = array(
     'Import'      => 'b_import.png',
     'Export'      => 'b_export.png');
 
-$content = PMA\libraries\Util::getHtmlTab(
+$content = PhpMyAdmin\Util::getHtmlTab(
     array(
         'link' => 'prefs_manage.php',
         'text' => __('Manage your settings')
@@ -39,10 +39,10 @@ foreach (array_keys($forms) as $formset) {
         'text' => PMA_lang('Form_' . $formset),
         'icon' => $tabs_icons[$formset],
         'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
-    $content .= PMA\libraries\Util::getHtmlTab($tab, array('form' => $formset))
+    $content .= PhpMyAdmin\Util::getHtmlTab($tab, array('form' => $formset))
         . "\n";
 }
-echo PMA\libraries\Template::get('list/unordered')->render(
+echo PhpMyAdmin\Template::get('list/unordered')->render(
     array(
         'id' => 'topmenu2',
         'class' => 'user_prefs_tabs',
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index c228727722..3adffb2e30 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -8,7 +8,7 @@
 use PMA\libraries\config\ConfigFile;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Message;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -61,8 +61,8 @@ function PMA_loadUserprefs()
             'type' => 'session');
     }
     // load configuration from pmadb
-    $query_table = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['userconfig']);
+    $query_table = PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+        . PhpMyAdmin\Util::backquote($cfgRelation['userconfig']);
     $query = 'SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts'
         . ' FROM ' . $query_table
         . ' WHERE `username` = \''
@@ -102,8 +102,8 @@ function PMA_saveUserprefs(array $config_array)
     }
 
     // save configuration to pmadb
-    $query_table = PMA\libraries\Util::backquote($cfgRelation['db']) . '.'
-        . PMA\libraries\Util::backquote($cfgRelation['userconfig']);
+    $query_table = PhpMyAdmin\Util::backquote($cfgRelation['db']) . '.'
+        . PhpMyAdmin\Util::backquote($cfgRelation['userconfig']);
     $query = 'SELECT `username` FROM ' . $query_table
         . ' WHERE `username` = \''
         . $GLOBALS['dbi']->escapeString($cfgRelation['user'])
@@ -258,7 +258,7 @@ function PMA_userprefsRedirect($file_name,
         $hash = '#' . urlencode($hash);
     }
     Core::sendHeaderLocation('./' . $file_name
-        . URL::getCommonRaw($url_params) . $hash
+        . Url::getCommonRaw($url_params) . $hash
     );
 }
 
@@ -280,10 +280,10 @@ function PMA_userprefsAutoloadGetHeader()
     $script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
     $return_url = $script_name . '?' . http_build_query($_GET, '', '&');
 
-    return PMA\libraries\Template::get('prefs_autoload')
+    return PhpMyAdmin\Template::get('prefs_autoload')
         ->render(
             array(
-                'hidden_inputs' => URL::getHiddenInputs(),
+                'hidden_inputs' => Url::getHiddenInputs(),
                 'return_url' => $return_url,
             )
         );
diff --git a/normalization.php b/normalization.php
index 49d6257a15..14d2137120 100644
--- a/normalization.php
+++ b/normalization.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /**
@@ -31,7 +31,7 @@ if (isset($_REQUEST['getColumns'])) {
 if (isset($_REQUEST['splitColumn'])) {
     $num_fields = min(4096, intval($_REQUEST['numFields']));
     $html = PMA_getHtmlForCreateNewColumn($num_fields, $db, $table);
-    $html .= URL::getHiddenInputs($db, $table);
+    $html .= Url::getHiddenInputs($db, $table);
     echo $html;
     exit;
 }
@@ -41,7 +41,7 @@ if (isset($_REQUEST['addNewPrimary'])) {
     $html = PMA_getHtmlForCreateNewColumn(
         $num_fields, $db, $table, $columnMeta
     );
-    $html .= URL::getHiddenInputs($db, $table);
+    $html .= Url::getHiddenInputs($db, $table);
     echo $html;
     exit;
 }
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index 1ea63f2d72..a4cae4037d 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\OutputBuffering;
-use PMA\libraries\ThemeManager;
+use PhpMyAdmin\ThemeManager;
 
 /**
  *
diff --git a/prefs_forms.php b/prefs_forms.php
index e639533223..2155766d7b 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -9,7 +9,7 @@ use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -47,7 +47,7 @@ if (isset($_POST['revert'])) {
     $url_params = array('form' => $form_param);
     Core::sendHeaderLocation(
         './prefs_forms.php'
-        . URL::getCommonRaw($url_params)
+        . Url::getCommonRaw($url_params)
     );
     exit;
 }
diff --git a/prefs_manage.php b/prefs_manage.php
index cd85ef6cdd..1f5050c84a 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -11,10 +11,10 @@ use PhpMyAdmin\Core;
 use PhpMyAdmin\File;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
-use PMA\libraries\ThemeManager;
+use PhpMyAdmin\ThemeManager;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -131,7 +131,7 @@ if (isset($_POST['submit_export'])
             echo $form_display->displayErrors();
             echo '</div>';
             echo '<form action="prefs_manage.php" method="post">';
-            echo URL::getHiddenInputs() , "\n";
+            echo Url::getHiddenInputs() , "\n";
             echo '<input type="hidden" name="json" value="'
                 , htmlspecialchars($json) , '" />';
             echo '<input type="hidden" name="fix_errors" value="1" />';
@@ -183,7 +183,7 @@ if (isset($_POST['submit_export'])
         $result = PMA_saveUserprefs($cf->getConfigArray());
         if ($result === true) {
             if ($return_url) {
-                $query =  PMA\libraries\Util::splitURLQuery($return_url);
+                $query =  PhpMyAdmin\Util::splitURLQuery($return_url);
                 $return_url = parse_url($return_url, PHP_URL_PATH);
 
                 foreach ($query as $q) {
@@ -248,7 +248,7 @@ echo '<h2>' , __('Import') , '</h2>'
     , '<form class="group-cnt prefs-form disableAjax" name="prefs_import"'
     , ' action="prefs_manage.php" method="post" enctype="multipart/form-data">'
     , Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
-    , URL::getHiddenInputs()
+    , Url::getHiddenInputs()
     , '<input type="hidden" name="json" value="" />'
     , '<input type="radio" id="import_text_file" name="import_type"'
     , ' value="text_file" checked="checked" />'
@@ -300,7 +300,7 @@ if (file_exists('setup/index.php') && ! file_exists(CONFIG_FILE)) {
                         'You can set more settings by modifying config.inc.php, eg. '
                         . 'by using %sSetup script%s.'
                     ), '<a href="setup/index.php" target="_blank">', '</a>'
-                ) , PMA\libraries\Util::showDocu('setup', 'setup-script');
+                ) , PhpMyAdmin\Util::showDocu('setup', 'setup-script');
                 ?>
             </div>
             </div>
@@ -320,7 +320,7 @@ if (file_exists('setup/index.php') && ! file_exists(CONFIG_FILE)) {
             </div>
             <form class="group-cnt prefs-form disableAjax" name="prefs_export"
                   action="prefs_manage.php" method="post">
-                <?php echo URL::getHiddenInputs(); ?>
+                <?php echo Url::getHiddenInputs(); ?>
                 <div style="padding-bottom:0.5em">
                     <input type="radio" id="export_text_file" name="export_type"
                            value="text_file" checked="checked" />
@@ -377,7 +377,7 @@ if (file_exists('setup/index.php') && ! file_exists(CONFIG_FILE)) {
             <form class="group-cnt prefs-form disableAjax" name="prefs_reset"
                   action="prefs_manage.php" method="post">
                 <?php
-                echo URL::getHiddenInputs() , __(
+                echo Url::getHiddenInputs() , __(
                     'You can reset all your settings and restore them to default '
                     . 'values.'
                 );
diff --git a/schema_export.php b/schema_export.php
index 5ceff249ad..97f7791b69 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -24,7 +24,7 @@ require_once 'libraries/pmd_common.php';
 require_once 'libraries/plugin_interface.lib.php';
 
 if (! isset($_REQUEST['export_type'])) {
-    PMA\libraries\Util::checkParameters(array('export_type'));
+    PhpMyAdmin\Util::checkParameters(array('export_type'));
 }
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index 04d204eee5..49ad7ce751 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -348,14 +348,14 @@ if (isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'db') {
         $tooltip_truename,
         $tooltip_aliasname,
         $pos
-    ) = PMA\libraries\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
+    ) = PhpMyAdmin\Util::getDbInfo($db, isset($sub_part) ? $sub_part : '');
 
     $content = ob_get_contents();
     ob_end_clean();
     $response->addHTML($content . "\n");
 } else {
     if (! empty($GLOBALS['message'])) {
-        $response->addHTML(PMA\libraries\Util::getMessage($GLOBALS['message']));
+        $response->addHTML(PhpMyAdmin\Util::getMessage($GLOBALS['message']));
         unset($GLOBALS['message']);
     }
 }
diff --git a/setup/config.php b/setup/config.php
index 08eb718d83..51beb0d0bb 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -8,7 +8,7 @@
 use PMA\libraries\config\FormDisplay;
 use PMA\setup\lib\ConfigGenerator;
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /**
@@ -34,7 +34,7 @@ if (Core::ifSetOr($_POST['submit_clear'], '')) {
     //
     $GLOBALS['ConfigFile']->resetConfigData();
     // drop post data
-    $response->generateHeader303('index.php' . URL::getCommonRaw());
+    $response->generateHeader303('index.php' . Url::getCommonRaw());
     exit;
 } elseif (Core::ifSetOr($_POST['submit_download'], '')) {
     //
@@ -47,6 +47,6 @@ if (Core::ifSetOr($_POST['submit_clear'], '')) {
     //
     // Show generated config file in a <textarea>
     //
-    $response->generateHeader303('index.php' . URL::getCommonRaw(array('page' => 'config')));
+    $response->generateHeader303('index.php' . Url::getCommonRaw(array('page' => 'config')));
     exit;
 }
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index e0b3eb0964..2df38040e9 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -11,7 +11,7 @@ use PMA\libraries\config\FormDisplay;
 use PMA\libraries\config\ServerConfigChecks;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\LanguageManager;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
@@ -62,7 +62,7 @@ $text .= '</a>';
 PMA_messagesSet('notice', 'no_https', __('Insecure connection'), $text);
 
 echo '<form id="select_lang" method="post">';
-echo URL::getHiddenInputs();
+echo Url::getHiddenInputs();
 echo '<bdo lang="en" dir="ltr"><label for="lang">';
 echo __('Language') , (__('Language') != 'Language' ? ' - Language' : '');
 echo '</label></bdo><br />';
@@ -157,10 +157,10 @@ if ($cf->getServerCount() > 0) {
         echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
         echo '<td style="white-space: nowrap">';
         echo '<small>';
-        echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $id)), '">'
+        echo '<a href="' , Url::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $id)), '">'
             , __('Edit') , '</a>';
         echo ' | ';
-        echo '<a href="' , URL::getCommon(array('page' => 'servers', 'mode' => 'remove', 'id' => $id)), '">'
+        echo '<a href="' , Url::getCommon(array('page' => 'servers', 'mode' => 'remove', 'id' => $id)), '">'
             , __('Delete') , '</a>';
         echo '</small>';
         echo '</td>';
@@ -268,6 +268,6 @@ echo '<div id="footer">';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/donate/">'
     ,  __('Donate') , '</a>';
-echo '<a href="' ,  URL::getCommon(array('version_check' => '1')), '">'
+echo '<a href="' ,  Url::getCommon(array('version_check' => '1')), '">'
     , __('Check for latest version') , '</a>';
 echo '</div>';
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index fe364194b3..3f184b666e 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-Setup
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -14,7 +14,7 @@ if (!defined('PHPMYADMIN')) {
 $formset_id = isset($_GET['formset']) ? $_GET['formset'] : null;
 
 echo '<ul>';
-echo '<li><a href="index.php' , URL::getCommon() , '"'
+echo '<li><a href="index.php' , Url::getCommon() , '"'
     , ($formset_id === null ? ' class="active' : '')
     , '">' , __('Overview') , '</a></li>';
 
@@ -28,7 +28,7 @@ $formsets = array(
 );
 
 foreach ($formsets as $formset => $label) {
-    echo '<li><a href="index.php' , URL::getCommon(array('page' => 'form', 'formset' => $formset)) , '" '
+    echo '<li><a href="index.php' , Url::getCommon(array('page' => 'form', 'formset' => $formset)) , '" '
         , ($formset_id === $formset ? ' class="active' : '')
         , '">' , $label , '</a></li>';
 }
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 0a36674ea3..e4a45c535b 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -9,7 +9,7 @@
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -35,7 +35,7 @@ if ($mode == 'edit' && $server_exists) {
         . ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
 } elseif ($mode == 'remove' && $server_exists) {
     $cf->removeServer($id);
-    header('Location: index.php' . URL::getCommonRaw());
+    header('Location: index.php' . Url::getCommonRaw());
     exit;
 } elseif ($mode == 'revert' && $server_exists) {
     // handled by process_formset()
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 11fd8a63ca..e85958393a 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -7,7 +7,7 @@
  */
 use PMA\libraries\config\FormDisplay;
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /**
@@ -23,7 +23,7 @@ function PMA_Process_formset(FormDisplay $form_display)
         // revert erroneous fields to their default values
         $form_display->fixErrors();
         $response = Response::getInstance();
-        $response->generateHeader303('index.php' . URL::getCommonRaw());
+        $response->generateHeader303('index.php' . Url::getCommonRaw());
     }
 
     if (!$form_display->process(false)) {
@@ -35,7 +35,7 @@ function PMA_Process_formset(FormDisplay $form_display)
     // check for form errors
     if (!$form_display->hasErrors()) {
         $response = Response::getInstance();
-        $response->generateHeader303('index.php' . URL::getCommonRaw());
+        $response->generateHeader303('index.php' . Url::getCommonRaw());
         return;
     }
 
@@ -51,16 +51,16 @@ function PMA_Process_formset(FormDisplay $form_display)
     <div class="error">
         <h4><?php echo __('Warning') ?></h4>
         <?php echo __('Submitted form contains errors') ?><br />
-        <a href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert')) ?>">
+        <a href="<?php echo Url::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert')) ?>">
             <?php echo __('Try to revert erroneous fields to their default values') ?>
         </a>
     </div>
     <?php echo $form_display->displayErrors() ?>
-    <a class="btn" href="index.php<?php echo URL::getCommon() ?>">
+    <a class="btn" href="index.php<?php echo Url::getCommon() ?>">
         <?php echo __('Ignore errors') ?>
     </a>
     &nbsp;
-    <a class="btn" href="<?php echo URL::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit')) ?>">
+    <a class="btn" href="<?php echo Url::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit')) ?>">
         <?php echo __('Show form') ?>
     </a>
     <?php
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index f288eb7fc2..73bfe6200c 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-Setup
  */
 
-use PMA\libraries\VersionInformation;
+use PhpMyAdmin\VersionInformation;
 use PhpMyAdmin\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
diff --git a/sql.php b/sql.php
index 0cb8b8fccc..7008e5403e 100644
--- a/sql.php
+++ b/sql.php
@@ -10,8 +10,8 @@
 use PMA\libraries\config\PageSettings;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sql;
-use PMA\libraries\URL;
-use PMA\libraries\Util;
+use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
 
 /**
  * Gets some core libraries
@@ -58,7 +58,7 @@ if (empty($goto)) {
 
 if (! isset($err_url)) {
     $err_url = (! empty($back) ? $back : $goto)
-        . '?' . URL::getCommon(array('db' => $GLOBALS['db']))
+        . '?' . Url::getCommon(array('db' => $GLOBALS['db']))
         . ((mb_strpos(' ' . $goto, 'db_') != 1
             && strlen($table) > 0)
             ? '&amp;table=' . urlencode($table)
@@ -186,7 +186,7 @@ if (isset($_POST['store_bkm'])) {
  */
 if ($goto == 'sql.php') {
     $is_gotofile = false;
-    $goto = 'sql.php' . URL::getCommon(
+    $goto = 'sql.php' . Url::getCommon(
         array(
             'db' => $db,
             'table' => $table,
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 195f916ca2..7827652629 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
 
 /**
  * Get some core libraries
@@ -21,13 +21,13 @@ $scripts  = $header->getScripts();
 $scripts->addFile('tbl_structure.js');
 
 // Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table'));
+PhpMyAdmin\Util::checkParameters(array('db', 'table'));
 
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_sql.php' . URL::getCommon(
+$err_url = 'tbl_sql.php' . Url::getCommon(
     array(
         'db' => $db, 'table' => $table
     )
@@ -96,11 +96,11 @@ if (isset($_REQUEST['do_save_data'])) {
         $message->addParam($table);
         $response->addJSON(
             'message',
-            PMA\libraries\Util::getMessage($message, $sql_query, 'success')
+            PhpMyAdmin\Util::getMessage($message, $sql_query, 'success')
         );
         exit;
     } else {
-        $error_message_html = PMA\libraries\Util::mysqlDie(
+        $error_message_html = PhpMyAdmin\Util::mysqlDie(
             '',
             '',
             false,
diff --git a/tbl_change.php b/tbl_change.php
index 713b778c8b..306c07f4b7 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -7,8 +7,8 @@
  */
 use PMA\libraries\config\PageSettings;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 /**
  * Gets the variables sent or posted to this script and displays the header
@@ -62,7 +62,7 @@ if (empty($GLOBALS['goto'])) {
 
 
 $_url_params = PMA_getUrlParameters($db, $table);
-$err_url = $GLOBALS['goto'] . URL::getCommon($_url_params);
+$err_url = $GLOBALS['goto'] . Url::getCommon($_url_params);
 unset($_url_params);
 
 $comments_map = PMA_getCommentsMap($db, $table);
@@ -145,7 +145,7 @@ foreach ($table_columns as $column) {
 //If table has blob fields we have to disable ajax.
 $html_output .= PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
 
-$html_output .= URL::getHiddenInputs($_form_params);
+$html_output .= Url::getHiddenInputs($_form_params);
 
 $titles['Browse'] = Util::getIcon('b_browse.png', __('Browse foreign values'));
 
diff --git a/tbl_create.php b/tbl_create.php
index 7eb5c46f7a..1992060772 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -8,8 +8,8 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
-use PMA\libraries\Transformations;
-use PMA\libraries\URL;
+use PhpMyAdmin\Transformations;
+use PhpMyAdmin\Url;
 
 /**
  * Get some core libraries
@@ -18,11 +18,11 @@ require_once 'libraries/common.inc.php';
 require_once 'libraries/create_addfield.lib.php';
 
 // Check parameters
-PMA\libraries\Util::checkParameters(array('db'));
+PhpMyAdmin\Util::checkParameters(array('db'));
 
 /* Check if database name is empty */
 if (strlen($db) === 0) {
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         __('The database name is empty!'), '', false, 'index.php'
     );
 }
@@ -31,7 +31,7 @@ if (strlen($db) === 0) {
  * Selects the database to work with
  */
 if (!$GLOBALS['dbi']->selectDb($db)) {
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)),
         '',
         false,
@@ -41,11 +41,11 @@ if (!$GLOBALS['dbi']->selectDb($db)) {
 
 if ($GLOBALS['dbi']->getColumns($db, $table)) {
     // table exists already
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         sprintf(__('Table %s already exists!'), htmlspecialchars($table)),
         '',
         false,
-        'db_structure.php' . URL::getCommon(array('db' => $db))
+        'db_structure.php' . Url::getCommon(array('db' => $db))
     );
 }
 
diff --git a/tbl_export.php b/tbl_export.php
index 88ac7cf65a..84134b6118 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -118,7 +118,7 @@ if (! empty($sql_query)) {
         $sql_query = PhpMyAdmin\SqlParser\TokensList::build($tokens);
     }
 
-    echo PMA\libraries\Util::getMessage(PhpMyAdmin\Message::success());
+    echo PhpMyAdmin\Util::getMessage(PhpMyAdmin\Message::success());
 }
 
 require_once 'libraries/display_export.lib.php';
diff --git a/tbl_get_field.php b/tbl_get_field.php
index e9cbd40397..366dd683e5 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -18,13 +18,13 @@ require_once 'libraries/common.inc.php';
 require_once 'libraries/mime.lib.php';
 
 /* Check parameters */
-PMA\libraries\Util::checkParameters(
+PhpMyAdmin\Util::checkParameters(
     array('db', 'table')
 );
 
 /* Select database */
 if (!$GLOBALS['dbi']->selectDb($db)) {
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         sprintf(__('\'%s\' database does not exist.'), htmlspecialchars($db)),
         '', false
     );
@@ -32,18 +32,18 @@ if (!$GLOBALS['dbi']->selectDb($db)) {
 
 /* Check if table exists */
 if (!$GLOBALS['dbi']->getColumns($db, $table)) {
-    PMA\libraries\Util::mysqlDie(__('Invalid table name'));
+    PhpMyAdmin\Util::mysqlDie(__('Invalid table name'));
 }
 
 /* Grab data */
-$sql = 'SELECT ' . PMA\libraries\Util::backquote($_GET['transform_key'])
-    . ' FROM ' . PMA\libraries\Util::backquote($table)
+$sql = 'SELECT ' . PhpMyAdmin\Util::backquote($_GET['transform_key'])
+    . ' FROM ' . PhpMyAdmin\Util::backquote($table)
     . ' WHERE ' . $_GET['where_clause'] . ';';
 $result = $GLOBALS['dbi']->fetchValue($sql);
 
 /* Check return code */
 if ($result === false) {
-    PMA\libraries\Util::mysqlDie(
+    PhpMyAdmin\Util::mysqlDie(
         __('MySQL returned an empty result set (i.e. zero rows).'), $sql
     );
 }
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 81d586d475..8b89fd38c2 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -10,7 +10,7 @@ namespace PMA;
 
 use PMA\libraries\controllers\table\TableGisVisualizationController;
 use PhpMyAdmin\Response;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
diff --git a/tbl_operations.php b/tbl_operations.php
index fa00b55353..3208a20e54 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin
  */
 use PhpMyAdmin\Partition;
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 use PhpMyAdmin\Response;
 
 /**
@@ -174,7 +174,7 @@ if (isset($_REQUEST['submitoptions'])) {
 
     if (count($table_alters) > 0) {
         $sql_query      = 'ALTER TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
+            . PhpMyAdmin\Util::backquote($GLOBALS['table']);
         $sql_query     .= "\r\n" . implode("\r\n", $table_alters);
         $sql_query     .= ';';
         $result        .= $GLOBALS['dbi']->query($sql_query) ? true : false;
@@ -247,7 +247,7 @@ if (isset($result) && empty($message_to_show)) {
             $response->addJSON('message', $_message);
             if (!empty($sql_query)) {
                 $response->addJSON(
-                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
+                    'sql_query', PhpMyAdmin\Util::getMessage(null, $sql_query)
                 );
             }
             exit;
@@ -267,7 +267,7 @@ if (isset($result) && empty($message_to_show)) {
             $response->addJSON('message', $_message);
             if (!empty($sql_query)) {
                 $response->addJSON(
-                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
+                    'sql_query', PhpMyAdmin\Util::getMessage(null, $sql_query)
                 );
             }
             exit;
@@ -281,7 +281,7 @@ if (isset($result) && empty($message_to_show)) {
         );
     } else {
         $response->addHTML(
-            PMA\libraries\Util::getMessage($_message, $sql_query)
+            PhpMyAdmin\Util::getMessage($_message, $sql_query)
         );
     }
     unset($_message);
@@ -390,7 +390,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
         && ! (isset($db_is_system_schema) && $db_is_system_schema)
     ) {
         $this_sql_query = 'TRUNCATE TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
+            . PhpMyAdmin\Util::backquote($GLOBALS['table']);
         $truncate_table_url_params = array_merge(
             $url_params,
             array(
@@ -406,7 +406,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
     }
     if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
         $this_sql_query = 'DROP TABLE '
-            . PMA\libraries\Util::backquote($GLOBALS['table']);
+            . PhpMyAdmin\Util::backquote($GLOBALS['table']);
         $drop_table_url_params = array_merge(
             $url_params,
             array(
diff --git a/tbl_relation.php b/tbl_relation.php
index 30af137bbb..24bbbf0038 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -21,8 +21,8 @@ namespace PMA;
 
 use PMA\libraries\controllers\table\TableRelationController;
 use PhpMyAdmin\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
diff --git a/tbl_replace.php b/tbl_replace.php
index 705b4ccf90..ae70b799ef 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -15,8 +15,8 @@
 use PhpMyAdmin\Core;
 use PMA\libraries\plugins\IOTransformationsPlugin;
 use PhpMyAdmin\Response;
-use PMA\libraries\Table;
-use PMA\libraries\Transformations;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Transformations;
 
 /**
  * Gets some core libraries
@@ -29,7 +29,7 @@ require_once 'libraries/common.inc.php';
 require_once 'libraries/insert_edit.lib.php';
 
 // Check parameters
-PMA\libraries\Util::checkParameters(array('db', 'table', 'goto'));
+PhpMyAdmin\Util::checkParameters(array('db', 'table', 'goto'));
 
 $GLOBALS['dbi']->selectDb($GLOBALS['db']);
 
@@ -291,7 +291,7 @@ foreach ($loop_array as $rownumber => $where_clause) {
             $value_sets[] = implode(', ', $query_values);
         } else {
             // build update query
-            $query[] = 'UPDATE ' . PMA\libraries\Util::backquote($GLOBALS['table'])
+            $query[] = 'UPDATE ' . PhpMyAdmin\Util::backquote($GLOBALS['table'])
                 . ' SET ' . implode(', ', $query_values)
                 . ' WHERE ' . $where_clause
                 . ($_REQUEST['clause_is_unique'] ? '' : ' LIMIT 1');
@@ -445,7 +445,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
     $extra_data['row_count'] = $_table->countRecords();
 
     $extra_data['sql_query']
-        = PMA\libraries\Util::getMessage($message, $GLOBALS['display_query']);
+        = PhpMyAdmin\Util::getMessage($message, $GLOBALS['display_query']);
 
     $response->setRequestStatus($message->isSuccess());
     $response->addJSON('message', $message);
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 873bb25091..9d3c7fc61c 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sql;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  *
@@ -119,7 +119,7 @@ if (!empty($submit_mult)) {
     default:
         $action = 'tbl_row_action.php';
         $err_url = 'tbl_row_action.php'
-            . URL::getCommon($GLOBALS['url_params']);
+            . Url::getCommon($GLOBALS['url_params']);
         if (! isset($_REQUEST['mult_btn'])) {
             $original_sql_query = $sql_query;
             if (! empty($url_query)) {
@@ -129,7 +129,7 @@ if (!empty($submit_mult)) {
         include 'libraries/mult_submits.inc.php';
         $_url_params = $GLOBALS['url_params'];
         $_url_params['goto'] = 'tbl_sql.php';
-        $url_query = URL::getCommon($_url_params);
+        $url_query = Url::getCommon($_url_params);
 
 
         /**
diff --git a/tbl_tracking.php b/tbl_tracking.php
index df4f551c44..aa3923605c 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -7,7 +7,7 @@
  */
 
 // Run common work
-use PMA\libraries\Tracker;
+use PhpMyAdmin\Tracker;
 use PhpMyAdmin\Response;
 
 require_once './libraries/common.inc.php';
diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml
index dd3084c1f9..a7e15268f4 100644
--- a/templates/columns_definitions/column_attributes.phtml
+++ b/templates/columns_definitions/column_attributes.phtml
@@ -9,7 +9,7 @@ $ci_offset = -1;
 
 <td class="center">
     <!-- column name -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_name')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_name')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -20,7 +20,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column type -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_type')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_type')
         ->render(array(
             'column_number' => $columnNumber,
             'ci' => $ci++,
@@ -31,7 +31,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column length -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_length')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_length')
         ->render(array(
             'column_number' => $columnNumber,
             'ci' => $ci++,
@@ -42,7 +42,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column default -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_default')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_default')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -63,7 +63,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column attribute -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_attribute')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_attribute')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -75,7 +75,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column NULL -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_null')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_null')
         ->render(array(
             'column_number' => $columnNumber,
             'ci' => $ci++,
@@ -87,7 +87,7 @@ $ci_offset = -1;
     <!-- column Adjust privileges, Only for 'Edit' Column(s) -->
     <td class="center">
         <?php $privs_available = $GLOBALS['col_priv'] && $GLOBALS['is_reload_priv']; ?>
-        <?= PMA\libraries\Template::get('columns_definitions/column_adjust_privileges')
+        <?= PhpMyAdmin\Template::get('columns_definitions/column_adjust_privileges')
             ->render(array(
                 'column_number' => $columnNumber,
                 'ci' => $ci++,
@@ -99,7 +99,7 @@ $ci_offset = -1;
 <?php if (!$is_backup): ?>
     <!-- column indexes, See my other comment about  this 'if'. -->
     <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/column_indexes')
+        <?= PhpMyAdmin\Template::get('columns_definitions/column_indexes')
             ->render(array(
                 'column_number' => $columnNumber,
                 'ci' => $ci++,
@@ -110,7 +110,7 @@ $ci_offset = -1;
 <?php endif; ?>
 <td class="center">
     <!-- column auto_increment -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_auto_increment')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_auto_increment')
         ->render(array(
             'column_number' => $columnNumber,
             'ci' => $ci++,
@@ -120,7 +120,7 @@ $ci_offset = -1;
 </td>
 <td class="center">
     <!-- column comments -->
-    <?= PMA\libraries\Template::get('columns_definitions/column_comment')
+    <?= PhpMyAdmin\Template::get('columns_definitions/column_comment')
         ->render(array(
             'columnNumber' => $columnNumber,
             'ci' => $ci++,
@@ -130,9 +130,9 @@ $ci_offset = -1;
         )); ?>
 </td>
  <!-- column virtuality -->
-<?php if (PMA\libraries\Util::isVirtualColumnsSupported()): ?>
+<?php if (PhpMyAdmin\Util::isVirtualColumnsSupported()): ?>
     <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/column_virtuality')
+        <?= PhpMyAdmin\Template::get('columns_definitions/column_virtuality')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -152,7 +152,7 @@ $ci_offset = -1;
     } ?>
 
     <td class="center">
-        <?= PMA\libraries\Template::get('columns_definitions/move_column')
+        <?= PhpMyAdmin\Template::get('columns_definitions/move_column')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -167,7 +167,7 @@ $ci_offset = -1;
 <?php if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME'] && $cfgRelation['commwork']): ?>
     <td class="center">
         <!-- Column Mime-type -->
-        <?= PMA\libraries\Template::get('columns_definitions/mime_type')
+        <?= PhpMyAdmin\Template::get('columns_definitions/mime_type')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -179,7 +179,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- Column Browser transformation -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation')
+        <?= PhpMyAdmin\Template::get('columns_definitions/transformation')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -192,7 +192,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- column Transformation options -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
+        <?= PhpMyAdmin\Template::get('columns_definitions/transformation_option')
             ->render(array(
                 'column_number' => $columnNumber,
                 'ci' => $ci++,
@@ -204,7 +204,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- Column Input transformation -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation')
+        <?= PhpMyAdmin\Template::get('columns_definitions/transformation')
             ->render(array(
                 'columnNumber' => $columnNumber,
                 'ci' => $ci++,
@@ -217,7 +217,7 @@ $ci_offset = -1;
     </td>
     <td class="center">
         <!-- column Input transformation options -->
-        <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
+        <?= PhpMyAdmin\Template::get('columns_definitions/transformation_option')
             ->render(array(
                 'column_number' => $columnNumber,
                 'ci' => $ci++,
diff --git a/templates/columns_definitions/column_default.phtml b/templates/columns_definitions/column_default.phtml
index 2ef2fd9a37..34216148a2 100644
--- a/templates/columns_definitions/column_default.phtml
+++ b/templates/columns_definitions/column_default.phtml
@@ -16,7 +16,7 @@ if (isset($columnMeta['DefaultValue'])) {
     $defaultValue = $columnMeta['DefaultValue'];
 }
 if ($type_upper == 'BIT') {
-    $defaultValue = PMA\libraries\Util::convertBitDefaultValue($columnMeta['DefaultValue']);
+    $defaultValue = PhpMyAdmin\Util::convertBitDefaultValue($columnMeta['DefaultValue']);
 } elseif ($type_upper == 'BINARY' || $type_upper == 'VARBINARY') {
     $defaultValue = bin2hex($columnMeta['DefaultValue']);
 }
diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml
index 3196dd56b2..24493d46b2 100644
--- a/templates/columns_definitions/column_definitions_form.phtml
+++ b/templates/columns_definitions/column_definitions_form.phtml
@@ -1,13 +1,13 @@
 <?php
 use PhpMyAdmin\Partition;
 use PhpMyAdmin\StorageEngine;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 ?>
 <form method="post"
       action="<?= $action; ?>"
       class="<?= ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form ajax lock-page">
-    <?= URL::getHiddenInputs($form_params); ?>
+    <?= Url::getHiddenInputs($form_params); ?>
    <!-- happens when an index has been set on a column -->
    <!-- and a column is added to the table creation dialog -->
    <!-- This contains a JSON-encoded string -->
@@ -73,7 +73,7 @@ use PMA\libraries\URL;
         </div>
     <?php endif; ?>
     <?php if (is_array($content_cells)): ?>
-        <?= PMA\libraries\Template::get(
+        <?= PhpMyAdmin\Template::get(
             'columns_definitions/table_fields_definitions'
         )->render(array(
             'is_backup' => $is_backup,
@@ -95,12 +95,12 @@ use PMA\libraries\URL;
                 <td width="25">&nbsp;</td>
                 <th>
                     <?= __('Storage Engine:'); ?>
-                    <?= PMA\libraries\Util::showMySQLDocu('Storage_engines'); ?>
+                    <?= PhpMyAdmin\Util::showMySQLDocu('Storage_engines'); ?>
                 </th>
                 <td width="25">&nbsp;</td>
                 <th>
                     <?= __('Connection:'); ?>
-                    <?= PMA\libraries\Util::showMySQLDocu('federated-create-connection'); ?>
+                    <?= PhpMyAdmin\Util::showMySQLDocu('federated-create-connection'); ?>
                 </th>
             </tr>
             <tr>
@@ -145,12 +145,12 @@ use PMA\libraries\URL;
                     <th colspan="5">
                         <?= __('PARTITION definition:'); ?>
                         &nbsp;
-                        <?= PMA\libraries\Util::showMySQLDocu('Partitioning'); ?>
+                        <?= PhpMyAdmin\Util::showMySQLDocu('Partitioning'); ?>
                     </th>
                 </tr>
                 <tr>
                     <td colspan="5">
-                        <?= PMA\libraries\Template::get('columns_definitions/partitions')
+                        <?= PhpMyAdmin\Template::get('columns_definitions/partitions')
                             ->render(array('partitionDetails' => $partitionDetails)); ?>
                     </td>
                 </tr>
diff --git a/templates/columns_definitions/column_virtuality.phtml b/templates/columns_definitions/column_virtuality.phtml
index 2255257a6f..f22e35cd63 100644
--- a/templates/columns_definitions/column_virtuality.phtml
+++ b/templates/columns_definitions/column_virtuality.phtml
@@ -3,7 +3,7 @@ $options = array(
     ''           =>  '',
     'VIRTUAL'    => 'VIRTUAL',
 );
-$serverType = PMA\libraries\Util::getServerType();
+$serverType = PhpMyAdmin\Util::getServerType();
 if ($serverType == 'MariaDB') {
     $options['PERSISTENT'] = 'PERSISTENT';
 } else {
diff --git a/templates/columns_definitions/move_column.phtml b/templates/columns_definitions/move_column.phtml
index a4e07676e9..3b3d54e170 100644
--- a/templates/columns_definitions/move_column.phtml
+++ b/templates/columns_definitions/move_column.phtml
@@ -9,7 +9,7 @@
     <?php for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++): ?>
         <option value="<?= htmlspecialchars($move_columns[$mi]->name); ?>"
                 <?= (($current_index == $mi || $current_index == $mi + 1) ? ' disabled="disabled"' : '');?>>
-            <?= sprintf(__('after %s'), PMA\libraries\Util::backquote(htmlspecialchars($move_columns[$mi]->name))); ?>
+            <?= sprintf(__('after %s'), PhpMyAdmin\Util::backquote(htmlspecialchars($move_columns[$mi]->name))); ?>
         </option>
     <?php endfor; ?>
 </select>
\ No newline at end of file
diff --git a/templates/columns_definitions/table_fields_definitions.phtml b/templates/columns_definitions/table_fields_definitions.phtml
index a300040f52..c43c811af0 100644
--- a/templates/columns_definitions/table_fields_definitions.phtml
+++ b/templates/columns_definitions/table_fields_definitions.phtml
@@ -1,17 +1,17 @@
 <table id="table_columns" class="noclick">
     <caption class="tblHeaders">
         <?= __('Structure'); ?>
-        <?= PMA\libraries\Util::showMySQLDocu('CREATE_TABLE'); ?>
+        <?= PhpMyAdmin\Util::showMySQLDocu('CREATE_TABLE'); ?>
     </caption>
     <tr>
         <th>
             <?= __('Name'); ?>
         </th>
         <th>
-            <?= __('Type') , PMA\libraries\Util::showMySQLDocu('data-types'); ?>
+            <?= __('Type') , PhpMyAdmin\Util::showMySQLDocu('data-types'); ?>
         </th>
         <th>
-            <?= __('Length/Values') , PMA\libraries\Util::showHint(
+            <?= __('Length/Values') , PhpMyAdmin\Util::showHint(
                     __(
                         'If column type is "enum" or "set", please enter the values using'
                         . ' this format: \'a\',\'b\',\'c\'…<br />If you ever need to put'
@@ -22,7 +22,7 @@
                 ); ?>
         </th>
         <th>
-            <?= __('Default') , PMA\libraries\Util::showHint(
+            <?= __('Default') , PhpMyAdmin\Util::showHint(
                     __(
                         'For default values, please enter just a single value,'
                         . ' without backslash escaping or quotes, using this format: a'
@@ -44,7 +44,7 @@
             && ! empty($_REQUEST['change_column'])
         ): ?>
             <th>
-                <?= __('Adjust privileges') , PMA\libraries\Util::showDocu('faq', 'faq6-39'); ?>
+                <?= __('Adjust privileges') , PhpMyAdmin\Util::showDocu('faq', 'faq6-39'); ?>
             </th>
         <?php endif; ?>
 
@@ -65,7 +65,7 @@
             <?= __('Comments'); ?>
         </th>
 
-        <?php if (PMA\libraries\Util::isVirtualColumnsSupported()): ?>
+        <?php if (PhpMyAdmin\Util::isVirtualColumnsSupported()): ?>
             <th>
                 <?= __('Virtuality'); ?>
             </th>
@@ -82,7 +82,7 @@
                 <?= __('MIME type'); ?>
             </th>
             <th>
-                <a href="transformation_overview.php<?= PMA\libraries\URL::getCommon(); ?>#transformation"
+                <a href="transformation_overview.php<?= PhpMyAdmin\Url::getCommon(); ?>#transformation"
                    title="<?= __('List of available transformations and their options'); ?>"
                    target="_blank">
                     <?= __('Browser display transformation'); ?>
@@ -90,7 +90,7 @@
             </th>
             <th>
                 <?= __('Browser display transformation options'); ?>
-                <?= PMA\libraries\Util::showHint(
+                <?= PhpMyAdmin\Util::showHint(
                     __(
                         'Please enter the values for transformation options using this'
                         . ' format: \'a\', 100, b,\'c\'…<br />If you ever need to put'
@@ -101,7 +101,7 @@
                 ); ?>
             </th>
             <th>
-                <a href="transformation_overview.php<?= PMA\libraries\URL::getCommon(); ?>#input_transformation"
+                <a href="transformation_overview.php<?= PhpMyAdmin\Url::getCommon(); ?>#input_transformation"
                    title="<?= __('List of available transformations and their options'); ?>"
                    target="_blank">
                     <?= __('Input transformation'); ?>
@@ -109,7 +109,7 @@
             </th>
             <th>
                 <?= __('Input transformation options'); ?>
-                <?= PMA\libraries\Util::showHint(
+                <?= PhpMyAdmin\Util::showHint(
                     __(
                         'Please enter the values for transformation options using this'
                         . ' format: \'a\', 100, b,\'c\'…<br />If you ever need to put'
@@ -123,7 +123,7 @@
     </tr>
     <?php foreach($content_cells as $content_row): ?>
         <tr>
-            <?= PMA\libraries\Template::get('columns_definitions/column_attributes')
+            <?= PhpMyAdmin\Template::get('columns_definitions/column_attributes')
                 ->render($content_row); ?>
         </tr>
     <?php endforeach; ?>
diff --git a/templates/columns_definitions/transformation.phtml b/templates/columns_definitions/transformation.phtml
index 4750a8d35d..124506fbc4 100644
--- a/templates/columns_definitions/transformation.phtml
+++ b/templates/columns_definitions/transformation.phtml
@@ -1,4 +1,4 @@
-<?php use PMA\libraries\Transformations; ?>
+<?php use PhpMyAdmin\Transformations; ?>
 <select id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
         size="1"
         name="field_<?= $type;?>[<?= $columnNumber;?>]">
diff --git a/templates/database/designer/database_tables.phtml b/templates/database/designer/database_tables.phtml
index e886304ef7..881a48fe75 100644
--- a/templates/database/designer/database_tables.phtml
+++ b/templates/database/designer/database_tables.phtml
@@ -64,7 +64,7 @@
                     $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i],
                     urlencode($tab_column[$t_n]["COLUMN_NAME"][$j])
                 );
-                if (!PMA\libraries\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
+                if (!PhpMyAdmin\Util::isForeignKeySupported($GLOBALS['PMD']['TABLE_TYPE'][$i])) {
                     $click_field_param[] = isset($tables_pk_or_unique_keys[$tmpColumn]) ? 1 : 0;
                 } else {
                     // if foreign keys are supported, it's not necessary that the
diff --git a/templates/database/designer/edit_delete_pages.phtml b/templates/database/designer/edit_delete_pages.phtml
index 25b5502aa0..356bf7b839 100644
--- a/templates/database/designer/edit_delete_pages.phtml
+++ b/templates/database/designer/edit_delete_pages.phtml
@@ -1,6 +1,6 @@
 <?php $cfgRelation = PMA_getRelationsParam(); ?>
 <form action="db_designer.php" method="post" name="edit_delete_pages" id="edit_delete_pages" class="ajax">
-    <?= PMA\libraries\URL::getHiddenInputs($db); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs($db); ?>
     <fieldset id="page_edit_delete_options">
         <input type="hidden" name="operation" value="<?= $operation; ?>" />
         <label for="selected_page">
diff --git a/templates/database/designer/page_save_as.phtml b/templates/database/designer/page_save_as.phtml
index fe1605ef34..4bd1473100 100644
--- a/templates/database/designer/page_save_as.phtml
+++ b/templates/database/designer/page_save_as.phtml
@@ -6,7 +6,7 @@ $choices = array(
 );
 ?>
 <form action="db_designer.php" method="post" name="save_as_pages" id="save_as_pages" class="ajax">
-    <?= PMA\libraries\URL::getHiddenInputs($db); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs($db); ?>
     <fieldset id="page_save_as_options">
         <table>
             <tbody>
@@ -18,7 +18,7 @@ $choices = array(
                 </tr>
                 <tr>
                     <td>
-                        <?= PMA\libraries\Util::getRadioFields('save_page', $choices, 'same', true); ?>
+                        <?= PhpMyAdmin\Util::getRadioFields('save_page', $choices, 'same', true); ?>
                     </td>
                 </tr>
                 <tr>
diff --git a/templates/database/designer/query_details.phtml b/templates/database/designer/query_details.phtml
index c954805481..c1ed3f110b 100644
--- a/templates/database/designer/query_details.phtml
+++ b/templates/database/designer/query_details.phtml
@@ -14,6 +14,6 @@
         <textarea cols="80" name="sql_query" id="textSqlquery" rows="15">
         </textarea>
         <input type="hidden" name="submit_sql" value="true">
-        <?= PMA\libraries\URL::getHiddenInputs($_GET['db']); ?>
+        <?= PhpMyAdmin\Url::getHiddenInputs($_GET['db']); ?>
     </form>
 </div>
diff --git a/templates/database/designer/schema_export.phtml b/templates/database/designer/schema_export.phtml
index 4aea33bed2..6364edc452 100644
--- a/templates/database/designer/schema_export.phtml
+++ b/templates/database/designer/schema_export.phtml
@@ -1,6 +1,6 @@
 <form method="post" action="schema_export.php" class="disableAjax" id="id_export_pages">
     <fieldset>
-        <?= PMA\libraries\URL::getHiddenInputs($db); ?>
+        <?= PhpMyAdmin\Url::getHiddenInputs($db); ?>
         <label><?= __('Select Export Relational Type'); ?></label><br/>
         <?= PMA_pluginGetChoice(
             'Schema', 'export_type', $export_list, 'format'
diff --git a/templates/database/designer/side_menu.phtml b/templates/database/designer/side_menu.phtml
index 4a1db6be0d..b573fe26c2 100644
--- a/templates/database/designer/side_menu.phtml
+++ b/templates/database/designer/side_menu.phtml
@@ -101,7 +101,7 @@ function getImg($path)
                 <?= __('Reload'); ?>
             </span>
         </a>
-        <a href="<?= PMA\libraries\Util::getDocuLink('faq', 'faq6-31'); ?>"
+        <a href="<?= PhpMyAdmin\Util::getDocuLink('faq', 'faq6-31'); ?>"
            target="documentation"
            class="M_butt">
             <img title="<?= __('Help'); ?>"
diff --git a/templates/database/structure/body_for_table_summary.phtml b/templates/database/structure/body_for_table_summary.phtml
index 68cc079f96..56778860b0 100644
--- a/templates/database/structure/body_for_table_summary.phtml
+++ b/templates/database/structure/body_for_table_summary.phtml
@@ -4,7 +4,7 @@
 <th class="tbl_num nowrap">
     <?php
     printf(_ngettext('%s table', '%s tables', $num_tables),
-        PMA\libraries\Util::formatNumber($num_tables, 0)); ?>
+        PhpMyAdmin\Util::formatNumber($num_tables, 0)); ?>
 </th>
 <?php if ($server_slave_status): ?>
     <th> <?= __('Replication'); ?> </th>
@@ -16,7 +16,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] == 0) {
 } ?>
 <th colspan="<?= $sum_colspan; ?>" class="print_ignore" ><?= __('Sum'); ?></th>
 <?php
-$row_count_sum = PMA\libraries\Util::formatNumber($sum_entries, 0);
+$row_count_sum = PhpMyAdmin\Util::formatNumber($sum_entries, 0);
 // If a table shows approximate rows count, display update-all-real-count anchor.
 $row_sum_url = array();
 if (isset($approx_rows)) {
@@ -28,7 +28,7 @@ if (isset($approx_rows)) {
     );
 }
 $cell_text = ($approx_rows)
-        ? '<a href="db_structure.php' . PMA\libraries\URL::getCommon($row_sum_url)
+        ? '<a href="db_structure.php' . PhpMyAdmin\Url::getCommon($row_sum_url)
         . '" class="ajax row_count_sum">' . '~' . $row_count_sum . '</a>'
         : $row_count_sum;
 ?>
@@ -61,11 +61,11 @@ $cell_text = ($approx_rows)
 
 <?php if ($is_show_stats): ?>
     <?php
-        list($sum_formatted, $unit) = PMA\libraries\Util::formatByteDown(
+        list($sum_formatted, $unit) = PhpMyAdmin\Util::formatByteDown(
             $sum_size, 3, 1
         );
         list($overhead_formatted, $overhead_unit)
-            = PMA\libraries\Util::formatByteDown($overhead_size, 3, 1);
+            = PhpMyAdmin\Util::formatByteDown($overhead_size, 3, 1);
     ?>
     <th class="value tbl_size"><?= $sum_formatted , ' ' , $unit; ?></th>
     <th class="value tbl_overhead"><?= $overhead_formatted , ' ' , $overhead_unit; ?></th>
@@ -82,18 +82,18 @@ $cell_text = ($approx_rows)
 <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
     <th class="value tbl_creation">
         <?= ($create_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($create_time_all))
+                ? PhpMyAdmin\Util::localisedDate(strtotime($create_time_all))
                 : '-'); ?>
     </th>
 <?php endif; ?>
 <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
     <th class="value tbl_last_update"><?= ($update_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($update_time_all))
+                ? PhpMyAdmin\Util::localisedDate(strtotime($update_time_all))
                 : '-'); ?></th>
 <?php endif; ?>
 <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
     <th class="value tbl_last_check"><?= ($check_time_all
-                ? PMA\libraries\Util::localisedDate(strtotime($check_time_all))
+                ? PhpMyAdmin\Util::localisedDate(strtotime($check_time_all))
                 : '-');?></th>
 <?php endif; ?>
 </tr>
diff --git a/templates/database/structure/favorite_anchor.phtml b/templates/database/structure/favorite_anchor.phtml
index 36ed935c59..49d607e208 100644
--- a/templates/database/structure/favorite_anchor.phtml
+++ b/templates/database/structure/favorite_anchor.phtml
@@ -8,7 +8,7 @@ $fav_params = array('db' => $db,
 ?>
 <a id="<?= md5($current_table['TABLE_NAME']); ?>_favorite_anchor"
    class="ajax favorite_table_anchor"
-   href="<?= 'db_structure.php' , PMA\libraries\URL::getCommon($fav_params); ?>"
+   href="<?= 'db_structure.php' , PhpMyAdmin\Url::getCommon($fav_params); ?>"
    title="<?= $already_favorite ? __("Remove from Favorites") : __("Add to Favorites"); ?>"
    data-favtargets="<?= md5($db . "." . $current_table['TABLE_NAME']); ?>" >
     <?= !$already_favorite ? $titles['NoFavorite'] : $titles['Favorite']; ?>
diff --git a/templates/database/structure/show_create.phtml b/templates/database/structure/show_create.phtml
index 670220d38b..ce31492a37 100644
--- a/templates/database/structure/show_create.phtml
+++ b/templates/database/structure/show_create.phtml
@@ -12,7 +12,7 @@
         }
     ?>
     <?php if (! empty($tables)): ?>
-        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
+        <?= PhpMyAdmin\Template::get('database/structure/show_create_row')->render(
             array(
               'db' => $db,
               'title' => __('Tables'),
@@ -23,7 +23,7 @@
     <?php endif; ?>
 
     <?php if (! empty($views)): ?>
-        <?= PMA\libraries\Template::get('database/structure/show_create_row')->render(
+        <?= PhpMyAdmin\Template::get('database/structure/show_create_row')->render(
             array(
                 'db' => $db,
                 'title' => __('Views'),
diff --git a/templates/database/structure/sortable_header.phtml b/templates/database/structure/sortable_header.phtml
index 48a5357abc..d5de8c36a8 100644
--- a/templates/database/structure/sortable_header.phtml
+++ b/templates/database/structure/sortable_header.phtml
@@ -18,12 +18,12 @@ if ($requested_sort == $sort) {
     if ($requested_sort_order == 'ASC') {
         $future_sort_order = 'DESC';
         // current sort order is ASC
-        $order_img  = ' ' . PMA\libraries\Util::getImage(
+        $order_img  = ' ' . PhpMyAdmin\Util::getImage(
             's_asc.png',
             __('Ascending'),
             array('class' => 'sort_arrow', 'title' => '')
         );
-        $order_img .= ' ' . PMA\libraries\Util::getImage(
+        $order_img .= ' ' . PhpMyAdmin\Util::getImage(
             's_desc.png',
              __('Descending'),
             array('class' => 'sort_arrow hide', 'title' => '')
@@ -35,12 +35,12 @@ if ($requested_sort == $sort) {
     } else {
         $future_sort_order = 'ASC';
         // current sort order is DESC
-        $order_img  = ' ' . PMA\libraries\Util::getImage(
+        $order_img  = ' ' . PhpMyAdmin\Util::getImage(
             's_asc.png',
             __('Ascending'),
             array('class' => 'sort_arrow hide', 'title' => '')
         );
-        $order_img .= ' ' . PMA\libraries\Util::getImage(
+        $order_img .= ' ' . PhpMyAdmin\Util::getImage(
             's_desc.png',
             __('Descending'),
             array('class' => 'sort_arrow', 'title' => '')
@@ -65,8 +65,8 @@ if (! empty($_REQUEST['tbl_group'])) {
     $_url_params['tbl_group'] = $_REQUEST['tbl_group'];
 }
 
-$url = 'db_structure.php' . PMA\libraries\URL::getCommon($_url_params);
+$url = 'db_structure.php' . PhpMyAdmin\Url::getCommon($_url_params);
 
-echo PMA\libraries\Util::linkOrButton(
+echo PhpMyAdmin\Util::linkOrButton(
     $url, $title . $order_img, $order_link_params
 );
diff --git a/templates/database/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml
index d8af414b84..7335eb2416 100644
--- a/templates/database/structure/structure_table_row.phtml
+++ b/templates/database/structure/structure_table_row.phtml
@@ -12,8 +12,8 @@
     </th>
     <?php if ($server_slave_status): ?>
         <td class="center">
-            <?= ($ignored ? PMA\libraries\Util::getImage('s_cancel.png', __('Not replicated')) : ''); ?>
-            <?= ($do ? PMA\libraries\Util::getImage('s_success.png', __('Replicated')) : ''); ?>
+            <?= ($ignored ? PhpMyAdmin\Util::getImage('s_cancel.png', __('Not replicated')) : ''); ?>
+            <?= ($do ? PhpMyAdmin\Util::getImage('s_success.png', __('Replicated')) : ''); ?>
         </td>
     <?php endif; ?>
 
@@ -22,7 +22,7 @@
     ?>
     <?php if ($GLOBALS['cfg']['NumFavoriteTables'] > 0): ?>
         <td class="center print_ignore">
-            <?= PMA\libraries\Template::get('database/structure/favorite_anchor')->render(
+            <?= PhpMyAdmin\Template::get('database/structure/favorite_anchor')->render(
                 array(
                     'db' => $db,
                     'current_table' => $current_table,
@@ -63,7 +63,7 @@
 
         <?php
         // Get the row count.
-        $row_count = PMA\libraries\Util::formatNumber($current_table['TABLE_ROWS'], 0);
+        $row_count = PhpMyAdmin\Util::formatNumber($current_table['TABLE_ROWS'], 0);
 
         // Content to be appended into 'tbl_rows' cell.
         // If row count is approximate, display it as an anchor to get real count.
@@ -71,7 +71,7 @@
         <td class="value tbl_rows"
             data-table="<?= htmlspecialchars($current_table['TABLE_NAME']); ?>">
             <?php if ($approx_rows): ?>
-                <a href="db_structure.php<?= PMA\libraries\URL::getCommon(
+                <a href="db_structure.php<?= PhpMyAdmin\Url::getCommon(
                     array(
                         'ajax_request'   => true,
                         'db'             => $GLOBALS['db'],
@@ -144,19 +144,19 @@
 
         <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
             <td class="value tbl_creation">
-                <?= $create_time ? PMA\libraries\Util::localisedDate(strtotime($create_time)) : '-'; ?>
+                <?= $create_time ? PhpMyAdmin\Util::localisedDate(strtotime($create_time)) : '-'; ?>
             </td>
         <?php endif; ?>
 
         <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
             <td class="value tbl_last_update">
-                <?= $update_time ? PMA\libraries\Util::localisedDate(strtotime($update_time)) : '-'; ?>
+                <?= $update_time ? PhpMyAdmin\Util::localisedDate(strtotime($update_time)) : '-'; ?>
             </td>
         <?php endif; ?>
 
         <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
             <td class="value tbl_last_check">
-                <?= $check_time ? PMA\libraries\Util::localisedDate(strtotime($check_time)) : '-'; ?>
+                <?= $check_time ? PhpMyAdmin\Util::localisedDate(strtotime($check_time)) : '-'; ?>
             </td>
         <?php endif; ?>
 
diff --git a/templates/database/structure/table_header.phtml b/templates/database/structure/table_header.phtml
index e9067d6089..e1b0ba7277 100644
--- a/templates/database/structure/table_header.phtml
+++ b/templates/database/structure/table_header.phtml
@@ -11,12 +11,12 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 }
 ?>
 <form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
-<?= PMA\libraries\URL::getHiddenInputs($db); ?>
+<?= PhpMyAdmin\Url::getHiddenInputs($db); ?>
 <table id="structureTable" class="data">
     <thead>
         <tr>
             <th class="print_ignore"></th>
-            <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+            <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                    array(
                        'title' => __('Table'),
                        'sort' => 'table',
@@ -31,26 +31,26 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
             </th>
             <!-- larger values are more interesting so default sort order is DESC-->
             <th>
-                <?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                     array(
                         'title' => __('Rows'),
                         'sort' => 'records',
                         'initial_sort_order' => 'DESC'
                     )
                 ); ?>
-                <?= PMA\libraries\Util::showHint(PhpMyAdmin\Sanitize::sanitize(
+                <?= PhpMyAdmin\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>
             <?php if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)): ?>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Type'),
                             'sort' => 'type',
                             'initial_sort_order' => 'ASC'
                         )
                     ); $cnt++; ?></th>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Collation'),
                             'sort' => 'collation',
@@ -61,7 +61,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['is_show_stats']): ?>
                 <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Size'),
                             'sort' => 'size',
@@ -69,7 +69,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
                         )
                     ); $cnt++; ?></th>
                 <!-- larger values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Overhead'),
                             'sort' => 'overhead',
@@ -79,7 +79,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
             <?php endif; ?>
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureCharset']): ?>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Charset'),
                             'sort' => 'charset',
@@ -89,7 +89,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
             <?php endif; ?>
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureComment']): ?>
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Comment'),
                             'sort' => 'comment',
@@ -100,7 +100,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureCreation']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Creation'),
                             'sort' => 'creation',
@@ -111,7 +111,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Last update'),
                             'sort' => 'last_update',
@@ -122,7 +122,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 
             <?php if ($GLOBALS['cfg']['ShowDbStructureLastCheck']): ?>
                 <!-- newer values are more interesting so default sort order is DESC -->
-                <th><?= PMA\libraries\Template::get('database/structure/sortable_header')->render(
+                <th><?= PhpMyAdmin\Template::get('database/structure/sortable_header')->render(
                         array(
                             'title' => __('Last check'),
                             'sort' => 'last_check',
diff --git a/templates/privileges/global_priv_table.phtml b/templates/privileges/global_priv_table.phtml
index 223e087a89..3844660f5c 100644
--- a/templates/privileges/global_priv_table.phtml
+++ b/templates/privileges/global_priv_table.phtml
@@ -10,7 +10,7 @@
                 ?  'checked="checked"' : ''); ?>
             <?php $formatted_priv = PMA_formatPrivilege($priv, true);?>
             <?=
-                PMA\libraries\Template::get('privileges/global_priv_tbl_item')->render(
+                PhpMyAdmin\Template::get('privileges/global_priv_tbl_item')->render(
                     array(
                         'checked'        => $checked,
                         'formatted_priv' => $formatted_priv,
diff --git a/templates/privileges/initials_row.phtml b/templates/privileges/initials_row.phtml
index 500375cda7..d867b0278a 100644
--- a/templates/privileges/initials_row.phtml
+++ b/templates/privileges/initials_row.phtml
@@ -15,12 +15,12 @@
                     $additional_class
                         = (isset($_REQUEST['initial']) && $_REQUEST['initial'] === $tmp_initial) ? ' active' : '';
                 ?>
-                <?php $url_params = PMA\libraries\URL::getCommon(array('initial' => $tmp_initial)); ?>
+                <?php $url_params = PhpMyAdmin\Url::getCommon(array('initial' => $tmp_initial)); ?>
                 <a class="ajax<?= $additional_class ?>" href="server_privileges.php<?= $url_params ?>"><?= $tmp_initial ?></a>
             </td>
         <?php endforeach; ?>
         <td>
-            <a href="server_privileges.php<?= PMA\libraries\URL::getCommon(array('showall' => 1)) ?>" class="nowrap">
+            <a href="server_privileges.php<?= PhpMyAdmin\Url::getCommon(array('showall' => 1)) ?>" class="nowrap">
                 <?= __('Show all') ?>
             </a>
         </td>
diff --git a/templates/privileges/privileges_summary.phtml b/templates/privileges/privileges_summary.phtml
index d104ba7c83..3e235d92a9 100644
--- a/templates/privileges/privileges_summary.phtml
+++ b/templates/privileges/privileges_summary.phtml
@@ -1,6 +1,6 @@
-<?php use PMA\libraries\Template; ?>
+<?php use PhpMyAdmin\Template; ?>
 <form class="submenu-item" action="server_privileges.php" id="<?= $formId; ?>" method="post">
-    <?= PMA\libraries\URL::getHiddenInputs(); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs(); ?>
     <input type="hidden" name="username" value="<?= htmlspecialchars($userName); ?>" />
     <input type="hidden" name="hostname" value="<?= htmlspecialchars($hostName); ?>" />
 
diff --git a/templates/privileges/require_options.phtml b/templates/privileges/require_options.phtml
index 6261786246..e43e1a292f 100644
--- a/templates/privileges/require_options.phtml
+++ b/templates/privileges/require_options.phtml
@@ -6,7 +6,7 @@
                 <div id="specified_div" style="padding-left:20px;">
             <?php endif; ?>
             <?=
-                PMA\libraries\Template::get('privileges/require_options_item')->render(
+                PhpMyAdmin\Template::get('privileges/require_options_item')->render(
                     array('require_option' => $require_option)
                 );
             ?>
diff --git a/templates/privileges/resource_limits.phtml b/templates/privileges/resource_limits.phtml
index 648a54cff6..5bafa29066 100644
--- a/templates/privileges/resource_limits.phtml
+++ b/templates/privileges/resource_limits.phtml
@@ -7,7 +7,7 @@
     </p>
     <?php foreach ($limits as $limit) : ?>
         <?=
-            PMA\libraries\Template::get('privileges/resource_limit_item')->render(
+            PhpMyAdmin\Template::get('privileges/resource_limit_item')->render(
                 array('limit' => $limit)
             );
         ?>
diff --git a/templates/server/binlog/log_selector.phtml b/templates/server/binlog/log_selector.phtml
index 2451417aaa..1f97e12a28 100644
--- a/templates/server/binlog/log_selector.phtml
+++ b/templates/server/binlog/log_selector.phtml
@@ -1,5 +1,5 @@
 <form action="server_binlog.php" method="get">
-    <?= PMA\libraries\URL::getHiddenInputs($url_params); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs($url_params); ?>
     <fieldset>
         <legend>
             <?= __('Select binary log to view'); ?>
@@ -10,7 +10,7 @@
                 <option value="<?= htmlspecialchars($each_log['Log_name']); ?>"<?= ($each_log['Log_name'] == $_REQUEST['log'] ? ' selected="selected"' : ''); ?>>
                     <?= htmlspecialchars($each_log['Log_name']); ?>
                     <?php if (isset($each_log['File_size'])): ?>
-                        (<?= implode(' ', \PMA\libraries\Util::formatByteDown($each_log['File_size'], 3, 2)); ?>)
+                        (<?= implode(' ', \PhpMyAdmin\Util::formatByteDown($each_log['File_size'], 3, 2)); ?>)
                         <?php $full_size += $each_log['File_size']; ?>
                     <?php endif; ?>
                 </option>
@@ -18,7 +18,7 @@
         </select>
         <?= count($binary_logs) . ' ' . __('Files') . ', '; ?>
         <?php if ($full_size > 0): ?>
-            <?= implode(' ', \PMA\libraries\Util::formatByteDown($full_size)); ?>
+            <?= implode(' ', \PhpMyAdmin\Util::formatByteDown($full_size)); ?>
         <?php endif; ?>
     </fieldset>
     <fieldset class="tblFooters">
diff --git a/templates/server/databases/create.phtml b/templates/server/databases/create.phtml
index 7f5ee2ca31..cbd592c9a9 100644
--- a/templates/server/databases/create.phtml
+++ b/templates/server/databases/create.phtml
@@ -4,12 +4,12 @@
             <form method="post" action="server_databases.php" id="create_database_form" class="ajax">
                 <strong>
                     <label for="text_create_db">
-                        <?= \PMA\libraries\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>
-                    </label>&nbsp;<?= \PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE'); ?>
+                        <?= \PhpMyAdmin\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>
+                    </label>&nbsp;<?= \PhpMyAdmin\Util::showMySQLDocu('CREATE_DATABASE'); ?>
                 </strong>
                 <br />
 
-                <?= \PMA\libraries\URL::getHiddenInputs('', '', 5); ?>
+                <?= \PhpMyAdmin\Url::getHiddenInputs('', '', 5); ?>
                 <input type="hidden" name="reload" value="1" />
                 <?php if (! empty($dbstats)): ?>
                     <input type="hidden" name="dbstats" value="1" />
@@ -24,12 +24,12 @@
         <?php else: ?>
             <!-- db creation no privileges message -->
             <strong>
-                <?= \PMA\libraries\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>&nbsp;<?= \PMA\libraries\Util::showMySQLDocu('CREATE_DATABASE'); ?>
+                <?= \PhpMyAdmin\Util::getImage('b_newdb.png') , ' ' , __('Create database'); ?>&nbsp;<?= \PhpMyAdmin\Util::showMySQLDocu('CREATE_DATABASE'); ?>
             </strong>
             <br />
 
             <span class="noPrivileges">
-                <?= \PMA\libraries\Util::getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle')) , ' ' , __('No Privileges'); ?>
+                <?= \PhpMyAdmin\Util::getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle')) , ' ' , __('No Privileges'); ?>
             </span>
         <?php endif; ?>
     </li>
diff --git a/templates/server/databases/table_footer.phtml b/templates/server/databases/table_footer.phtml
index fdaccc9d21..0534f1d3a0 100644
--- a/templates/server/databases/table_footer.phtml
+++ b/templates/server/databases/table_footer.phtml
@@ -11,9 +11,9 @@
                 continue;
             }
             if ($stat['format'] === 'byte') {
-                list($value, $unit) = \PMA\libraries\Util::formatByteDown($stat['footer'], 3, 1);
+                list($value, $unit) = \PhpMyAdmin\Util::formatByteDown($stat['footer'], 3, 1);
             } elseif ($stat['format'] === 'number') {
-                $value = \PMA\libraries\Util::formatNumber($stat['footer'], 0);
+                $value = \PhpMyAdmin\Util::formatNumber($stat['footer'], 0);
             } else {
                 $value = htmlentities($stat['footer'], 0);
             } ?>
diff --git a/templates/server/databases/table_header.phtml b/templates/server/databases/table_header.phtml
index 598e45827f..f103127012 100644
--- a/templates/server/databases/table_header.phtml
+++ b/templates/server/databases/table_header.phtml
@@ -4,9 +4,9 @@
             <th></th>
         <?php endif; ?>
         <th>
-            <a href="server_databases.php<?= \PMA\libraries\URL::getCommon($_url_params); ?>">
+            <a href="server_databases.php<?= \PhpMyAdmin\Url::getCommon($_url_params); ?>">
                 <?= __('Database'); ?>
-                <?= ($sort_by == 'SCHEMA_NAME' ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
+                <?= ($sort_by == 'SCHEMA_NAME' ?  \PhpMyAdmin\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
             </a>
         </th>
         <?php foreach ($column_order as $stat_name => $stat):
@@ -17,9 +17,9 @@
             $_url_params['sort_order'] = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc'; ?>
 
             <th <?php if ($stat['format'] === 'byte'): ?>colspan="2"<?php endif; ?>>
-                <a href="server_databases.php<?= \PMA\libraries\URL::getCommon($_url_params); ?>">
+                <a href="server_databases.php<?= \PhpMyAdmin\Url::getCommon($_url_params); ?>">
                     <?= $stat['disp_name']; ?>
-                    <?= ($sort_by == $stat_name ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
+                    <?= ($sort_by == $stat_name ?  \PhpMyAdmin\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
                 </a>
             </th>
         <?php endforeach; ?>
diff --git a/templates/server/databases/table_row.phtml b/templates/server/databases/table_row.phtml
index eb4f0a9395..90e1a1ca0a 100644
--- a/templates/server/databases/table_row.phtml
+++ b/templates/server/databases/table_row.phtml
@@ -11,7 +11,7 @@
         </td>
     <?php endif; ?>
     <td class="name">
-        <a href="<?= \PMA\libraries\Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database') , \PMA\libraries\URL::getCommon(array('db' => $current['SCHEMA_NAME'])); ?>"
+        <a href="<?= \PhpMyAdmin\Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database') , \PhpMyAdmin\Url::getCommon(array('db' => $current['SCHEMA_NAME'])); ?>"
            title="<?= sprintf(__('Jump to database'), htmlspecialchars($current['SCHEMA_NAME'])); ?>">
             <?= htmlspecialchars($current['SCHEMA_NAME']); ?>
         </a>
@@ -22,9 +22,9 @@
         }
 
         if ($stat['format'] === 'byte') {
-            list($value, $unit) = \PMA\libraries\Util::formatByteDown($current[$stat_name], 3, 1);
+            list($value, $unit) = \PhpMyAdmin\Util::formatByteDown($current[$stat_name], 3, 1);
         } elseif ($stat['format'] === 'number') {
-            $value = \PMA\libraries\Util::formatNumber($current[$stat_name], 0);
+            $value = \PhpMyAdmin\Util::formatNumber($current[$stat_name], 0);
         } else {
             $value = htmlentities($current[$stat_name], 0);
         } ?>
@@ -57,9 +57,9 @@
 
     <td class="tool">
         <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'])); ?>"
+           href="server_privileges.php<?= \PhpMyAdmin\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')); ?>
+           <?= \PhpMyAdmin\Util::getIcon('s_rights.png', __('Check privileges')); ?>
         </a>
     </td>
 </tr>
diff --git a/templates/server/engines/engine.phtml b/templates/server/engines/engine.phtml
index c06be8af9c..6561de6ae7 100644
--- a/templates/server/engines/engine.phtml
+++ b/templates/server/engines/engine.phtml
@@ -1,7 +1,7 @@
 <h2>
-    <?= \PMA\libraries\Util::getImage('b_engine.png'),
+    <?= \PhpMyAdmin\Util::getImage('b_engine.png'),
             '    ', htmlspecialchars($title),
-            '    ', \PMA\libraries\Util::showMySQLDocu($helpPage); ?>
+            '    ', \PhpMyAdmin\Util::showMySQLDocu($helpPage); ?>
 </h2>
 <p>
     <em>
@@ -14,7 +14,7 @@
             <?php if (empty($_REQUEST['page'])): ?>
                 <strong><?= __('Variables'); ?></strong>
             <?php else: ?>
-                <a href="server_engines.php<?= \PMA\libraries\URL::getCommon(array('engine' => $_REQUEST['engine'])); ?>">
+                <a href="server_engines.php<?= \PhpMyAdmin\Url::getCommon(array('engine' => $_REQUEST['engine'])); ?>">
                     <?= __('Variables'); ?>
                 </a>
             <?php endif; ?>
@@ -23,7 +23,7 @@
                 <?php if (isset($_REQUEST['page']) && $_REQUEST['page'] == $current): ?>
                     <strong><?= htmlspecialchars($label); ?></strong>
                 <?php else: ?>
-                    <a href="server_engines.php<?= \PMA\libraries\URL::getCommon(array('engine' => $_REQUEST['engine'], 'page' => $current)); ?>">
+                    <a href="server_engines.php<?= \PhpMyAdmin\Url::getCommon(array('engine' => $_REQUEST['engine'], 'page' => $current)); ?>">
                         <?= htmlspecialchars($label); ?>
                     </a>
                 <?php endif; ?>
diff --git a/templates/server/variables/variable_row.phtml b/templates/server/variables/variable_row.phtml
index b84bc9e9dc..9b158a7ca3 100644
--- a/templates/server/variables/variable_row.phtml
+++ b/templates/server/variables/variable_row.phtml
@@ -1,17 +1,17 @@
 <tr class="var-row <?= $rowClass; ?>">
     <td class="var-action">
     <?php if ($editable): ?>
-        <a href="#" data-variable="<?= htmlspecialchars($name) ?>" class="editLink"><?= \PMA\libraries\Util::getIcon('b_edit.png', __('Edit')) ?></a>
+        <a href="#" data-variable="<?= htmlspecialchars($name) ?>" class="editLink"><?= \PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit')) ?></a>
     <?php else: ?>
         <span title="<?= __('This is a read-only variable and can not be edited') ?>" class="read_only_var">
-            <?= \PMA\libraries\Util::getIcon('bd_edit.png', __('Edit')) ?>
+            <?= \PhpMyAdmin\Util::getIcon('bd_edit.png', __('Edit')) ?>
         </span>
     <?php endif; ?>
     </td>
     <td class="var-name">
     <?php if ($docLink != null): ?>
         <span title="<?= htmlspecialchars(str_replace('_', ' ', $name)); ?>">
-            <?= \PMA\libraries\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true)
+            <?= \PhpMyAdmin\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true)
                 , str_replace('_', '&nbsp;', htmlspecialchars($name))
                 , '</a>'
             ?>
diff --git a/templates/table/chart/tbl_chart.phtml b/templates/table/chart/tbl_chart.phtml
index 1a5d69272d..d27e18445a 100644
--- a/templates/table/chart/tbl_chart.phtml
+++ b/templates/table/chart/tbl_chart.phtml
@@ -4,7 +4,7 @@
 <!-- Display Chart options -->
 <div id="div_view_options">
     <form method="post" id="tblchartform" action="tbl_chart.php" class="ajax">
-        <?= \PMA\libraries\URL::getHiddenInputs($url_params); ?>
+        <?= \PhpMyAdmin\Url::getHiddenInputs($url_params); ?>
         <fieldset>
             <legend>
                 <?= __('Display chart'); ?>
@@ -144,12 +144,12 @@
                     <?php endforeach; ?>
                 </select>
             </div>
-            <?= PMA\libraries\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
+            <?= PhpMyAdmin\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
             <div class="clearfloat"></div>
             <div id="resizer" style="width:600px; height:400px;">
                 <div style="position: absolute; right: 10px; top: 10px; cursor: pointer; z-index: 1000;">
                     <a class="disableAjax" id="saveChart" href="#" download="chart.png">
-                        <?= PMA\libraries\Util::getImage('b_saveimage', __('Save chart as image')); ?>
+                        <?= PhpMyAdmin\Util::getImage('b_saveimage', __('Save chart as image')); ?>
                     </a>
                 </div>
                 <div id="querychart" dir="ltr">
diff --git a/templates/table/gis_visualization/gis_visualization.phtml b/templates/table/gis_visualization/gis_visualization.phtml
index ab86e4ca39..c6d6fcb51a 100644
--- a/templates/table/gis_visualization/gis_visualization.phtml
+++ b/templates/table/gis_visualization/gis_visualization.phtml
@@ -3,7 +3,7 @@
         <legend><?= __('Display GIS Visualization'); ?></legend>
         <div id="gis_div" style="position:relative;">
             <form method="post" action="tbl_gis_visualization.php">
-                <?= \PMA\libraries\URL::getHiddenInputs($url_params); ?>
+                <?= \PhpMyAdmin\Url::getHiddenInputs($url_params); ?>
                 <label for="labelColumn">
                     <?= __("Label column"); ?>
                 </label>
@@ -39,13 +39,13 @@
                             </label>
                         </td>
                     </tr>
-                <?= PMA\libraries\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
+                <?= PhpMyAdmin\Util::getStartAndNumberOfRowsPanel($sql_query); ?>
             </form>
 
             <div class="pma_quick_warp" style="width: 50px; position: absolute; right: 0; top: 0; cursor: pointer;">
                 <div class="drop_list">
                     <span class="drop_button" style="padding: 0; border: 0;">
-                        <?= PMA\libraries\Util::getImage('b_saveimage', __('Save')); ?>
+                        <?= PhpMyAdmin\Util::getImage('b_saveimage', __('Save')); ?>
                     </span>
                     <ul>
                         <li class="warp_link">
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index 6d24df2c3f..4ec28f7f06 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -1,7 +1,7 @@
 <form method="post" action="tbl_relation.php">
-    <?= PMA\libraries\URL::getHiddenInputs($db, $table); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs($db, $table); ?>
     <!-- InnoDB  -->
-    <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+    <?php if (PhpMyAdmin\Util::isForeignKeySupported($tbl_storage_engine)): ?>
         <fieldset>
             <legend><?= __('Foreign key constraints'); ?></legend>
             <table id="foreign_keys" class="relationalTable">
@@ -9,14 +9,14 @@
                     <th><?= __('Actions'); ?></th>
                     <th><?= __('Constraint properties'); ?></th>
                     <?php if (strtoupper($tbl_storage_engine) == 'INNODB'): ?>
-                        <th><?= __('Column') , PMA\libraries\Util::showHint(__(
+                        <th><?= __('Column') , PhpMyAdmin\Util::showHint(__(
                                 'Creating a foreign key over a non-indexed column would automatically create'
                                 . ' an index on it. Alternatively, you can define an index below, before creating'
                                 . ' the foreign key.'
                             )) ?>
                         </th>
                     <?php else: ?>
-                        <th><?= __('Column') , PMA\libraries\Util::showHint(__(
+                        <th><?= __('Column') , PhpMyAdmin\Util::showHint(__(
                                 'Only columns with index will be displayed. You can define an'
                                 . ' index below.'
                             )) ?>
@@ -37,7 +37,7 @@
                 <?php $i = 0; ?>
                 <?php if (! empty($existrel_foreign)): ?>
                     <?php foreach ($existrel_foreign as $key => $one_key): ?>
-                        <?= PMA\libraries\Template::get('table/relation/foreign_key_row')->render(
+                        <?= PhpMyAdmin\Template::get('table/relation/foreign_key_row')->render(
                             array(
                                 'one_key' => $one_key,
                                 'columns' => $columns,
@@ -50,7 +50,7 @@
                         ?>
                     <?php endforeach; ?>
                 <?php endif; ?>
-                <?= PMA\libraries\Template::get('table/relation/foreign_key_row')->render(
+                <?= PhpMyAdmin\Template::get('table/relation/foreign_key_row')->render(
                     array(
                         'one_key' => array(),
                         'columns' => $columns,
@@ -71,27 +71,27 @@
     <?php endif; ?>
 
     <?php if ($cfgRelation['relwork']): ?>
-        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+        <?php if (PhpMyAdmin\Util::isForeignKeySupported($tbl_storage_engine)): ?>
             <br/>
-            <?= PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relationships')) ?>
+            <?= PhpMyAdmin\Util::getDivForSliderEffect('ir_div', __('Internal relationships')) ?>
         <?php endif; ?>
 
         <?php $save_row = array_values($columns);
         $saved_row_cnt  = count($save_row);?>
         <fieldset>
-            <legend><?= __('Internal relationships') , PMA\libraries\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
+            <legend><?= __('Internal relationships') , PhpMyAdmin\Util::showDocu('config', 'cfg_Servers_relation'); ?></legend>
             <table id="internal_relations" class="relationalTable">
                 <tr>
                     <th><?= __('Column'); ?></th>
                     <th><?= __('Internal relation'); ?>
-                        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
-                            <?= PMA\libraries\Util::showHint(__(
+                        <?php if (PhpMyAdmin\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+                            <?= PhpMyAdmin\Util::showHint(__(
                                 'An internal relation is not necessary when a corresponding'
                                 . ' FOREIGN KEY relation exists.')); ?>
                         <?php endif; ?>
                     </th>
                     <?php for ($i = 0; $i < $saved_row_cnt; $i++): ?>
-                        <?= PMA\libraries\Template::get('table/relation/internal_relational_row')->render(
+                        <?= PhpMyAdmin\Template::get('table/relation/internal_relational_row')->render(
                             array(
                                 'save_row' => $save_row,
                                 'i' => $i,
@@ -103,7 +103,7 @@
                     <?php endfor; ?>
             </table>
         </fieldset>
-        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+        <?php if (PhpMyAdmin\Util::isForeignKeySupported($tbl_storage_engine)): ?>
             </div>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index 93bfe86ebf..14bdc25d2f 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -1,16 +1,16 @@
 <?php
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Table;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Sanitize;
 
 $js_msg = '';
 $this_params = null;
 if (isset($one_key['constraint'])) {
-    $drop_fk_query = 'ALTER TABLE ' . PMA\libraries\Util::backquote($GLOBALS['table'])
+    $drop_fk_query = 'ALTER TABLE ' . PhpMyAdmin\Util::backquote($GLOBALS['table'])
         . ' DROP FOREIGN KEY '
-        . PMA\libraries\Util::backquote($one_key['constraint']) . ';';
+        . PhpMyAdmin\Util::backquote($one_key['constraint']) . ';';
     $this_params = $GLOBALS['url_params'];
     $this_params['goto'] = 'tbl_relation.php';
     $this_params['back'] = 'tbl_relation.php';
@@ -81,8 +81,8 @@ if ($foreign_db) {
                    class="drop_foreign_key_msg"
                    value="<?= $js_msg; ?>" />
             <a class="drop_foreign_key_anchor ajax"
-               href="sql.php<?= URL::getCommon($this_params); ?>" >
-                <?= PMA\libraries\Util::getIcon('b_drop.png', __('Drop')); ?>
+               href="sql.php<?= Url::getCommon($this_params); ?>" >
+                <?= PhpMyAdmin\Util::getIcon('b_drop.png', __('Drop')); ?>
             </a>
         <?php endif; ?>
     </td>
@@ -98,7 +98,7 @@ if ($foreign_db) {
         </span>
         <div class="floatleft">
             <span class="formelement">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
+                <?= PhpMyAdmin\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => 'ON DELETE',
                         'select_name' => 'on_delete[' . $i . ']',
@@ -108,7 +108,7 @@ if ($foreign_db) {
                 ); ?>
             </span>
             <span class="formelement">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
+                <?= PhpMyAdmin\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => 'ON UPDATE',
                         'select_name' => 'on_update[' . $i . ']',
@@ -123,7 +123,7 @@ if ($foreign_db) {
         <?php if (isset($one_key['index_list'])): ?>
             <?php foreach ($one_key['index_list'] as $key => $column): ?>
                 <span class="formelement clearfloat">
-                    <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
+                    <?= PhpMyAdmin\Template::get('table/relation/dropdown_generate')->render(
                         array(
                             'dropdown_question' => '',
                             'select_name' => 'foreign_key_fields_name[' . $i . '][]',
@@ -135,7 +135,7 @@ if ($foreign_db) {
             <?php endforeach; ?>
         <?php else: ?>
             <span class="formelement clearfloat">
-                <?= PMA\libraries\Template::get('table/relation/dropdown_generate')->render(
+                <?= PhpMyAdmin\Template::get('table/relation/dropdown_generate')->render(
                     array(
                         'dropdown_question' => '',
                         'select_name' => 'foreign_key_fields_name[' . $i . '][]',
@@ -153,7 +153,7 @@ if ($foreign_db) {
     </td>
     <td>
         <span class="formelement clearfloat">
-            <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+            <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
                 array(
                     'name' => 'destination_foreign_db[' . $i . ']',
                     'title' => __('Database'),
@@ -164,7 +164,7 @@ if ($foreign_db) {
     </td>
     <td>
         <span class="formelement clearfloat">
-            <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+            <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
                 array(
                     'name' => 'destination_foreign_table[' . $i . ']',
                     'title' => __('Table'),
@@ -182,7 +182,7 @@ if ($foreign_db) {
                 $columns = $table_obj->getUniqueColumns(false, false);
                 ?>
                 <span class="formelement clearfloat">
-                    <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+                    <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
                         array(
                             'name' => 'destination_foreign_column[' . $i . '][]',
                             'title' => __('Column'),
@@ -194,7 +194,7 @@ if ($foreign_db) {
             <?php endforeach; ?>
         <?php else: ?>
             <span class="formelement clearfloat">
-                <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+                <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
                     array(
                         'name' => 'destination_foreign_column[' . $i . '][]',
                         'title' => __('Column'),
diff --git a/templates/table/relation/internal_relational_row.phtml b/templates/table/relation/internal_relational_row.phtml
index f95a34de2b..37879f6884 100644
--- a/templates/table/relation/internal_relational_row.phtml
+++ b/templates/table/relation/internal_relational_row.phtml
@@ -1,5 +1,5 @@
 <?php
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 
 $myfield = $save_row[$i]['Field'];
 // Use an md5 as array index to avoid having special characters
@@ -44,7 +44,7 @@ if ($foreign_db && $foreign_table) {
     </td>
 
     <td>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+        <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_db[' . $myfield_md5 . ']',
                 'title' => __('Database'),
@@ -52,7 +52,7 @@ if ($foreign_db && $foreign_table) {
                 'foreign' => $foreign_db
             )
         ); ?>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+        <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_table[' . $myfield_md5 . ']',
                 'title' => __('Table'),
@@ -60,7 +60,7 @@ if ($foreign_db && $foreign_table) {
                 'foreign' => $foreign_table
             )
         ); ?>
-        <?= PMA\libraries\Template::get('table/relation/relational_dropdown')->render(
+        <?= PhpMyAdmin\Template::get('table/relation/relational_dropdown')->render(
             array(
                 'name' => 'destination_column[' . $myfield_md5 . ']',
                 'title' => __('Column'),
diff --git a/templates/table/search/fields_table.phtml b/templates/table/search/fields_table.phtml
index 72cc04e6e4..2d3d60986a 100644
--- a/templates/table/search/fields_table.phtml
+++ b/templates/table/search/fields_table.phtml
@@ -1,19 +1,19 @@
 <table class="data" <?php if ($searchType == 'zoom'): ?>
                         id="tableFieldsId"
                    <?php endif; ?>>
-    <?= PMA\libraries\Template::get('table/search/table_header')
+    <?= PhpMyAdmin\Template::get('table/search/table_header')
         ->render(array(
             'geom_column_flag' => $geomColumnFlag
         )); ?>
     <tbody>
     <?php if ($searchType == 'zoom'): ?>
-        <?= PMA\libraries\Template::get('table/search/rows_zoom')
+        <?= PhpMyAdmin\Template::get('table/search/rows_zoom')
             ->render(array(
                 'self' => $self,
                 'columnNames' => $columnNames
         )) ?>
     <?php else: ?>
-        <?= PMA\libraries\Template::get('table/search/rows_normal')
+        <?= PhpMyAdmin\Template::get('table/search/rows_normal')
             ->render(array(
                 'self' => $self,
                 'geomColumnFlag' => $geomColumnFlag,
diff --git a/templates/table/search/geom_func.phtml b/templates/table/search/geom_func.phtml
index 55642e7786..be9cd72c61 100644
--- a/templates/table/search/geom_func.phtml
+++ b/templates/table/search/geom_func.phtml
@@ -1,7 +1,7 @@
 <!-- Displays 'Function' column if it is present -->
 <td>
     <?php
-    $geom_types = PMA\libraries\Util::getGISDatatypes();
+    $geom_types = PhpMyAdmin\Util::getGISDatatypes();
     ?>
 
     <?php
@@ -14,7 +14,7 @@
 
             <?php
             // get the relevant list of GIS functions
-            $funcs = PMA\libraries\Util::getGISFunctions(
+            $funcs = PhpMyAdmin\Util::getGISFunctions(
                 $columnTypes[$column_index], true, true
             );
             ?>
diff --git a/templates/table/search/input_box.phtml b/templates/table/search/input_box.phtml
index 7720a917e4..302cc4e5b9 100644
--- a/templates/table/search/input_box.phtml
+++ b/templates/table/search/input_box.phtml
@@ -23,7 +23,7 @@ if ($_foreigners
                    value="<?= htmlspecialchars($criteriaValues[$column_index]); ?>"
                <?php endif; ?> />
         <a class="ajax browse_foreign"
-           href="<?= ('browse_foreigners.php') , PMA\libraries\URL::getCommon(array('db' => $db, 'table' => $table))
+           href="<?= ('browse_foreigners.php') , PhpMyAdmin\Url::getCommon(array('db' => $db, 'table' => $table))
                     , ('&amp;field=') , urlencode($column_name)
                     , ('&amp;fieldkey=') , $column_index
                     , ('&amp;fromsearch=1')
@@ -33,7 +33,7 @@ if ($_foreigners
         </a>
     <?php endif; ?>
 
-<?php elseif (in_array($column_type, PMA\libraries\Util::getGISDatatypes())): ?>
+<?php elseif (in_array($column_type, PhpMyAdmin\Util::getGISDatatypes())): ?>
     <input type="text"
            name="criteriaValues[<?= $column_index; ?>]"
            size="40"
@@ -42,12 +42,12 @@ if ($_foreigners
     <?php if ($in_fbs): ?>
 
         <?php
-        $edit_url = 'gis_data_editor.php' . PMA\libraries\URL::getCommon();
-        $edit_str = PMA\libraries\Util::getIcon('b_edit.png', __('Edit/Insert'));
+        $edit_url = 'gis_data_editor.php' . PhpMyAdmin\Url::getCommon();
+        $edit_str = PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit/Insert'));
         ?>
 
         <span class="open_search_gis_editor">
-            <?= PMA\libraries\Util::linkOrButton(
+            <?= PhpMyAdmin\Util::linkOrButton(
                 $edit_url, $edit_str, array(), false, false, '_blank'
             ); ?>
         </span>
diff --git a/templates/table/search/options.phtml b/templates/table/search/options.phtml
index e3460193c4..2b6622a853 100644
--- a/templates/table/search/options.phtml
+++ b/templates/table/search/options.phtml
@@ -1,4 +1,4 @@
-<?= PMA\libraries\Util::getDivForSliderEffect(
+<?= PhpMyAdmin\Util::getDivForSliderEffect(
     'searchoptions', __('Options')
 ); ?>
 
@@ -36,7 +36,7 @@
         <em><?= __('Or'); ?></em>
         <?= __('Add search conditions (body of the "where" clause):'); ?>
     </legend>
-    <?= PMA\libraries\Util::showMySQLDocu('Functions'); ?>
+    <?= PhpMyAdmin\Util::showMySQLDocu('Functions'); ?>
     <input type="text" name="customWhereClause" class="textfield" size="64" />
 </fieldset>
 
@@ -62,7 +62,7 @@
         <?php endforeach; ?>
     </select>
 
-    <?= PMA\libraries\Util::getRadioFields(
+    <?= PhpMyAdmin\Util::getRadioFields(
         'order',
         array(
             'ASC' => __('Ascending'),
diff --git a/templates/table/search/rows_normal.phtml b/templates/table/search/rows_normal.phtml
index 677ec6a40c..8564128a0c 100644
--- a/templates/table/search/rows_normal.phtml
+++ b/templates/table/search/rows_normal.phtml
@@ -8,7 +8,7 @@ for (
     <tr class="noclick">
         <!-- If 'Function' column is present trying to change comment -->
         <?php if ($geomColumnFlag): ?>
-            <?= PMA\libraries\Template::get('table/search/geom_func')
+            <?= PhpMyAdmin\Template::get('table/search/geom_func')
                 ->render(array(
                     'column_index' => $column_index,
                     'columnTypes' => $columnTypes,
diff --git a/templates/table/search/search_and_replace.phtml b/templates/table/search/search_and_replace.phtml
index 0fc68ca1af..714b0198db 100644
--- a/templates/table/search/search_and_replace.phtml
+++ b/templates/table/search/search_and_replace.phtml
@@ -17,7 +17,7 @@
 </select>
 
 <br>
-<?= PMA\libraries\Template::get('checkbox')
+<?= PhpMyAdmin\Template::get('checkbox')
 ->render(
     array(
         'html_field_name'   => 'useRegex',
diff --git a/templates/table/search/selection_form.phtml b/templates/table/search/selection_form.phtml
index fcc210dc83..31b172bb74 100644
--- a/templates/table/search/selection_form.phtml
+++ b/templates/table/search/selection_form.phtml
@@ -16,7 +16,7 @@ switch ($searchType) {
         break;
 }
 ?>
-<?= PMA\libraries\Template::get('table/search/form_tag')
+<?= PhpMyAdmin\Template::get('table/search/form_tag')
     ->render(array(
         'script_name' => $scriptName,
         'form_id' => $formId,
@@ -30,7 +30,7 @@ switch ($searchType) {
             <legend>
                 <?= __('Do a "query by example" (wildcard: "%") for two different columns'); ?>
             </legend>
-            <?= PMA\libraries\Template::get('table/search/fields_table')
+            <?= PhpMyAdmin\Template::get('table/search/fields_table')
                 ->render(array(
                     'self' => $self,
                     'searchType' => $searchType,
@@ -40,7 +40,7 @@ switch ($searchType) {
                     'columnCollations' => $columnCollations
                 ))
             ?>
-            <?= PMA\libraries\Template::get('table/search/options_zoom')
+            <?= PhpMyAdmin\Template::get('table/search/options_zoom')
                 ->render(array(
                     'dataLabel' => $dataLabel,
                     'columnNames' => $columnNames
@@ -53,7 +53,7 @@ switch ($searchType) {
             <legend>
                 <?= __('Do a "query by example" (wildcard: "%")'); ?>
             </legend>
-            <?= PMA\libraries\Template::get('table/search/fields_table')
+            <?= PhpMyAdmin\Template::get('table/search/fields_table')
                 ->render(array(
                     'self' => $self,
                     'searchType' => $searchType,
@@ -67,7 +67,7 @@ switch ($searchType) {
             <div id="popup_background">
             </div>
         </fieldset>
-        <?= PMA\libraries\Template::get('table/search/options')
+        <?= PhpMyAdmin\Template::get('table/search/options')
             ->render(array(
                 'columnNames' => $columnNames
             )); ?>
@@ -78,7 +78,7 @@ switch ($searchType) {
             <legend>
                 <?= __('Find and replace'); ?>
             </legend>
-            <?= PMA\libraries\Template::get('table/search/search_and_replace')
+            <?= PhpMyAdmin\Template::get('table/search/search_and_replace')
                 ->render(array(
                     'columnNames' => $columnNames,
                     'columnTypes' => $columnTypes
diff --git a/templates/table/search/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml
index 35bbfb3f20..f34117855e 100644
--- a/templates/table/search/zoom_result_form.phtml
+++ b/templates/table/search/zoom_result_form.phtml
@@ -1,5 +1,5 @@
 <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" class="ajax">
-    <?= \PMA\libraries\URL::getHiddenInputs($_db, $_table); ?>
+    <?= \PhpMyAdmin\Url::getHiddenInputs($_db, $_table); ?>
     <input type="hidden" name="goto" value="<?= $goto; ?>" />
     <input type="hidden" name="back" value="tbl_zoom_select.php" />
 
@@ -71,7 +71,7 @@
                         </th>
 <!-- Column's Input box-->
                         <th>
-                            <?= PMA\libraries\Template::get('table/search/input_box')->render(array(
+                            <?= PhpMyAdmin\Template::get('table/search/input_box')->render(array(
                                     'str' => '',
                                     'column_type' => $_columnTypes[$column_index],
                                     'column_id' => ($_columnTypes[$column_index]) ? 'edit_fieldID_' : 'fieldID_',
diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml
index 264692ffd5..d22d88bbfa 100644
--- a/templates/table/structure/display_structure.phtml
+++ b/templates/table/structure/display_structure.phtml
@@ -1,14 +1,14 @@
 <?php
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Partition;
-use PMA\libraries\Template;
-use PMA\libraries\Tracker;
-use PMA\libraries\Util;
-use PMA\libraries\URL;
+use PhpMyAdmin\Template;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Util;
+use PhpMyAdmin\Url;
 
 $rownum = 0; ?>
 <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" class="ajax<?= $HideStructureActions; ?>">
-    <?= URL::getHiddenInputs($db, $table); ?>
+    <?= Url::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="table_type" value=
     <?php if ($db_is_system_schema): ?>
         "information_schema" />
@@ -19,7 +19,7 @@ $rownum = 0; ?>
     <?php endif; ?>
     <table id="tablestructure" class="data topmargin">
         <!-- table header -->
-        <?= PMA\libraries\Template::get('table/structure/table_structure_header')->render(
+        <?= PhpMyAdmin\Template::get('table/structure/table_structure_header')->render(
             array(
                 'db_is_system_schema' => $db_is_system_schema,
                 'tbl_is_view' => $tbl_is_view,
@@ -72,7 +72,7 @@ $rownum = 0; ?>
                 }
             ?>
         <tr>
-            <?= PMA\libraries\Template::get('table/structure/table_structure_row')->render(
+            <?= PhpMyAdmin\Template::get('table/structure/table_structure_row')->render(
                 array(
                     'row' => $row,
                     'rownum' => $rownum,
diff --git a/templates/table/structure/partition_definition_form.phtml b/templates/table/structure/partition_definition_form.phtml
index 1f25ebda4f..a2c20bd18b 100644
--- a/templates/table/structure/partition_definition_form.phtml
+++ b/templates/table/structure/partition_definition_form.phtml
@@ -1,10 +1,10 @@
 <form action="tbl_structure.php" method="post">
-    <?= PMA\libraries\URL::getHiddenInputs($db, $table); ?>
+    <?= PhpMyAdmin\Url::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="edit_partitioning" value="true" />
 
     <fieldset>
         <legend><?= __('Edit partitioning'); ?></legend>
-        <?= PMA\libraries\Template::get('columns_definitions/partitions')
+        <?= PhpMyAdmin\Template::get('columns_definitions/partitions')
             ->render(array('partitionDetails' => $partitionDetails)); ?>
     </fieldset>
     <fieldset class="tblFooters">
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index fbd51e8d25..5284fa8be2 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -87,7 +87,7 @@ session_start();
 
 // Standard environment for tests
 $_SESSION[' PMA_token '] = 'token';
-$_SESSION['PMA_Theme'] = PMA\libraries\Theme::load('./themes/pmahomme');
+$_SESSION['PMA_Theme'] = PhpMyAdmin\Theme::load('./themes/pmahomme');
 $_SESSION['tmpval']['pftext'] = 'F';
 $GLOBALS['lang'] = 'en';
 $GLOBALS['cell_align_left'] = 'left';
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index c6449d9dea..ee982e956b 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -12,7 +12,7 @@
 require_once 'test/PMATestCase.php';
 
 use PhpMyAdmin\Advisor;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 /**
  * Tests behaviour of PMA_Advisor class
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index f6e6c74658..e4ec4e775a 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -10,7 +10,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index a7579b8301..c81d169839 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php
index e9f0abba76..de573f0bc5 100644
--- a/test/classes/DbSearchTest.php
+++ b/test/classes/DbSearchTest.php
@@ -13,7 +13,7 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 use PhpMyAdmin\DbSearch;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 /**
  * Tests for database search.
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index c228e4b003..f6118fc78a 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -10,7 +10,7 @@
  */
 
 use PhpMyAdmin\ErrorHandler;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index 2395cb26bc..fd002b8d4e 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -11,7 +11,7 @@
  */
 
 use PhpMyAdmin\Error;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 03db57e344..e1e4fdd49e 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -12,7 +12,7 @@
 use PhpMyAdmin\Config;
 use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\Footer;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index 3c22f61544..d21101ec0f 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Header;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index f413b32fc7..b64999d93a 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -11,7 +11,7 @@
  */
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Menu;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 23c5521400..04e5d5db79 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Message;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 16b7681b14..2f315819dc 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -9,9 +9,9 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
-use PMA\libraries\Util;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Util;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
@@ -292,7 +292,7 @@ class TableTest extends PMATestCase
     public function testCreate()
     {
         $table = new Table('table1', 'pma_test');
-        $this->assertInstanceOf('PMA\libraries\Table', $table);
+        $this->assertInstanceOf('PhpMyAdmin\Table', $table);
     }
 
     /**
@@ -895,7 +895,7 @@ class TableTest extends PMATestCase
         $foreignTable = "foreignTable";
         $foreignField = array("foreignField1", "foreignField2");
 
-        $class = new ReflectionClass('PMA\libraries\Table');
+        $class = new ReflectionClass(Table::class);
         $method = $class->getMethod('_getSQLToCreateForeignKey');
         $method->setAccessible(true);
         $tableObj = new Table('PMA_table', 'db');
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index 844d4037ee..abaaba9cff 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -1,17 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\Template class
+ * Test for PhpMyAdmin\Template class
  *
  * @package PhpMyAdmin-test
  */
 
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\Template;
+use PhpMyAdmin\Template;
 
 /**
- * Test for PMA\libraries\Template class
+ * Test for PhpMyAdmin\Template class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
index d0b0c7e599..e28445b596 100644
--- a/test/classes/ThemeManagerTest.php
+++ b/test/classes/ThemeManagerTest.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\ThemeManager;
+use PhpMyAdmin\ThemeManager;
 
 require_once 'test/PMATestCase.php';
 
@@ -148,7 +148,7 @@ class ThemeManagerTest extends PMATestCase
     {
         $tm = new ThemeManager();
         $this->assertInstanceOf(
-            'PMA\libraries\Theme',
+            'PhpMyAdmin\Theme',
             $tm->getFallBackTheme()
         );
     }
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index eb9a02a0d0..a1c7fed4c5 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -5,7 +5,7 @@
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index 600a25fd65..2bb9c302a2 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\Tracker
+ * Tests for PhpMyAdmin\Tracker
  *
  * @package PhpMyAdmin-test
  */
@@ -9,14 +9,14 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Tracker;
+use PhpMyAdmin\Tracker;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\Tracker
+ * Tests for PhpMyAdmin\Tracker
  *
  * @package PhpMyAdmin-test
  */
@@ -66,7 +66,7 @@ class TrackerTest extends PMATestCase
     {
         Tracker::enable();
         $this->assertTrue(
-            PHPUnit_Framework_Assert::readAttribute('PMA\libraries\Tracker', 'enabled')
+            PHPUnit_Framework_Assert::readAttribute('PhpMyAdmin\Tracker', 'enabled')
         );
     }
 
@@ -78,7 +78,7 @@ class TrackerTest extends PMATestCase
      */
     public function testIsActive()
     {
-        $attr = new \ReflectionProperty('PMA\libraries\Tracker', 'enabled');
+        $attr = new \ReflectionProperty('PhpMyAdmin\Tracker', 'enabled');
         $attr->setAccessible(true);
         $attr->setValue(false);
 
@@ -121,7 +121,7 @@ class TrackerTest extends PMATestCase
      */
     public function testGetTableName($string, $expected)
     {
-        $reflection = new \ReflectionClass('PMA\libraries\Tracker');
+        $reflection = new \ReflectionClass('PhpMyAdmin\Tracker');
         $method = $reflection->getMethod("getTableName");
         $method->setAccessible(true);
 
@@ -154,7 +154,7 @@ class TrackerTest extends PMATestCase
      */
     public function testIsTracked()
     {
-        $attr = new \ReflectionProperty('PMA\libraries\Tracker', 'enabled');
+        $attr = new \ReflectionProperty('PhpMyAdmin\Tracker', 'enabled');
         $attr->setAccessible(true);
         $attr->setValue(false);
 
@@ -466,7 +466,7 @@ class TrackerTest extends PMATestCase
         $GLOBALS['dbi'] = $dbi;
 
         if ($type == null) {
-            $method = new \ReflectionMethod('PMA\libraries\Tracker', '_changeTracking');
+            $method = new \ReflectionMethod('PhpMyAdmin\Tracker', '_changeTracking');
             $method->setAccessible(true);
             $result = $method->invoke(
                 null,
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index 9f687b27de..e1af2624f1 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
-use PMA\libraries\Transformations;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Transformations;
 
 /*
  * Include to test.
diff --git a/test/classes/TypesMySQLTest.php b/test/classes/TypesMySQLTest.php
index 7a32750947..5c547c4231 100644
--- a/test/classes/TypesMySQLTest.php
+++ b/test/classes/TypesMySQLTest.php
@@ -9,7 +9,7 @@
  * Include to test.
  */
 
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\TypesMySQL;
 
 require_once 'test/PMATestCase.php';
 
@@ -21,7 +21,7 @@ require_once 'test/PMATestCase.php';
 class TypesMySQLTest extends PMATestCase
 {
     /**
-     * @var PMA\libraries\Types
+     * @var PhpMyAdmin\Types
      */
     protected $object;
 
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index f59388e9a1..fcf8497955 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -4,7 +4,7 @@
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\Types;
+use PhpMyAdmin\Types;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/URLTest.php b/test/classes/UrlTest.php
similarity index 80%
rename from test/classes/URLTest.php
rename to test/classes/UrlTest.php
index d11477e75e..918c6fe989 100644
--- a/test/classes/URLTest.php
+++ b/test/classes/UrlTest.php
@@ -8,14 +8,14 @@
 /*
  * Include to text.
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  * Tests for methods in URL class
  *
  * @package PhpMyAdmin-test
  */
-class URLTest extends PHPUnit_Framework_TestCase
+class UrlTest extends PHPUnit_Framework_TestCase
 {
 
     /**
@@ -31,7 +31,7 @@ class URLTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for URL::getCommon for DB only
+     * Test for Url::getCommon for DB only
      *
      * @return void
      */
@@ -41,7 +41,7 @@ class URLTest extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         $expected = 'server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x'
@@ -50,11 +50,11 @@ class URLTest extends PHPUnit_Framework_TestCase
         $expected = '?db=db'
             . htmlentities($separator) . $expected;
 
-        $this->assertEquals($expected, URL::getCommon(array('db' => 'db')));
+        $this->assertEquals($expected, Url::getCommon(array('db' => 'db')));
     }
 
     /**
-     * Test for URL::getCommon with new style
+     * Test for Url::getCommon with new style
      *
      * @return void
      */
@@ -64,7 +64,7 @@ class URLTest extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         $expected = 'server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x'
@@ -74,11 +74,11 @@ class URLTest extends PHPUnit_Framework_TestCase
             . htmlentities($separator) . 'table=table'
             . htmlentities($separator) . $expected;
         $params = array('db' => 'db', 'table' => 'table');
-        $this->assertEquals($expected, URL::getCommon($params));
+        $this->assertEquals($expected, Url::getCommon($params));
     }
 
     /**
-     * Test for URL::getCommon with alternate divider
+     * Test for Url::getCommon with alternate divider
      *
      * @return void
      */
@@ -88,7 +88,7 @@ class URLTest extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         $expected = 'server=x' . $separator
             . 'lang=en' . $separator
             . 'collation_connection=x'
@@ -98,14 +98,14 @@ class URLTest extends PHPUnit_Framework_TestCase
             . $expected;
         $this->assertEquals(
             $expected,
-            URL::getCommonRaw(
+            Url::getCommonRaw(
                 array('db' => 'db', 'table' => 'table'), '#ABC#'
             )
         );
     }
 
     /**
-     * Test for URL::getCommon
+     * Test for Url::getCommon
      *
      * @return void
      */
@@ -115,11 +115,11 @@ class URLTest extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = URL::getArgSeparator();
+        $separator = Url::getArgSeparator();
         $expected = '?server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x'
             ;
-        $this->assertEquals($expected, URL::getCommon());
+        $this->assertEquals($expected, Url::getCommon());
     }
 }
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index f9eabe6fdb..89924b3ca5 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -1,15 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\Util class
+ * Test for PhpMyAdmin\Util class
  *
  * @package PhpMyAdmin-test
  */
 
+use PhpMyAdmin\Util;
+
 require_once 'test/PMATestCase.php';
 
 /**
- * Test for PMA\libraries\Util class
+ * Test for PhpMyAdmin\Util class
  *
  * @package PhpMyAdmin-test
  */
@@ -25,11 +27,11 @@ class UtilTest extends PMATestCase
     {
         $this->assertEquals(
             "abc",
-            PMA\libraries\Util::createGISData("abc")
+            Util::createGISData("abc")
         );
         $this->assertEquals(
             "GeomFromText('POINT()',10)",
-            PMA\libraries\Util::createGISData("'POINT()',10")
+            Util::createGISData("'POINT()',10")
         );
     }
 
@@ -40,7 +42,7 @@ class UtilTest extends PMATestCase
      */
     public function testGetGISFunctions()
     {
-        $funcs = PMA\libraries\Util::getGISFunctions();
+        $funcs = Util::getGISFunctions();
         $this->assertArrayHasKey(
             'Dimension',
             $funcs
@@ -64,7 +66,7 @@ class UtilTest extends PMATestCase
     {
         $this->assertContains(
             '<select class="pageselector ajax" name="pma" >',
-            PMA\libraries\Util::pageselector("pma", 3)
+            Util::pageselector("pma", 3)
         );
     }
 
@@ -80,19 +82,19 @@ class UtilTest extends PMATestCase
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'enable';
         $this->assertEquals(
             true,
-            PMA\libraries\Util::isForeignKeyCheck()
+            Util::isForeignKeyCheck()
         );
 
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'disable';
         $this->assertEquals(
             false,
-            PMA\libraries\Util::isForeignKeyCheck()
+            Util::isForeignKeyCheck()
         );
 
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
         $this->assertEquals(
             true,
-            PMA\libraries\Util::isForeignKeyCheck()
+            Util::isForeignKeyCheck()
         );
     }
 
@@ -110,7 +112,7 @@ class UtilTest extends PMATestCase
     {
         $this->assertEquals(
             $expected,
-            PMA\libraries\Util::getCharsetQueryPart($collation)
+            Util::getCharsetQueryPart($collation)
         );
     }
 
@@ -138,13 +140,13 @@ class UtilTest extends PMATestCase
         $GLOBALS['server'] = 1;
 
         $this->assertTrue(
-            PMA\libraries\Util::isForeignKeySupported('innodb')
+            Util::isForeignKeySupported('innodb')
         );
         $this->assertFalse(
-            PMA\libraries\Util::isForeignKeySupported('myisam')
+            Util::isForeignKeySupported('myisam')
         );
         $this->assertTrue(
-            PMA\libraries\Util::isForeignKeySupported('ndb')
+            Util::isForeignKeySupported('ndb')
         );
     }
 
@@ -189,7 +191,7 @@ class UtilTest extends PMATestCase
     public function testHttpRequestCurl($url, $method, $return_only_status, $expected)
     {
         $this->checkCurl();
-        $result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status);
+        $result = Util::httpRequestCurl($url, $method, $return_only_status);
         $this->validateHttp($result, $expected);
     }
 
@@ -207,7 +209,7 @@ class UtilTest extends PMATestCase
     public function testHttpRequestCurlCAPath($url, $method, $return_only_status, $expected)
     {
         $this->checkCurl(true);
-        $result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAPATH);
+        $result = Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAPATH);
         $this->validateHttp($result, $expected);
     }
 
@@ -225,7 +227,7 @@ class UtilTest extends PMATestCase
     public function testHttpRequestCurlCAInfo($url, $method, $return_only_status, $expected)
     {
         $this->checkCurl(true);
-        $result = PMA\libraries\Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAINFO);
+        $result = Util::httpRequestCurl($url, $method, $return_only_status, null, '', CURLOPT_CAINFO);
         $this->validateHttp($result, $expected);
     }
 
@@ -245,7 +247,7 @@ class UtilTest extends PMATestCase
         if (! ini_get('allow_url_fopen')) {
             $this->markTestSkipped('allow_url_fopen not supported');
         }
-        $result = PMA\libraries\Util::httpRequestFopen($url, $method, $return_only_status);
+        $result = Util::httpRequestFopen($url, $method, $return_only_status);
         $this->validateHttp($result, $expected);
     }
 
@@ -266,7 +268,7 @@ class UtilTest extends PMATestCase
         if (! function_exists('curl_init') && ! ini_get('allow_url_fopen')) {
             $this->markTestSkipped('neither curl nor allow_url_fopen are supported');
         }
-        $result = PMA\libraries\Util::httpRequest($url, $method, $return_only_status);
+        $result = Util::httpRequest($url, $method, $return_only_status);
         $this->validateHttp($result, $expected);
     }
 
@@ -312,7 +314,7 @@ class UtilTest extends PMATestCase
      */
     public function testGenerateRandom()
     {
-        $this->assertEquals(32, strlen(PMA\libraries\Util::generateRandom(32)));
-        $this->assertEquals(16, strlen(PMA\libraries\Util::generateRandom(16)));
+        $this->assertEquals(32, strlen(Util::generateRandom(32)));
+        $this->assertEquals(16, strlen(Util::generateRandom(16)));
     }
 }
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index 542db328c8..20f7ffa8a0 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for methods in PMA\libraries\VersionInformation class
+ * Tests for methods in PhpMyAdmin\VersionInformation class
 *
 * @package PhpMyAdmin-test
 */
@@ -9,12 +9,12 @@
 /*
  * Include to test.
  */
-use PMA\libraries\VersionInformation;
+use PhpMyAdmin\VersionInformation;
 
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for methods in PMA\libraries\VersionInformation class
+ * Tests for methods in PhpMyAdmin\VersionInformation class
  *
  * @package PhpMyAdmin-test
  */
@@ -135,7 +135,7 @@ class VersionInformationTest extends PMATestCase
             array()
         );
 
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
+        $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
             ->setMethods(array('evaluateVersionCondition'))
             ->getMock();
 
@@ -172,7 +172,7 @@ class VersionInformationTest extends PMATestCase
             array()
         );
 
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
+        $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
             ->setMethods(array('evaluateVersionCondition'))
             ->getMock();
 
@@ -203,7 +203,7 @@ class VersionInformationTest extends PMATestCase
             array()
         );
 
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
+        $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
             ->setMethods(array('evaluateVersionCondition'))
             ->getMock();
 
@@ -239,7 +239,7 @@ class VersionInformationTest extends PMATestCase
      */
     public function testEvaluateVersionCondition()
     {
-        $mockVersionInfo = $this->getMockBuilder('PMA\libraries\VersionInformation')
+        $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
             ->setMethods(array('getPHPVersion'))
             ->getMock();
 
diff --git a/test/classes/config/FormDisplayTest.php b/test/classes/config/FormDisplayTest.php
index 654072409b..f2792781a5 100644
--- a/test/classes/config/FormDisplayTest.php
+++ b/test/classes/config/FormDisplayTest.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Config;
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 require_once 'libraries/config/config_functions.lib.php';
diff --git a/test/classes/config/FormTest.php b/test/classes/config/FormTest.php
index 36d944b2f9..52af842638 100644
--- a/test/classes/config/FormTest.php
+++ b/test/classes/config/FormTest.php
@@ -9,7 +9,7 @@
 use PhpMyAdmin\Config;
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\Form;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php
index 3d2ad43825..80ff74aed6 100644
--- a/test/classes/controllers/DatabaseStructureControllerTest.php
+++ b/test/classes/controllers/DatabaseStructureControllerTest.php
@@ -13,8 +13,8 @@
  */
 use PMA\libraries\controllers\database\DatabaseStructureController;
 use PMA\libraries\di\Container;
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Theme;
 
 require_once 'test/PMATestCase.php';
 require_once 'libraries/database_interface.inc.php';
@@ -57,7 +57,7 @@ class DatabaseStructureControllerTest extends PMATestCase
             define('PMA_USR_BROWSER_AGENT', 'Other');
         }
 
-        $table = $this->getMockBuilder('PMA\libraries\Table')
+        $table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         // Expect the table will have 6 rows
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php
index 9e2eb3416f..dc58bfe9b5 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/controllers/ServerBinlogControllerTest.php
@@ -6,10 +6,10 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 use PMA\libraries\controllers\server\ServerBinlogController;
 use PMA\libraries\di\Container;
-use PMA\libraries\Util;
+use PhpMyAdmin\Util;
 
 require_once 'test/PMATestCase.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php
index b28f56ef48..a66a294972 100644
--- a/test/classes/controllers/ServerCollationsControllerTest.php
+++ b/test/classes/controllers/ServerCollationsControllerTest.php
@@ -8,7 +8,7 @@
 
 use PMA\libraries\controllers\server\ServerCollationsController;
 use PhpMyAdmin\Core;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 /*
  * Include to test.
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index b35abcc48a..a95e81979d 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 use PhpMyAdmin\Charsets;
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php
index ca5cec79e8..9e3b412203 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/controllers/ServerEnginesControllerTest.php
@@ -7,9 +7,9 @@
  */
 
 use PhpMyAdmin\StorageEngine;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 use PMA\libraries\controllers\server\ServerEnginesController;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/database_interface.inc.php';
 
@@ -124,7 +124,7 @@ class ServerEnginesControllerTest extends PMATestCase
 
         //validate 2: Engine Mysql Help Page
         $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
+            PhpMyAdmin\Util::showMySQLDocu($engine_plugin->getMysqlHelpPage()),
             $html
         );
 
@@ -140,7 +140,7 @@ class ServerEnginesControllerTest extends PMATestCase
             $html
         );
         $this->assertContains(
-            URL::getCommon(
+            Url::getCommon(
                 array('engine' => $_REQUEST['engine'], 'page' => "Documentation")
             ),
             $html
@@ -148,7 +148,7 @@ class ServerEnginesControllerTest extends PMATestCase
 
         //validate 5: other items
         $this->assertContains(
-            URL::getCommon(array('engine' => $_REQUEST['engine'])),
+            Url::getCommon(array('engine' => $_REQUEST['engine'])),
             $html
         );
         $this->assertContains(
diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php
index c3976727fb..b60cccb3bf 100644
--- a/test/classes/controllers/ServerPluginsControllerTest.php
+++ b/test/classes/controllers/ServerPluginsControllerTest.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 use PMA\libraries\controllers\server\ServerPluginsController;
 use PMA\libraries\di\Container;
 
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index ee948757b8..69f390d5f1 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -8,8 +8,8 @@
 
 use PhpMyAdmin\Core;
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
@@ -176,7 +176,7 @@ class ServerVariablesControllerTest extends PMATestCase
 
         //Call the test function
         $html = $method->invoke($ctrl);
-        $url = 'server_variables.php' . URL::getCommon();
+        $url = 'server_variables.php' . Url::getCommon();
 
         //validate 1: URL
         $this->assertContains(
@@ -185,11 +185,11 @@ class ServerVariablesControllerTest extends PMATestCase
         );
         //validate 2: images
         $this->assertContains(
-            PMA\libraries\Util::getIcon('b_save.png', __('Save')),
+            PhpMyAdmin\Util::getIcon('b_save.png', __('Save')),
             $html
         );
         $this->assertContains(
-            PMA\libraries\Util::getIcon('b_close.png', __('Cancel')),
+            PhpMyAdmin\Util::getIcon('b_close.png', __('Cancel')),
             $html
         );
     }
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php
index 34cdf19728..6360e5b753 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -8,8 +8,8 @@
 
 use PMA\libraries\controllers\table\TableIndexesController;
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /*
@@ -86,7 +86,7 @@ class TableIndexesControllerTest extends PMATestCase
     {
         $sql_query = 'ALTER TABLE `db`.`table` DROP PRIMARY KEY, ADD UNIQUE ;';
 
-        $table = $this->getMockBuilder('PMA\libraries\Table')
+        $table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $table->expects($this->any())->method('getSqlQueryForIndexCreateOrEdit')
@@ -134,7 +134,7 @@ class TableIndexesControllerTest extends PMATestCase
      */
     public function testDisplayFormAction()
     {
-        $table = $this->getMockBuilder('PMA\libraries\Table')
+        $table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $table->expects($this->any())->method('getStatusInfo')
@@ -163,9 +163,9 @@ class TableIndexesControllerTest extends PMATestCase
         $ctrl->displayFormAction();
         $html = $response->getHTMLResult();
 
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs(
+            Url::getHiddenInputs(
                 array(
                     'db' => 'db',
                     'table' => 'table',
@@ -175,7 +175,7 @@ class TableIndexesControllerTest extends PMATestCase
             $html
         );
 
-        $doc_html = PMA\libraries\Util::showHint(
+        $doc_html = PhpMyAdmin\Util::showHint(
             PhpMyAdmin\Message::notice(
                 __(
                     '"PRIMARY" <b>must</b> be the name of'
@@ -189,7 +189,7 @@ class TableIndexesControllerTest extends PMATestCase
         );
 
         $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu('ALTER_TABLE'),
+            PhpMyAdmin\Util::showMySQLDocu('ALTER_TABLE'),
             $html
         );
 
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php
index 312b0cc004..a14f0ac927 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
@@ -74,7 +74,7 @@ class TableRelationControllerTest extends PMATestCase
         $viewColumns = array(
             'viewCol', 'viewCol2', 'viewCol3'
         );
-        $tableMock = $this->getMockBuilder('PMA\libraries\Table')
+        $tableMock = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         // Test the situation when the table is a view
@@ -120,7 +120,7 @@ class TableRelationControllerTest extends PMATestCase
         $indexedColumns = array(
             'primaryTableCol'
         );
-        $tableMock = $this->getMockBuilder('PMA\libraries\Table')
+        $tableMock = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         // Test the situation when the table is a view
diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/controllers/TableSearchControllerTest.php
index 2e43f38f3d..76067e3463 100644
--- a/test/classes/controllers/TableSearchControllerTest.php
+++ b/test/classes/controllers/TableSearchControllerTest.php
@@ -11,8 +11,8 @@
  */
 use PMA\libraries\controllers\table\TableSearchController;
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\TypesMySQL;
 
 require_once 'test/libraries/stubs/ResponseStub.php';
 require_once 'test/PMATestCase.php';
@@ -265,7 +265,7 @@ class TableSearchControllerTest extends PMATestCase
      */
     public function testGenerateWhereClause()
     {
-        $types = $this->getMockBuilder('PMA\libraries\Types')
+        $types = $this->getMockBuilder('PhpMyAdmin\Types')
             ->disableOriginalConstructor()
             ->getMock();
         $types->expects($this->any())->method('isUnaryOperator')
diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php
index 0978b84673..12581ca5d3 100644
--- a/test/classes/controllers/TableStructureControllerTest.php
+++ b/test/classes/controllers/TableStructureControllerTest.php
@@ -12,7 +12,7 @@
  * Include to test.
  */
 use PMA\libraries\di\Container;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
@@ -51,7 +51,7 @@ class TableStructureControllerTest extends PMATestCase
 
         //$_SESSION
 
-        $table = $this->getMockBuilder('PMA\libraries\Table')
+        $table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/test/classes/dbi/DBIMysqliTest.php b/test/classes/dbi/DBIMysqliTest.php
index b23db1e980..1b1d3e0198 100644
--- a/test/classes/dbi/DBIMysqliTest.php
+++ b/test/classes/dbi/DBIMysqliTest.php
@@ -9,7 +9,7 @@
  * Include to test.
  */
 use PMA\libraries\dbi\DBIMysqli;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php
index 90cf223e92..29daf2fb8b 100644
--- a/test/classes/navigation/NavigationTest.php
+++ b/test/classes/navigation/NavigationTest.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php
index 99250fce7a..17a4ff1ec1 100644
--- a/test/classes/navigation/NavigationTreeTest.php
+++ b/test/classes/navigation/NavigationTreeTest.php
@@ -11,7 +11,7 @@
  * since 'check_user_privileges.lib.php' will use it globally
  */
 use PMA\libraries\navigation\NavigationTree;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 $GLOBALS['server'] = 0;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
diff --git a/test/classes/navigation/NodeColumnContainerTest.php b/test/classes/navigation/NodeColumnContainerTest.php
index 549eefd2c1..e9e071462e 100644
--- a/test/classes/navigation/NodeColumnContainerTest.php
+++ b/test/classes/navigation/NodeColumnContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeColumnTest.php b/test/classes/navigation/NodeColumnTest.php
index cf9195c95e..1683c43cfd 100644
--- a/test/classes/navigation/NodeColumnTest.php
+++ b/test/classes/navigation/NodeColumnTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/navigation/NodeDatabaseChildTest.php
index 90daff01d1..481230d4ba 100644
--- a/test/classes/navigation/NodeDatabaseChildTest.php
+++ b/test/classes/navigation/NodeDatabaseChildTest.php
@@ -8,8 +8,8 @@
 
 use PMA\libraries\navigation\NodeFactory;
 use PMA\libraries\navigation\nodes\NodeDatabaseChild;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeDatabaseTest.php b/test/classes/navigation/NodeDatabaseTest.php
index eaefea529b..e13a17c053 100644
--- a/test/classes/navigation/NodeDatabaseTest.php
+++ b/test/classes/navigation/NodeDatabaseTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeEventContainerTest.php b/test/classes/navigation/NodeEventContainerTest.php
index 39a57c7387..5d7948901a 100644
--- a/test/classes/navigation/NodeEventContainerTest.php
+++ b/test/classes/navigation/NodeEventContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeEventTest.php b/test/classes/navigation/NodeEventTest.php
index cf835f60c6..4c333ef25b 100644
--- a/test/classes/navigation/NodeEventTest.php
+++ b/test/classes/navigation/NodeEventTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeFactoryTest.php b/test/classes/navigation/NodeFactoryTest.php
index f0697cf6ba..aaf18ed0ef 100644
--- a/test/classes/navigation/NodeFactoryTest.php
+++ b/test/classes/navigation/NodeFactoryTest.php
@@ -8,7 +8,7 @@
 
 use PMA\libraries\navigation\NodeFactory;
 use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeFunctionContainerTest.php b/test/classes/navigation/NodeFunctionContainerTest.php
index 16da8f3b97..2c5467dbde 100644
--- a/test/classes/navigation/NodeFunctionContainerTest.php
+++ b/test/classes/navigation/NodeFunctionContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeFunctionTest.php b/test/classes/navigation/NodeFunctionTest.php
index 0ae3e9c815..6e8e68b3f1 100644
--- a/test/classes/navigation/NodeFunctionTest.php
+++ b/test/classes/navigation/NodeFunctionTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeIndexContainerTest.php b/test/classes/navigation/NodeIndexContainerTest.php
index ec29facdb5..5844a00dd9 100644
--- a/test/classes/navigation/NodeIndexContainerTest.php
+++ b/test/classes/navigation/NodeIndexContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeIndexTest.php b/test/classes/navigation/NodeIndexTest.php
index c146ce839a..5b683c0ed3 100644
--- a/test/classes/navigation/NodeIndexTest.php
+++ b/test/classes/navigation/NodeIndexTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeProcedureContainerTest.php b/test/classes/navigation/NodeProcedureContainerTest.php
index 8602e721b5..bcfa90d858 100644
--- a/test/classes/navigation/NodeProcedureContainerTest.php
+++ b/test/classes/navigation/NodeProcedureContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeProcedureTest.php b/test/classes/navigation/NodeProcedureTest.php
index bccb8dc97f..2fa42f2ba9 100644
--- a/test/classes/navigation/NodeProcedureTest.php
+++ b/test/classes/navigation/NodeProcedureTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeTableContainerTest.php b/test/classes/navigation/NodeTableContainerTest.php
index 292d1428e3..efdfb32e4e 100644
--- a/test/classes/navigation/NodeTableContainerTest.php
+++ b/test/classes/navigation/NodeTableContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeTableTest.php b/test/classes/navigation/NodeTableTest.php
index b6d938c292..b91f66862a 100644
--- a/test/classes/navigation/NodeTableTest.php
+++ b/test/classes/navigation/NodeTableTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeTest.php b/test/classes/navigation/NodeTest.php
index c1886e52b1..b8903a19ba 100644
--- a/test/classes/navigation/NodeTest.php
+++ b/test/classes/navigation/NodeTest.php
@@ -8,7 +8,7 @@
 
 use PMA\libraries\navigation\NodeFactory;
 use PMA\libraries\navigation\nodes\Node;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/navigation/NodeTriggerContainerTest.php b/test/classes/navigation/NodeTriggerContainerTest.php
index 1cdf3b2298..d153107323 100644
--- a/test/classes/navigation/NodeTriggerContainerTest.php
+++ b/test/classes/navigation/NodeTriggerContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeTriggerTest.php b/test/classes/navigation/NodeTriggerTest.php
index 33b4521d4f..691de4ff64 100644
--- a/test/classes/navigation/NodeTriggerTest.php
+++ b/test/classes/navigation/NodeTriggerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeViewContainerTest.php b/test/classes/navigation/NodeViewContainerTest.php
index df3656c4df..dcdcf86ac6 100644
--- a/test/classes/navigation/NodeViewContainerTest.php
+++ b/test/classes/navigation/NodeViewContainerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/navigation/NodeViewTest.php b/test/classes/navigation/NodeViewTest.php
index 25aac20db6..647070c89a 100644
--- a/test/classes/navigation/NodeViewTest.php
+++ b/test/classes/navigation/NodeViewTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\navigation\NodeFactory;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/navigation/NodeFactory.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index afa7124005..1221f4bcef 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -7,7 +7,7 @@
  */
 
 use PMA\libraries\plugins\auth\AuthenticationCookie;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 $GLOBALS['PMA_Config'] = new PhpMyAdmin\Config();
 
diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php
index 46f58d381c..a2c8b905a2 100644
--- a/test/classes/plugin/export/ExportSqlTest.php
+++ b/test/classes/plugin/export/ExportSqlTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 use PMA\libraries\plugins\export\ExportSql;
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -1490,7 +1490,7 @@ class ExportSqlTest extends PMATestCase
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
 
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
+        $_table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $_table->expects($this->once())
@@ -1619,7 +1619,7 @@ class ExportSqlTest extends PMATestCase
                 null
             );
 
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
+        $_table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $_table->expects($this->once())
@@ -1673,7 +1673,7 @@ class ExportSqlTest extends PMATestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
+        $_table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $_table->expects($this->once())
@@ -1733,7 +1733,7 @@ class ExportSqlTest extends PMATestCase
             ->method('getError')
             ->will($this->returnValue('err'));
 
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
+        $_table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $_table->expects($this->once())
diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php
index 1f40757e45..85e6543584 100644
--- a/test/classes/plugin/export/ExportXmlTest.php
+++ b/test/classes/plugin/export/ExportXmlTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 use PMA\libraries\plugins\export\ExportXml;
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 
 $GLOBALS['db'] = 'db';
 
@@ -476,7 +476,7 @@ class ExportXmlTest extends PMATestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $_table = $this->getMockBuilder('PMA\libraries\Table')
+        $_table = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
         $_table->expects($this->once())
diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php
index 2e55486bb8..e15444066d 100644
--- a/test/classes/plugin/import/ImportCsvTest.php
+++ b/test/classes/plugin/import/ImportCsvTest.php
@@ -10,7 +10,7 @@
  * since 'check_user_privileges.lib.php' will use it globally
  */
 use PMA\libraries\plugins\import\ImportCsv;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 use PhpMyAdmin\File;
 
 $GLOBALS['server'] = 0;
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index c1d2858850..bebeeac05c 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/config/FormDisplay.tpl.php';
 require_once 'libraries/user_preferences.lib.php';
diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php
index 25a2e486e4..c7be718243 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@@ -9,9 +9,9 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\TypesMySQL;
+use PhpMyAdmin\Url;
 
 $GLOBALS['server'] = 1;
 
@@ -437,7 +437,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
         $result_1 = PMA_getHTMLforTableNavigation(25, 10, 'phpmyadmin');
         $this->assertContains(
             '<form action="db_central_columns.php" method="post">'
-            . URL::getHiddenInputs(
+            . Url::getHiddenInputs(
                 'phpmyadmin'
             ),
             $result_1
@@ -449,7 +449,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             $result_1
         );
         $this->assertContains(
-            PMA\libraries\Util::pageselector(
+            PhpMyAdmin\Util::pageselector(
                 'pos', 10, 2, 3
             ),
             $result_1
@@ -546,7 +546,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             $result
         );
         $this->assertContains(
-            URL::getHiddenInputs('phpmyadmin'),
+            Url::getHiddenInputs('phpmyadmin'),
             $result
         );
     }
@@ -640,7 +640,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             $result
         );
         $this->assertContains(
-            URL::getHiddenInputs('phpmyadmin')
+            Url::getHiddenInputs('phpmyadmin')
             . '<input type="hidden" name="add_column" value="add">'
             . '<input type="hidden" name="pos" value="0" />'
             . '<input type="hidden" name="total_rows" value="20"/>',
diff --git a/test/libraries/PMA_check_user_privileges_test.php b/test/libraries/PMA_check_user_privileges_test.php
index 6e1c01ff11..589e8896cf 100644
--- a/test/libraries/PMA_check_user_privileges_test.php
+++ b/test/libraries/PMA_check_user_privileges_test.php
@@ -12,8 +12,6 @@
 
 $GLOBALS['server'] = 1;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
-require_once 'libraries/Util.php';
-require_once 'libraries/Tracker.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/check_user_privileges.lib.php';
 
diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php
index ef1a9065c6..f9afd2844b 100644
--- a/test/libraries/PMA_display_change_password_test.php
+++ b/test/libraries/PMA_display_change_password_test.php
@@ -9,8 +9,8 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 
 require_once 'libraries/display_change_password.lib.php';
@@ -74,9 +74,9 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs(),
+            Url::getHiddenInputs(),
             $html
         );
 
diff --git a/test/libraries/PMA_display_create_table_test.php b/test/libraries/PMA_display_create_table_test.php
index 6ee8cd4233..0c09fed856 100644
--- a/test/libraries/PMA_display_create_table_test.php
+++ b/test/libraries/PMA_display_create_table_test.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 $GLOBALS['server'] = 0;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
@@ -66,7 +66,7 @@ class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
 
         //getImage
         $this->assertContains(
-            PMA\libraries\Util::getImage('b_table_add.png'),
+            PhpMyAdmin\Util::getImage('b_table_add.png'),
             $html
         );
 
@@ -76,9 +76,9 @@ class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs($db),
+            Url::getHiddenInputs($db),
             $html
         );
         //label
diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index 71953d6a4b..deb203830e 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/display_export.lib.php';
 require_once 'libraries/database_interface.inc.php';
@@ -91,7 +91,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
             $sql_query_str
         );
 
-        //validate 1: URL::getHiddenInputs
+        //validate 1: Url::getHiddenInputs
         //$single_table
         $this->assertContains(
             '<input type="hidden" name="single_table" value="TRUE"',
@@ -203,7 +203,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
             '<input type="checkbox" name="onserver" value="saveit" ',
             $html
         );
-        $dir = htmlspecialchars(PMA\libraries\Util::userDir($cfg['SaveDir']));
+        $dir = htmlspecialchars(PhpMyAdmin\Util::userDir($cfg['SaveDir']));
         $this->assertContains(
             'Save on server in the directory <b>' . $dir . '</b>',
             $html
diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php
index bf245e7046..85adf87484 100644
--- a/test/libraries/PMA_import_test.php
+++ b/test/libraries/PMA_import_test.php
@@ -6,7 +6,7 @@
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /*
  * Include to test.
@@ -399,11 +399,11 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase
             'db'        => 'PMA',
             'sql_query' => $simulated_query
         );
-        $matched_rows_url  = 'sql.php' . URL::getCommon($_url_params);
+        $matched_rows_url  = 'sql.php' . Url::getCommon($_url_params);
 
         $this->assertEquals(
             array(
-                'sql_query' => PMA\libraries\Util::formatSql(
+                'sql_query' => PhpMyAdmin\Util::formatSql(
                     $analyzed_sql_results['query']
                 ),
                 'matched_rows' => 2,
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 6ce9d1009a..ac5d55338a 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -9,11 +9,11 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Table;
-use PMA\libraries\Theme;
-use PMA\libraries\Tracker;
-use PMA\libraries\Types;
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\Table;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Tracker;
+use PhpMyAdmin\Types;
+use PhpMyAdmin\TypesMySQL;
 
 require_once 'libraries/insert_edit.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php
index 4dc51589ba..f25251257c 100644
--- a/test/libraries/PMA_mult_submits_test.php
+++ b/test/libraries/PMA_mult_submits_test.php
@@ -9,8 +9,8 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/mult_submits.lib.php';
 require_once 'libraries/database_interface.inc.php';
@@ -92,9 +92,9 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
             '<form id="ajax_form" action="delete_row" method="post">',
             $html
         );
-        //$URL::getHiddenInputs
+        //$Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs($_url_params),
+            Url::getHiddenInputs($_url_params),
             $html
         );
         //from_prefix
@@ -124,7 +124,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
         );
         //$_url_params
         $this->assertContains(
-            URL::getHiddenInputs($_url_params),
+            Url::getHiddenInputs($_url_params),
             $html
         );
         //from_prefix
@@ -158,7 +158,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
         );
         //validate 2: $_url_params
         $this->assertContains(
-            URL::getHiddenInputs($_url_params),
+            Url::getHiddenInputs($_url_params),
             $html
         );
         //validate 3: conform
diff --git a/test/libraries/PMA_normalization_test.php b/test/libraries/PMA_normalization_test.php
index 97be3b82c9..2f5ff98ec1 100644
--- a/test/libraries/PMA_normalization_test.php
+++ b/test/libraries/PMA_normalization_test.php
@@ -9,8 +9,8 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\TypesMySQL;
 
 $GLOBALS['server'] = 1;
 
@@ -485,7 +485,7 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
             '2nf'      => __('Second step of normalization (1NF+2NF)'),
             '3nf'  => __('Third step of normalization (1NF+2NF+3NF)'));
 
-        $html_tmp = PMA\libraries\Util::getRadioFields(
+        $html_tmp = PhpMyAdmin\Util::getRadioFields(
             'normalizeTo', $choices, '1nf', true
         );
         $this->assertContains($html_tmp, $result);
diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php
index 8a88a58011..63af5ed2c9 100644
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 $GLOBALS['server'] = 1;
 require_once 'libraries/operations.lib.php';
diff --git a/test/libraries/PMA_relation_test.php b/test/libraries/PMA_relation_test.php
index 7c3e8c5178..5e9402d815 100644
--- a/test/libraries/PMA_relation_test.php
+++ b/test/libraries/PMA_relation_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 
diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php
index 2fe494a97d..7bfce396de 100644
--- a/test/libraries/PMA_select_server_test.php
+++ b/test/libraries/PMA_select_server_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 require_once 'libraries/select_server.lib.php';
@@ -112,7 +112,7 @@ class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
 
         //$GLOBALS['cfg']['DefaultTabServer']
         $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
+            PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             ),
             $html
diff --git a/test/libraries/PMA_server_common_test.php b/test/libraries/PMA_server_common_test.php
index 9c258acc1a..508259e851 100644
--- a/test/libraries/PMA_server_common_test.php
+++ b/test/libraries/PMA_server_common_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 require_once 'libraries/server_common.lib.php';
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 1b79460d71..fbafa5ddbc 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 
 require_once 'libraries/database_interface.inc.php';
@@ -522,9 +522,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             '<form class="ajax" id="changeUserGroupForm"',
             $html
         );
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $params = array('username' => $username);
-        $html_output = URL::getHiddenInputs($params);
+        $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
             $html
@@ -561,9 +561,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             '<form class="ajax" id="changeUserGroupForm"',
             $actualHtml
         );
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $params = array('username' => $username);
-        $html_output = URL::getHiddenInputs($params);
+        $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
             $actualHtml
@@ -605,9 +605,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             '<form class="ajax" id="changeUserGroupForm"',
             $html
         );
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $params = array('username' => $username);
-        $html_output = URL::getHiddenInputs($params);
+        $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
             $html
@@ -706,7 +706,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $sql = "SELECT * FROM `mysql`.`db`"
             . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
             . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-            . " AND '" . PMA\libraries\Util::unescapeMysqlWildcards($db) . "'"
+            . " AND '" . PhpMyAdmin\Util::unescapeMysqlWildcards($db) . "'"
             . " LIKE `Db`;";
         $this->assertEquals(
             $sql,
@@ -723,7 +723,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             . " FROM `mysql`.`tables_priv`"
             . " WHERE `User` = '" . $GLOBALS['dbi']->escapeString($username) . "'"
             . " AND `Host` = '" . $GLOBALS['dbi']->escapeString($hostname) . "'"
-            . " AND `Db` = '" . PMA\libraries\Util::unescapeMysqlWildcards($db) . "'"
+            . " AND `Db` = '" . PhpMyAdmin\Util::unescapeMysqlWildcards($db) . "'"
             . " AND `Table_name` = '" . $GLOBALS['dbi']->escapeString($table) . "';";
         $this->assertEquals(
             $sql,
@@ -1339,7 +1339,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        $output = PMA\libraries\Util::showHint(
+        $output = PhpMyAdmin\Util::showHint(
             __(
                 'When Host table is used, this field is ignored '
                 . 'and values stored in Host table are used instead.'
@@ -1431,9 +1431,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getHtmlForAddUser($dbname);
 
-        //validate 1: URL::getHiddenInputs
+        //validate 1: Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs('', ''),
+            Url::getHiddenInputs('', ''),
             $html
         );
 
@@ -1449,7 +1449,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        $item = PMA\libraries\Template::get('checkbox')
+        $item = PhpMyAdmin\Template::get('checkbox')
             ->render(
                 array(
                     'html_field_name'   => 'createdb-2',
@@ -1506,9 +1506,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getHtmlForSpecificDbPrivileges($db);
 
-        //validate 1: URL::getCommon
+        //validate 1: Url::getCommon
         $this->assertContains(
-            URL::getCommon(array('db' => $db)),
+            Url::getCommon(array('db' => $db)),
             $html
         );
 
@@ -1550,7 +1550,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            URL::getCommon(array('checkprivsdb' => $db)),
+            Url::getCommon(array('checkprivsdb' => $db)),
             $html
         );
 
@@ -1591,8 +1591,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //validate 2: URL::getCommon
-        $item = URL::getCommon(
+        //validate 2: Url::getCommon
+        $item = Url::getCommon(
             array(
                 'db' => $db,
                 'table' => $table,
@@ -1635,7 +1635,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            URL::getCommon(
+            Url::getCommon(
                 array('checkprivsdb' => $db, 'checkprivstable' => $table)
             ),
             $html
@@ -1731,7 +1731,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             'edit', $username, $hostname, $dbname, $tablename, ''
         );
 
-        $url_html = URL::getCommon(
+        $url_html = Url::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1753,7 +1753,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             'revoke', $username, $hostname, $dbname, $tablename, ''
         );
 
-        $url_html = URL::getCommon(
+        $url_html = Url::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1774,7 +1774,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getUserLink('export', $username, $hostname);
 
-        $url_html = URL::getCommon(
+        $url_html = Url::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1841,7 +1841,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         //sql_query
         $this->assertEquals(
-            PMA\libraries\Util::getMessage(null, $sql_query),
+            PhpMyAdmin\Util::getMessage(null, $sql_query),
             $extra_data['sql_query']
         );
 
@@ -1897,9 +1897,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         //PMA_getChangeLoginInformationHtmlForm
         $html = PMA_getChangeLoginInformationHtmlForm($username, $hostname);
 
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs('', ''),
+            Url::getHiddenInputs('', ''),
             $html
         );
 
@@ -1988,12 +1988,12 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
+            PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             ),
             $html
         );
-        $item = URL::getCommon(
+        $item = Url::getCommon(
             array(
                 'db' => $url_dbname,
                 'reload' => 1
@@ -2014,12 +2014,12 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            PMA\libraries\Util::getScriptNameForOption(
+            PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabTable'], 'table'
             ),
             $html
         );
-        $item = URL::getCommon(
+        $item = Url::getCommon(
             array(
                 'db' => $url_dbname,
                 'table' => $tablename,
@@ -2034,7 +2034,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             htmlspecialchars($tablename),
             $html
         );
-        $item = PMA\libraries\Util::getTitleForTarget(
+        $item = PhpMyAdmin\Util::getTitleForTarget(
             $GLOBALS['cfg']['DefaultTabTable']
         );
         $this->assertContains(
@@ -2060,9 +2060,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $result, $db_rights, $pmaThemeImage, $text_dir
         );
 
-        //URL::getHiddenInputs
+        //Url::getHiddenInputs
         $this->assertContains(
-            URL::getHiddenInputs('', ''),
+            Url::getHiddenInputs('', ''),
             $html
         );
 
@@ -2084,9 +2084,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA\libraries\Util::showHint
+        //PhpMyAdmin\Util::showHint
         $this->assertContains(
-            PMA\libraries\Util::showHint(
+            PhpMyAdmin\Util::showHint(
                 __('Note: MySQL privilege names are expressed in English.')
             ),
             $html
@@ -2142,9 +2142,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $result, $db_rights, $pmaThemeImage, $text_dir
         );
 
-        //URL::getCommon
+        //Url::getCommon
         $this->assertContains(
-            URL::getCommon(array('adduser' => 1)),
+            Url::getCommon(array('adduser' => 1)),
             $html
         );
 
@@ -2215,11 +2215,11 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $html = PMA_getAddUserHtmlFieldset();
 
         $this->assertContains(
-            URL::getCommon(array('adduser' => 1)),
+            Url::getCommon(array('adduser' => 1)),
             $html
         );
         $this->assertContains(
-            PMA\libraries\Util::getIcon('b_usradd.png'),
+            PhpMyAdmin\Util::getIcon('b_usradd.png'),
             $html
         );
         $this->assertContains(
@@ -2258,8 +2258,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //URL::getCommon
-        $item = URL::getCommon(
+        //Url::getCommon
+        $item = Url::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -2294,8 +2294,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //URL::getCommon
-        $item = URL::getCommon(
+        //Url::getCommon
+        $item = Url::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
index 79d19f14a6..6b35628c6f 100644
--- a/test/libraries/PMA_server_replication_test.php
+++ b/test/libraries/PMA_server_replication_test.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index ebc7b489cf..30451290ee 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/server_status_advisor.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index ee0fedee7f..2de34f1fed 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/server_status_monitor.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php
index 51ecf601f0..6bcc56ce78 100644
--- a/test/libraries/PMA_server_status_processes_test.php
+++ b/test/libraries/PMA_server_status_processes_test.php
@@ -7,8 +7,8 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 
 require_once 'libraries/server_status_processes.lib.php';
@@ -201,7 +201,7 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
             'ajax_request' => true
         );
         $kill_process = 'server_status_processes.php'
-            . URL::getCommon($url_params);
+            . Url::getCommon($url_params);
         $this->assertContains(
             $kill_process,
             $html
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index 7e7c607cc7..c9c5d23ebe 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/server_status_queries.lib.php';
 require_once 'libraries/database_interface.inc.php';
@@ -128,7 +128,7 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
 
         $questions_from_start = sprintf(
             __('Questions since startup: %s'),
-            PMA\libraries\Util::formatNumber($total_queries, 0)
+            PhpMyAdmin\Util::formatNumber($total_queries, 0)
         );
 
         //validate 1: PMA_getHtmlForQueryStatistics
@@ -147,12 +147,12 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            PMA\libraries\Util::formatNumber($total_queries * $hour_factor, 0),
+            PhpMyAdmin\Util::formatNumber($total_queries * $hour_factor, 0),
             $html
         );
 
         //validate 3:per minute
-        $value_per_minute = PMA\libraries\Util::formatNumber(
+        $value_per_minute = PhpMyAdmin\Util::formatNumber(
             $total_queries * 60 / $this->ServerStatusData->status['Uptime'],
             0
         );
diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php
index 753d8f238d..98f4cb3a7d 100644
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/server_status.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 97d9816a98..bdb21d5b24 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\ServerStatusData;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 require_once 'libraries/server_status_variables.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index 6c0f53e60c..7dd23c1180 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 
 
@@ -77,7 +77,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a href="server_user_groups.php'
-            . URL::getCommon(array('addUserGroup' => 1));
+            . Url::getCommon(array('addUserGroup' => 1));
         $this->assertContains(
             $url_tag,
             $html
@@ -131,7 +131,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
                 )
@@ -141,7 +141,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'editUserGroup'=>1,
                     'userGroup'=>htmlspecialchars('usergroup')
@@ -152,7 +152,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 array(
                     'deleteUserGroup'=> 1,
                     'userGroup'=>htmlspecialchars('usergroup')
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 2fa7b34410..dac3b6c4e0 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -8,8 +8,8 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Encoding;
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 //the following definition should be used globally
 $GLOBALS['server'] = 0;
@@ -126,7 +126,7 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
 
         //validate 3: showMySQLDocu
         $this->assertContains(
-            PMA\libraries\Util::showMySQLDocu('SELECT'),
+            PhpMyAdmin\Util::showMySQLDocu('SELECT'),
             $html
         );
 
@@ -199,7 +199,7 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
         $table  = $GLOBALS['table'];
         $db     = $GLOBALS['db'];
         $this->assertContains(
-            URL::getHiddenInputs($db, $table),
+            Url::getHiddenInputs($db, $table),
             $html
         );
 
diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
index b4f9272b2c..6e9a80ac51 100644
--- a/test/libraries/PMA_tbl_tracking_test.php
+++ b/test/libraries/PMA_tbl_tracking_test.php
@@ -9,8 +9,8 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
-use PMA\libraries\URL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\Url;
 
 require_once 'libraries/tracking.lib.php';
 
@@ -179,7 +179,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
         );
 
         $this->assertContains(
-            URL::getHiddenInputs($GLOBALS['db']),
+            Url::getHiddenInputs($GLOBALS['db']),
             $html
         );
 
@@ -631,7 +631,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
         );
 
         $version = '<form method="post" action="tbl_tracking.php'
-            . URL::getCommon(
+            . Url::getCommon(
                 $url_params + array(
                     'report' => 'true', 'version' => $_REQUEST['version']
                 )
diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php
index fc101cbb21..234d4f7133 100644
--- a/test/libraries/common/PMA_browseUploadFile_test.php
+++ b/test/libraries/common/PMA_browseUploadFile_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\Util::getBrowseUploadFileBlock from common.lib
+ * Test for PhpMyAdmin\Util::getBrowseUploadFileBlock from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- * Test for PMA\libraries\Util::getBrowseUploadFileBlock from common.lib
+ * Test for PhpMyAdmin\Util::getBrowseUploadFileBlock from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -49,7 +49,7 @@ class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\Util::getBrowseUploadFileBlock
+     * Test for PhpMyAdmin\Util::getBrowseUploadFileBlock
      *
      * @param int    $size Size
      * @param string $unit Unit
@@ -62,7 +62,7 @@ class PMA_GetBrowseUploadFileBlock_Test extends PHPUnit_Framework_TestCase
     function testBrowseUploadFile($size, $unit, $res)
     {
         $this->assertEquals(
-            PMA\libraries\Util::getBrowseUploadFileBlock($size),
+            PhpMyAdmin\Util::getBrowseUploadFileBlock($size),
             '<label for="input_import_file">' . __("Browse your computer:")
             . '</label>'
             . '<div id="upload_form_status" class="hide"></div>'
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index 7dc54d571a..587d5cf963 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA\libraries\Util::buildActionTitles from common.lib
+ * Test for PhpMyAdmin\Util::buildActionTitles from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -10,13 +10,13 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 
 
 /**
- * Test for PMA\libraries\Util::buildActionTitles from common.lib
+ * Test for PhpMyAdmin\Util::buildActionTitles from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -41,27 +41,27 @@ class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
     function testBuildActionTitles()
     {
         $titles = array();
-        $titles['Browse']     = PMA\libraries\Util::getIcon('b_browse.png', __('Browse'));
-        $titles['NoBrowse']   = PMA\libraries\Util::getIcon('bd_browse.png', __('Browse'));
-        $titles['Search']     = PMA\libraries\Util::getIcon('b_select.png', __('Search'));
-        $titles['NoSearch']   = PMA\libraries\Util::getIcon('bd_select.png', __('Search'));
-        $titles['Insert']     = PMA\libraries\Util::getIcon('b_insrow.png', __('Insert'));
-        $titles['NoInsert']   = PMA\libraries\Util::getIcon('bd_insrow.png', __('Insert'));
-        $titles['Structure']  = PMA\libraries\Util::getIcon('b_props.png', __('Structure'));
-        $titles['Drop']       = PMA\libraries\Util::getIcon('b_drop.png', __('Drop'));
-        $titles['NoDrop']     = PMA\libraries\Util::getIcon('bd_drop.png', __('Drop'));
-        $titles['Empty']      = PMA\libraries\Util::getIcon('b_empty.png', __('Empty'));
-        $titles['NoEmpty']    = PMA\libraries\Util::getIcon('bd_empty.png', __('Empty'));
-        $titles['Edit']       = PMA\libraries\Util::getIcon('b_edit.png', __('Edit'));
-        $titles['NoEdit']     = PMA\libraries\Util::getIcon('bd_edit.png', __('Edit'));
-        $titles['Export']     = PMA\libraries\Util::getIcon('b_export.png', __('Export'));
-        $titles['NoExport']   = PMA\libraries\Util::getIcon('bd_export.png', __('Export'));
-        $titles['Execute']    = PMA\libraries\Util::getIcon('b_nextpage.png', __('Execute'));
-        $titles['NoExecute']  = PMA\libraries\Util::getIcon('bd_nextpage.png', __('Execute'));
-        $titles['Favorite']   = PMA\libraries\Util::getIcon('b_favorite.png', '');
-        $titles['NoFavorite'] = PMA\libraries\Util::getIcon('b_no_favorite.png', '');
+        $titles['Browse']     = PhpMyAdmin\Util::getIcon('b_browse.png', __('Browse'));
+        $titles['NoBrowse']   = PhpMyAdmin\Util::getIcon('bd_browse.png', __('Browse'));
+        $titles['Search']     = PhpMyAdmin\Util::getIcon('b_select.png', __('Search'));
+        $titles['NoSearch']   = PhpMyAdmin\Util::getIcon('bd_select.png', __('Search'));
+        $titles['Insert']     = PhpMyAdmin\Util::getIcon('b_insrow.png', __('Insert'));
+        $titles['NoInsert']   = PhpMyAdmin\Util::getIcon('bd_insrow.png', __('Insert'));
+        $titles['Structure']  = PhpMyAdmin\Util::getIcon('b_props.png', __('Structure'));
+        $titles['Drop']       = PhpMyAdmin\Util::getIcon('b_drop.png', __('Drop'));
+        $titles['NoDrop']     = PhpMyAdmin\Util::getIcon('bd_drop.png', __('Drop'));
+        $titles['Empty']      = PhpMyAdmin\Util::getIcon('b_empty.png', __('Empty'));
+        $titles['NoEmpty']    = PhpMyAdmin\Util::getIcon('bd_empty.png', __('Empty'));
+        $titles['Edit']       = PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit'));
+        $titles['NoEdit']     = PhpMyAdmin\Util::getIcon('bd_edit.png', __('Edit'));
+        $titles['Export']     = PhpMyAdmin\Util::getIcon('b_export.png', __('Export'));
+        $titles['NoExport']   = PhpMyAdmin\Util::getIcon('bd_export.png', __('Export'));
+        $titles['Execute']    = PhpMyAdmin\Util::getIcon('b_nextpage.png', __('Execute'));
+        $titles['NoExecute']  = PhpMyAdmin\Util::getIcon('bd_nextpage.png', __('Execute'));
+        $titles['Favorite']   = PhpMyAdmin\Util::getIcon('b_favorite.png', '');
+        $titles['NoFavorite'] = PhpMyAdmin\Util::getIcon('b_no_favorite.png', '');
 
-        $this->assertEquals($titles, PMA\libraries\Util::buildActionTitles());
+        $this->assertEquals($titles, PhpMyAdmin\Util::buildActionTitles());
 
     }
 }
diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php
index ef18a29448..047442cb20 100644
--- a/test/libraries/common/PMA_cache_test.php
+++ b/test/libraries/common/PMA_cache_test.php
@@ -50,28 +50,28 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
     public function testCacheExists()
     {
         $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 5);
-        PMA\libraries\Util::cacheSet('test_data_2', 5);
+        PhpMyAdmin\Util::cacheSet('test_data', 5);
+        PhpMyAdmin\Util::cacheSet('test_data_2', 5);
 
-        $this->assertTrue(PMA\libraries\Util::cacheExists('test_data'));
-        $this->assertTrue(PMA\libraries\Util::cacheExists('test_data_2'));
-        $this->assertFalse(PMA\libraries\Util::cacheExists('fake_data_2'));
+        $this->assertTrue(PhpMyAdmin\Util::cacheExists('test_data'));
+        $this->assertTrue(PhpMyAdmin\Util::cacheExists('test_data_2'));
+        $this->assertFalse(PhpMyAdmin\Util::cacheExists('fake_data_2'));
     }
 
     /**
-     * Test if PMA\libraries\Util::cacheGet does not return data for non existing cache entries
+     * Test if PhpMyAdmin\Util::cacheGet does not return data for non existing cache entries
      *
      * @return void
      */
     public function testCacheGet()
     {
         $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 5);
-        PMA\libraries\Util::cacheSet('test_data_2', 5);
+        PhpMyAdmin\Util::cacheSet('test_data', 5);
+        PhpMyAdmin\Util::cacheSet('test_data_2', 5);
 
-        $this->assertNotNull(PMA\libraries\Util::cacheGet('test_data'));
-        $this->assertNotNull(PMA\libraries\Util::cacheGet('test_data_2'));
-        $this->assertNull(PMA\libraries\Util::cacheGet('fake_data_2'));
+        $this->assertNotNull(PhpMyAdmin\Util::cacheGet('test_data'));
+        $this->assertNotNull(PhpMyAdmin\Util::cacheGet('test_data_2'));
+        $this->assertNull(PhpMyAdmin\Util::cacheGet('fake_data_2'));
     }
 
     /**
@@ -82,11 +82,11 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
     public function testCacheSetGet()
     {
         $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 25);
+        PhpMyAdmin\Util::cacheSet('test_data', 25);
 
-        PMA\libraries\Util::cacheSet('test_data', 5);
+        PhpMyAdmin\Util::cacheSet('test_data', 5);
         $this->assertEquals(5, $_SESSION['cache']['server_server']['test_data']);
-        PMA\libraries\Util::cacheSet('test_data_3', 3);
+        PhpMyAdmin\Util::cacheSet('test_data_3', 3);
         $this->assertEquals(3, $_SESSION['cache']['server_server']['test_data_3']);
     }
 
@@ -98,15 +98,15 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
     public function testCacheUnSet()
     {
         $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('test_data', 25);
-        PMA\libraries\Util::cacheSet('test_data_2', 25);
+        PhpMyAdmin\Util::cacheSet('test_data', 25);
+        PhpMyAdmin\Util::cacheSet('test_data_2', 25);
 
-        PMA\libraries\Util::cacheUnset('test_data');
+        PhpMyAdmin\Util::cacheUnset('test_data');
         $this->assertArrayNotHasKey(
             'test_data',
             $_SESSION['cache']['server_server']
         );
-        PMA\libraries\Util::cacheUnset('test_data_2');
+        PhpMyAdmin\Util::cacheUnset('test_data_2');
         $this->assertArrayNotHasKey(
             'test_data_2',
             $_SESSION['cache']['server_server']
@@ -121,13 +121,13 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
     public function testClearUserCache()
     {
         $GLOBALS['server'] = 'server';
-        PMA\libraries\Util::cacheSet('is_superuser', 'yes');
+        PhpMyAdmin\Util::cacheSet('is_superuser', 'yes');
         $this->assertEquals(
             'yes',
             $_SESSION['cache']['server_server']['is_superuser']
         );
 
-        PMA\libraries\Util::clearUserCache();
+        PhpMyAdmin\Util::clearUserCache();
         $this->assertArrayNotHasKey(
             'is_superuser',
             $_SESSION['cache']['server_server']
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index ae3d36e108..427df6cf93 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::checkParameters from Util.php
+ ** Test for PhpMyAdmin\Util::checkParameters from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -11,10 +11,10 @@
  * Include to test.
  */
 use PhpMyAdmin\Core;
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 /**
- ** Test for PMA\libraries\Util::checkParameters from Util.php
+ ** Test for PhpMyAdmin\Util::checkParameters from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -45,7 +45,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
 
         $this->expectOutputRegex("/Missing parameter: field/");
 
-        PMA\libraries\Util::checkParameters(
+        PhpMyAdmin\Util::checkParameters(
             array('db', 'table', 'field')
         );
     }
@@ -65,7 +65,7 @@ class PMA_CheckParameters_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['sql_query'] = "SELECT * FROM tblTable;";
 
         $this->expectOutputString("");
-        PMA\libraries\Util::checkParameters(
+        PhpMyAdmin\Util::checkParameters(
             array('db', 'table', 'field', 'sql_query')
         );
     }
diff --git a/test/libraries/common/PMA_checkbox_test.php b/test/libraries/common/PMA_checkbox_test.php
index 7637be7968..507a1b5259 100644
--- a/test/libraries/common/PMA_checkbox_test.php
+++ b/test/libraries/common/PMA_checkbox_test.php
@@ -33,7 +33,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         // assertXmlStringEqualsXmlString require both inputs to be a valid xml string
         // dummy <root> tag will make input a valid xml string
         $this->assertXmlStringEqualsXmlString(
-            '<root> ' . PMA\libraries\Template::get('checkbox')
+            '<root> ' . PhpMyAdmin\Template::get('checkbox')
             ->render(
                 array(
                     'html_field_name'   => $name,
@@ -60,7 +60,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertXmlStringEqualsXmlString(
-            '<root>' . PMA\libraries\Template::get('checkbox')
+            '<root>' . PhpMyAdmin\Template::get('checkbox')
             ->render(
                 array(
                     'html_field_name'   => $name,
@@ -87,7 +87,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertXmlStringEqualsXmlString(
-            '<root>' . PMA\libraries\Template::get('checkbox')
+            '<root>' . PhpMyAdmin\Template::get('checkbox')
             ->render(
                 array(
                     'html_field_name'   => $name,
@@ -114,7 +114,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertXmlStringEqualsXmlString(
-            '<root>' . PMA\libraries\Template::get('checkbox')
+            '<root>' . PhpMyAdmin\Template::get('checkbox')
             ->render(
                 array(
                     'html_field_name'   => $name,
diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
index fee6f32df8..10653f6e8c 100644
--- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::containsNonPrintableAscii from common.lib
+ ** Test for PhpMyAdmin\Util::containsNonPrintableAscii from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::containsNonPrintableAscii from common.lib
+ ** Test for PhpMyAdmin\Util::containsNonPrintableAscii from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -49,7 +49,7 @@ class PMA_ContainsNonPrintableAsciiTest extends PHPUnit_Framework_TestCase
     public function testContainsNonPrintableAscii($str, $res)
     {
         $this->assertEquals(
-            $res, PMA\libraries\Util::containsNonPrintableAscii($str)
+            $res, PhpMyAdmin\Util::containsNonPrintableAscii($str)
         );
     }
 
diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php
index 3949a20398..0d013323e6 100644
--- a/test/libraries/common/PMA_convert_bit_default_value_test.php
+++ b/test/libraries/common/PMA_convert_bit_default_value_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::convertBitDefaultValue from common.lib
+ ** Test for PhpMyAdmin\Util::convertBitDefaultValue from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::convertBitDefaultValue from common.lib
+ ** Test for PhpMyAdmin\Util::convertBitDefaultValue from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -50,7 +50,7 @@ class PMA_ConvertBitDefaultValueTest extends PHPUnit_Framework_TestCase
     public function testConvertBitDefaultValueTest($bit, $val)
     {
         $this->assertEquals(
-            $val, PMA\libraries\Util::convertBitDefaultValue($bit)
+            $val, PhpMyAdmin\Util::convertBitDefaultValue($bit)
         );
 
     }
diff --git a/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
index 66a3502067..7a9777c36d 100644
--- a/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+++ b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
@@ -40,7 +40,7 @@ class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * PMA\libraries\Util::escapeMysqlWildcards tests
+     * PhpMyAdmin\Util::escapeMysqlWildcards tests
      *
      * @param string $a String to escape
      * @param string $b Expected value
@@ -52,12 +52,12 @@ class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
     public function testEscape($a, $b)
     {
         $this->assertEquals(
-            $a, PMA\libraries\Util::escapeMysqlWildcards($b)
+            $a, PhpMyAdmin\Util::escapeMysqlWildcards($b)
         );
     }
 
     /**
-     * PMA\libraries\Util::unescapeMysqlWildcards tests
+     * PhpMyAdmin\Util::unescapeMysqlWildcards tests
      *
      * @param string $a String to escape
      * @param string $b Expected value
@@ -69,7 +69,7 @@ class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
     public function testUnEscape($a, $b)
     {
         $this->assertEquals(
-            $b, PMA\libraries\Util::unescapeMysqlWildcards($a)
+            $b, PhpMyAdmin\Util::unescapeMysqlWildcards($a)
         );
     }
 }
diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php
index 7e8d6764dd..85cb658faa 100644
--- a/test/libraries/common/PMA_expandUserString_test.php
+++ b/test/libraries/common/PMA_expandUserString_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::expandUserString from Util.php
+ ** Test for PhpMyAdmin\Util::expandUserString from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -14,7 +14,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::expandUserString function.
+ ** Test for PhpMyAdmin\Util::expandUserString function.
  *
  * @package PhpMyAdmin-test
  */
@@ -54,7 +54,7 @@ class PMA_ExpandUserString_Test extends PHPUnit_Framework_TestCase
     {
         $out = str_replace('PMA_VERSION', PMA_VERSION, $out);
         $this->assertEquals(
-            $out, PMA\libraries\Util::expandUserString($in)
+            $out, PhpMyAdmin\Util::expandUserString($in)
         );
     }
 
@@ -73,7 +73,7 @@ class PMA_ExpandUserString_Test extends PHPUnit_Framework_TestCase
         $out = str_replace('PMA_VERSION', PMA_VERSION, $out);
         $this->assertEquals(
             htmlspecialchars($out),
-            PMA\libraries\Util::expandUserString(
+            PhpMyAdmin\Util::expandUserString(
                 $in, 'htmlspecialchars'
             )
         );
diff --git a/test/libraries/common/PMA_extractColumnSpec_test.php b/test/libraries/common/PMA_extractColumnSpec_test.php
index c625aa7861..1b85b42fdb 100644
--- a/test/libraries/common/PMA_extractColumnSpec_test.php
+++ b/test/libraries/common/PMA_extractColumnSpec_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::extractColumnSpec from Util.php
+ ** Test for PhpMyAdmin\Util::extractColumnSpec from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::extractColumnSpec function.
+ ** Test for PhpMyAdmin\Util::extractColumnSpec function.
  *
  * @package PhpMyAdmin-test
  */
@@ -42,7 +42,7 @@ class PMA_ExtractColumnSpec_Test extends PHPUnit_Framework_TestCase
     public function testParsing($in, $out)
     {
         $this->assertEquals(
-            $out, PMA\libraries\Util::extractColumnSpec($in)
+            $out, PhpMyAdmin\Util::extractColumnSpec($in)
         );
     }
 
diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
index 45413e7f9e..79dbc0ae49 100644
--- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::extractValueFromFormattedSize from common.lib
+ ** Test for PhpMyAdmin\Util::extractValueFromFormattedSize from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::extractValueFromFormattedSize from common.lib
+ ** Test for PhpMyAdmin\Util::extractValueFromFormattedSize from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -34,7 +34,7 @@ class PMA_ExtractValueFromFormattedSize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             $expected,
-            PMA\libraries\Util::extractValueFromFormattedSize($size)
+            PhpMyAdmin\Util::extractValueFromFormattedSize($size)
         );
     }
 
diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php
index d4cf0eea23..f49d6e2423 100644
--- a/test/libraries/common/PMA_foreignKeySupported_test.php
+++ b/test/libraries/common/PMA_foreignKeySupported_test.php
@@ -47,7 +47,7 @@ class PMA_IsForeignKeySupportedTest extends PHPUnit_Framework_TestCase
     public function testForeignkeySupported($a, $e)
     {
         $this->assertEquals(
-            $e, PMA\libraries\Util::isForeignKeySupported($a)
+            $e, PhpMyAdmin\Util::isForeignKeySupported($a)
         );
     }
 }
diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php
index 81e00f0d0a..d3a3d237cf 100644
--- a/test/libraries/common/PMA_formatNumberByteDown_test.php
+++ b/test/libraries/common/PMA_formatNumberByteDown_test.php
@@ -94,7 +94,7 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             $d,
-            (string) PMA\libraries\Util::formatNumber(
+            (string) PhpMyAdmin\Util::formatNumber(
                 $a, $b, $c, false
             )
         );
@@ -165,7 +165,7 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase
      */
     public function testFormatByteDown($a, $b, $c, $e)
     {
-        $result = PMA\libraries\Util::formatByteDown($a, $b, $c);
+        $result = PhpMyAdmin\Util::formatByteDown($a, $b, $c);
         $result[0] = trim($result[0]);
         $this->assertEquals($e, $result);
     }
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index 1e8607d890..39338e40d4 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::formatSql from Util.php
+ ** Test for PhpMyAdmin\Util::formatSql from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::formatSql from Util.php
+ ** Test for PhpMyAdmin\Util::formatSql from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -32,7 +32,7 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
             '<code class="sql"><pre>' . "\n"
             . 'SELECT 1 &lt; 2' . "\n"
             . '</pre></code>',
-            PMA\libraries\Util::formatSql('SELECT 1 < 2')
+            PhpMyAdmin\Util::formatSql('SELECT 1 < 2')
         );
     }
 
@@ -49,7 +49,7 @@ class PMA_FormatSql_Test extends PHPUnit_Framework_TestCase
             '<code class="sql"><pre>' . "\n"
             . 'SELECT[...]' . "\n"
             . '</pre></code>',
-            PMA\libraries\Util::formatSql('SELECT 1 < 2', true)
+            PhpMyAdmin\Util::formatSql('SELECT 1 < 2', true)
         );
     }
 }
diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
index d8c9c65bc1..87becc7bd8 100644
--- a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::generateHiddenMaxFileSize from Util.php
+ ** Test for PhpMyAdmin\Util::generateHiddenMaxFileSize from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::generateHiddenMaxFileSize from Util.php
+ ** Test for PhpMyAdmin\Util::generateHiddenMaxFileSize from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -50,7 +50,7 @@ class PMA_GenerateHiddenMaxFileSize_Test extends PHPUnit_Framework_TestCase
     function testGenerateHiddenMaxFileSize($size)
     {
         $this->assertEquals(
-            PMA\libraries\Util::generateHiddenMaxFileSize($size),
+            PhpMyAdmin\Util::generateHiddenMaxFileSize($size),
             '<input type="hidden" name="MAX_FILE_SIZE" value="' . $size . '" />'
         );
     }
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index c400782478..3586097256 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -37,7 +37,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
     function testGetDbLinkEmpty()
     {
         $GLOBALS['db'] = null;
-        $this->assertEmpty(PMA\libraries\Util::getDbLink());
+        $this->assertEmpty(PhpMyAdmin\Util::getDbLink());
     }
 
     /**
@@ -54,7 +54,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
         $database = $GLOBALS['db'];
         $this->assertEquals(
             '<a href="'
-            . PMA\libraries\Util::getScriptNameForOption(
+            . PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
             . '?db=' . $database
@@ -62,7 +62,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
             . 'title="Jump to database “'
             . htmlspecialchars($database) . '”.">'
             . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink()
+            PhpMyAdmin\Util::getDbLink()
         );
     }
 
@@ -76,14 +76,14 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
         global $cfg;
         $database = 'test_database';
         $this->assertEquals(
-            '<a href="' . PMA\libraries\Util::getScriptNameForOption(
+            '<a href="' . PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
             . '?db=' . $database
             . '&amp;server=99&amp;lang=en" title="Jump to database “'
             . htmlspecialchars($database) . '”.">'
             . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink($database)
+            PhpMyAdmin\Util::getDbLink($database)
         );
     }
 
@@ -98,7 +98,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
         $database = 'test&data\'base';
         $this->assertEquals(
             '<a href="'
-            . PMA\libraries\Util::getScriptNameForOption(
+            . PhpMyAdmin\Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
             . '?db='
@@ -106,7 +106,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase
             . '&amp;server=99&amp;lang=en" title="Jump to database “'
             . htmlspecialchars($database) . '”.">'
             . htmlspecialchars($database) . '</a>',
-            PMA\libraries\Util::getDbLink($database)
+            PhpMyAdmin\Util::getDbLink($database)
         );
     }
 }
diff --git a/test/libraries/common/PMA_getDivForSliderEffect_test.php b/test/libraries/common/PMA_getDivForSliderEffect_test.php
index 4a0be86af0..7fcf0e765a 100644
--- a/test/libraries/common/PMA_getDivForSliderEffect_test.php
+++ b/test/libraries/common/PMA_getDivForSliderEffect_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getDivForSliderEffect from Util.php
+ ** Test for PhpMyAdmin\Util::getDivForSliderEffect from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::getDivForSliderEffect from Util.php
+ ** Test for PhpMyAdmin\Util::getDivForSliderEffect from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -34,7 +34,7 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
         $message = "test_message";
 
         $this->assertXmlStringEqualsXmlString(
-            "<root>" . PMA\libraries\Util::getDivForSliderEffect($id, $message) . "</div></root>",
+            "<root>" . PhpMyAdmin\Util::getDivForSliderEffect($id, $message) . "</div></root>",
             "<root><div id=\"$id\" class=\"pma_auto_slider\"\ntitle=\"" . htmlspecialchars($message) . "\" >\n</div></root>"
         );
     }
@@ -53,7 +53,7 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
         $message = "test_message";
 
         $this->assertXmlStringEqualsXmlString(
-            "<root>" . PMA\libraries\Util::getDivForSliderEffect($id, $message) . "</div></root>",
+            "<root>" . PhpMyAdmin\Util::getDivForSliderEffect($id, $message) . "</div></root>",
             "<root><div id=\"$id\" style=\"display: none; overflow:auto;\" class=\"pma_auto_slider\"\ntitle=\"" . htmlspecialchars($message) . "\" >\n</div></root>"
         );
 
@@ -73,7 +73,7 @@ class PMA_GetDivForSliderEffectTest extends PHPUnit_Framework_TestCase
         $message = "test_message";
 
         $this->assertXmlStringEqualsXmlString(
-            "<root>" . PMA\libraries\Util::getDivForSliderEffect($id, $message) . "</div></root>",
+            "<root>" . PhpMyAdmin\Util::getDivForSliderEffect($id, $message) . "</div></root>",
              "<root><div id=\"$id\">\n</div></root>"
         );
     }
diff --git a/test/libraries/common/PMA_getDropdown_test.php b/test/libraries/common/PMA_getDropdown_test.php
index 82fe45b045..b26c525e8e 100644
--- a/test/libraries/common/PMA_getDropdown_test.php
+++ b/test/libraries/common/PMA_getDropdown_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getDropdown from Util.php
+ ** Test for PhpMyAdmin\Util::getDropdown from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::getDropdown from Util.php
+ ** Test for PhpMyAdmin\Util::getDropdown from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -37,7 +37,7 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             $result,
-            PMA\libraries\Util::getDropdown(
+            PhpMyAdmin\Util::getDropdown(
                 $name, $choices, $active_choice, $id
             )
         );
@@ -68,7 +68,7 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             $result,
-            PMA\libraries\Util::getDropdown(
+            PhpMyAdmin\Util::getDropdown(
                 $name, $choices, $active_choice, $id
             )
         );
@@ -101,7 +101,7 @@ class PMA_GetDropdownTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             $result,
-            PMA\libraries\Util::getDropdown(
+            PhpMyAdmin\Util::getDropdown(
                 $name, $choices, $active_choice, $id
             )
         );
diff --git a/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
index cfb338d4f8..ea886bb9e3 100644
--- a/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
+++ b/test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getFormattedMaximumUploadSize from Util.php
+ ** Test for PhpMyAdmin\Util::getFormattedMaximumUploadSize from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::getFormattedMaximumUploadSize from Util.php
+ ** Test for PhpMyAdmin\Util::getFormattedMaximumUploadSize from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -40,7 +40,7 @@ class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA\libraries\Util::getFormattedMaximumUploadSize
+     * Test for PhpMyAdmin\Util::getFormattedMaximumUploadSize
      *
      * @param int    $size Size
      * @param string $unit Unit
@@ -54,7 +54,7 @@ class PMA_GetFormattedMaximumUploadSize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             "(" . __('Max: ') . $res . $unit . ")",
-            PMA\libraries\Util::getFormattedMaximumUploadSize($size)
+            PhpMyAdmin\Util::getFormattedMaximumUploadSize($size)
         );
 
     }
diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php
index 890c5cd3c1..ca95a97eb6 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getIcon() from Util.php
+ ** Test for PhpMyAdmin\Util::getIcon() from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -10,13 +10,13 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 
 
 /**
- ** Test for PMA\libraries\Util::getIcon() from Util.php
+ ** Test for PhpMyAdmin\Util::getIcon() from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -43,7 +43,7 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             '<span class="nowrap"></span>',
-            PMA\libraries\Util::getIcon('b_comment.png')
+            PhpMyAdmin\Util::getIcon('b_comment.png')
         );
     }
 
@@ -58,7 +58,7 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
 
         $this->assertEquals(
             '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></span>',
-            PMA\libraries\Util::getIcon('b_comment.png')
+            PhpMyAdmin\Util::getIcon('b_comment.png')
         );
     }
 
@@ -76,7 +76,7 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
             '<span class="nowrap"><img src="themes/dot.gif" title="'
             . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment" /></span>',
-            PMA\libraries\Util::getIcon('b_comment.png', $alternate_text)
+            PhpMyAdmin\Util::getIcon('b_comment.png', $alternate_text)
         );
     }
 
@@ -96,7 +96,7 @@ class PMA_GetIcon_Test extends PHPUnit_Framework_TestCase
             '<span class="nowrap"><img src="themes/dot.gif" title="'
             . $alternate_text . '" alt="' . $alternate_text
             . '" class="icon ic_b_comment" />&nbsp;' . $alternate_text . '</span>',
-            PMA\libraries\Util::getIcon('b_comment.png', $alternate_text, true, false)
+            PhpMyAdmin\Util::getIcon('b_comment.png', $alternate_text, true, false)
         );
 
     }
diff --git a/test/libraries/common/PMA_getRadioFields_test.php b/test/libraries/common/PMA_getRadioFields_test.php
index 6e60d9d29d..80786a827a 100644
--- a/test/libraries/common/PMA_getRadioFields_test.php
+++ b/test/libraries/common/PMA_getRadioFields_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getRadioFields from Util.php
+ ** Test for PhpMyAdmin\Util::getRadioFields from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::getRadioFields from Util.php
+ ** Test for PhpMyAdmin\Util::getRadioFields from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -31,7 +31,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         $choices = array();
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields($name, $choices),
+            PhpMyAdmin\Util::getRadioFields($name, $choices),
             ""
         );
     }
@@ -60,7 +60,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields($name, $choices),
+            PhpMyAdmin\Util::getRadioFields($name, $choices),
             $out
         );
     }
@@ -93,7 +93,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice
             ),
             $out
@@ -133,7 +133,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice, true, false, $class
             ),
             $out
@@ -166,7 +166,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice, false
             ),
             $out
@@ -201,7 +201,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice, true, true
             ),
             $out
@@ -236,7 +236,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice, true, false
             ),
             $out
@@ -276,7 +276,7 @@ class PMA_GetRadioFieldsTest extends PHPUnit_Framework_TestCase
         }
 
         $this->assertEquals(
-            PMA\libraries\Util::getRadioFields(
+            PhpMyAdmin\Util::getRadioFields(
                 $name, $choices, $checked_choice, true, true, $class
             ),
             $out
diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php
index 28c81bca22..332f8cfba9 100644
--- a/test/libraries/common/PMA_getTitleForTarget_test.php
+++ b/test/libraries/common/PMA_getTitleForTarget_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getTitleForTarget from common.lib
+ ** Test for PhpMyAdmin\Util::getTitleForTarget from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::getTitleForTarget from common.lib
+ ** Test for PhpMyAdmin\Util::getTitleForTarget from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -53,7 +53,7 @@ class PMA_GetTitleForTarget_Test extends PHPUnit_Framework_TestCase
     function testGetTitleForTarget($target, $result)
     {
         $this->assertEquals(
-            $result, PMA\libraries\Util::getTitleForTarget($target)
+            $result, PhpMyAdmin\Util::getTitleForTarget($target)
         );
     }
 
diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php
index 28ce68ab72..9c3f1765f9 100644
--- a/test/libraries/common/PMA_localisedDateTimespan_test.php
+++ b/test/libraries/common/PMA_localisedDateTimespan_test.php
@@ -88,7 +88,7 @@ class PMA_LocalisedDateTimespan_Test extends PHPUnit_Framework_TestCase
     public function testLocalisedDate($a, $b, $e)
     {
         $this->assertEquals(
-            $e, PMA\libraries\Util::localisedDate($a, $b)
+            $e, PhpMyAdmin\Util::localisedDate($a, $b)
         );
     }
 
@@ -120,7 +120,7 @@ class PMA_LocalisedDateTimespan_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['timespanfmt'] = '%s days, %s hours, %s minutes and %s seconds';
 
         $this->assertEquals(
-            $e, PMA\libraries\Util::timespanFormat($a)
+            $e, PhpMyAdmin\Util::timespanFormat($a)
         );
     }
 }
diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php
index 01520c77d0..8b9ea80c4f 100644
--- a/test/libraries/common/PMA_printableBitValue_test.php
+++ b/test/libraries/common/PMA_printableBitValue_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test PMA\libraries\Util::printableBitValue function
+ * Test PhpMyAdmin\Util::printableBitValue function
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- * Test PMA\libraries\Util::printableBitValue function
+ * Test PhpMyAdmin\Util::printableBitValue function
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -52,7 +52,7 @@ class PMA_PrintableBitValueTest extends PHPUnit_Framework_TestCase
     public function testPrintableBitValue($a, $b, $e)
     {
         $this->assertEquals(
-            $e, PMA\libraries\Util::printableBitValue($a, $b)
+            $e, PhpMyAdmin\Util::printableBitValue($a, $b)
         );
     }
 }
diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php
index 0a5fb8af19..939da11a31 100644
--- a/test/libraries/common/PMA_quoting_slashing_test.php
+++ b/test/libraries/common/PMA_quoting_slashing_test.php
@@ -21,7 +21,7 @@
 class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
 {
     /**
-     * data provider for PMA\libraries\Util::unQuote test
+     * data provider for PhpMyAdmin\Util::unQuote test
      *
      * @return array
      */
@@ -36,7 +36,7 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * PMA\libraries\Util::unQuote test
+     * PhpMyAdmin\Util::unQuote test
      *
      * @param string $param    String
      * @param string $expected Expected output
@@ -48,12 +48,12 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     public function testUnQuote($param, $expected)
     {
         $this->assertEquals(
-            $expected, PMA\libraries\Util::unQuote($param)
+            $expected, PhpMyAdmin\Util::unQuote($param)
         );
     }
 
     /**
-     * data provider for PMA\libraries\Util::unQuote test with chosen quote
+     * data provider for PhpMyAdmin\Util::unQuote test with chosen quote
      *
      * @return array
      */
@@ -68,7 +68,7 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * PMA\libraries\Util::unQuote test with chosen quote
+     * PhpMyAdmin\Util::unQuote test with chosen quote
      *
      * @param string $param    String
      * @param string $expected Expected output
@@ -80,7 +80,7 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     public function testUnQuoteSelectedChar($param, $expected)
     {
         $this->assertEquals(
-            $expected, PMA\libraries\Util::unQuote($param, '"')
+            $expected, PhpMyAdmin\Util::unQuote($param, '"')
         );
     }
 
@@ -115,10 +115,10 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     public function testBackquote($a, $b)
     {
         // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquote($a, false));
+        $this->assertEquals($a, PhpMyAdmin\Util::backquote($a, false));
 
         // Test backquote
-        $this->assertEquals($b, PMA\libraries\Util::backquote($a));
+        $this->assertEquals($b, PhpMyAdmin\Util::backquote($a));
     }
 
     /**
@@ -152,14 +152,14 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
     public function testbackquoteCompat($a, $b)
     {
         // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquoteCompat($a, 'NONE', false));
+        $this->assertEquals($a, PhpMyAdmin\Util::backquoteCompat($a, 'NONE', false));
 
         // Run tests in MSSQL compatibility mode
         // Test bypass quoting (used by dump functions)
-        $this->assertEquals($a, PMA\libraries\Util::backquoteCompat($a, 'MSSQL', false));
+        $this->assertEquals($a, PhpMyAdmin\Util::backquoteCompat($a, 'MSSQL', false));
 
         // Test backquote
-        $this->assertEquals($b, PMA\libraries\Util::backquoteCompat($a, 'MSSQL'));
+        $this->assertEquals($b, PhpMyAdmin\Util::backquoteCompat($a, 'MSSQL'));
     }
 
     /**
@@ -173,12 +173,12 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
             if ($type & PhpMyAdmin\SqlParser\Token::FLAG_KEYWORD_RESERVED) {
                 $this->assertEquals(
                     "`" . $keyword . "`",
-                    PMA\libraries\Util::backquote($keyword, false)
+                    PhpMyAdmin\Util::backquote($keyword, false)
                 );
             } else {
                 $this->assertEquals(
                     $keyword,
-                    PMA\libraries\Util::backquote($keyword, false)
+                    PhpMyAdmin\Util::backquote($keyword, false)
                 );
             }
         }
diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index 930fc70eb8..a85af03d6f 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::showDocu from Util.php
+ ** Test for PhpMyAdmin\Util::showDocu from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -10,13 +10,13 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 
 
 /**
- ** Test for PMA\libraries\Util::showDocu from Util.php
+ ** Test for PhpMyAdmin\Util::showDocu from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -43,7 +43,7 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
-            PMA\libraries\Util::showDocu('page', 'anchor')
+            PhpMyAdmin\Util::showDocu('page', 'anchor')
         );
 
     }
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index 4a22c7a5ad..2a3e4c19c6 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::getMessage from common.lib
+ ** Test for PhpMyAdmin\Util::getMessage from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -11,7 +11,7 @@ const PMA_IS_WINDOWS = false;
 
 
 /**
- ** Test for PMA\libraries\Util::getMessage from common.lib
+ ** Test for PhpMyAdmin\Util::getMessage from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -65,9 +65,9 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
             ]</div></div>"
         );
 
-        echo PMA\libraries\Util::getMessage("msg");
+        echo PhpMyAdmin\Util::getMessage("msg");
 
-        //$this->assertEquals("", PMA\libraries\Util::getMessage("msg"));
+        //$this->assertEquals("", PhpMyAdmin\Util::getMessage("msg"));
         $this->assertTrue(true);
     }
 }
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 3115d452de..5c708d44f5 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::showPHPDocu from Util.php
+ ** Test for PhpMyAdmin\Util::showPHPDocu from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -10,13 +10,13 @@
 /*
  * Include to test.
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 
 
 
 /**
- ** Test for PMA\libraries\Util::showPHPDocu from Util.php
+ ** Test for PhpMyAdmin\Util::showPHPDocu from Util.php
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -49,7 +49,7 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
             . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
         $this->assertEquals(
-            $expected, PMA\libraries\Util::showPHPDocu($target)
+            $expected, PhpMyAdmin\Util::showPHPDocu($target)
         );
     }
 }
diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php
index d58f4526d6..dcaa6a1730 100644
--- a/test/libraries/common/PMA_stringOperations_test.php
+++ b/test/libraries/common/PMA_stringOperations_test.php
@@ -45,7 +45,7 @@ class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * data provider for PMA\libraries\Util::userDir test
+     * data provider for PhpMyAdmin\Util::userDir test
      *
      * @return array
      */
@@ -71,7 +71,7 @@ class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
     {
         $GLOBALS['cfg']['Server']['user'] = 'root';
 
-        $this->assertEquals($e, PMA\libraries\Util::userDir($a));
+        $this->assertEquals($e, PhpMyAdmin\Util::userDir($a));
     }
 
     /**
@@ -102,7 +102,7 @@ class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
     public function testDuplicateFirstNewline($a, $e)
     {
         $this->assertEquals(
-            $e, PMA\libraries\Util::duplicateFirstNewline($a)
+            $e, PhpMyAdmin\Util::duplicateFirstNewline($a)
         );
     }
 
diff --git a/test/libraries/common/PMA_unsupportedDatatypes_test.php b/test/libraries/common/PMA_unsupportedDatatypes_test.php
index af92a041a5..6d7d1302cd 100644
--- a/test/libraries/common/PMA_unsupportedDatatypes_test.php
+++ b/test/libraries/common/PMA_unsupportedDatatypes_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- ** Test for PMA\libraries\Util::unsupportedDatatypes from common.lib
+ ** Test for PhpMyAdmin\Util::unsupportedDatatypes from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -13,7 +13,7 @@
 
 
 /**
- ** Test for PMA\libraries\Util::unsupportedDatatypes from common.lib
+ ** Test for PhpMyAdmin\Util::unsupportedDatatypes from common.lib
  *
  * @package PhpMyAdmin-test
  * @group common.lib-tests
@@ -29,7 +29,7 @@ class PMA_UnsupportedDatatypes_Test extends PHPUnit_Framework_TestCase
     {
         $no_support_types = array();
         $this->assertEquals(
-            $no_support_types, PMA\libraries\Util::unsupportedDatatypes()
+            $no_support_types, PhpMyAdmin\Util::unsupportedDatatypes()
         );
     }
 }
diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
index e9849238e4..f940c1ccd6 100644
--- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\TypesMySQL;
 
 
 
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index aed87d8166..0b4fb5fbb5 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -6,8 +6,8 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\Theme;
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\Theme;
+use PhpMyAdmin\TypesMySQL;
 use PhpMyAdmin\Response;
 
 $GLOBALS['server'] = 0;
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index aa23f222bf..5329416e9e 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\TypesMySQL;
 use PhpMyAdmin\Response;
 
 $GLOBALS['server'] = 0;
diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
index 85e374c07b..684a8024e9 100644
--- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
@@ -10,7 +10,7 @@
  * Needed for backquote() and PMA_RTN_getQueryFromRequest()
  */
 
-use PMA\libraries\TypesMySQL;
+use PhpMyAdmin\TypesMySQL;
 
 
 
diff --git a/themes.php b/themes.php
index 59ba44f78f..760015b140 100644
--- a/themes.php
+++ b/themes.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\ThemeManager;
+use PhpMyAdmin\ThemeManager;
 use PhpMyAdmin\Response;
 
 /**
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index 674978671f..b4dc29fbf8 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -6,7 +6,7 @@
  * @package    PhpMyAdmin-theme
  * @subpackage PMAHomme
  */
-use PMA\libraries\Theme;
+use PhpMyAdmin\Theme;
 
 // unplanned execution path
 if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
diff --git a/transformation_overview.php b/transformation_overview.php
index b436abd304..761e5db811 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Response;
-use PMA\libraries\Transformations;
+use PhpMyAdmin\Transformations;
 
 /**
  * Gets some core libraries and displays a top message if required
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 50e7841032..ba1666bacd 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Response;
-use PMA\libraries\Transformations;
+use PhpMyAdmin\Transformations;
 
 /**
  *
@@ -62,7 +62,7 @@ foreach ($request_params as $one_request_param) {
 $GLOBALS['dbi']->selectDb($db);
 if (isset($where_clause)) {
     $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($table)
+        'SELECT * FROM ' . PhpMyAdmin\Util::backquote($table)
         . ' WHERE ' . $where_clause . ';',
         null,
         PhpMyAdmin\DatabaseInterface::QUERY_STORE
@@ -70,7 +70,7 @@ if (isset($where_clause)) {
     $row = $GLOBALS['dbi']->fetchAssoc($result);
 } else {
     $result = $GLOBALS['dbi']->query(
-        'SELECT * FROM ' . PMA\libraries\Util::backquote($table) . ' LIMIT 1;',
+        'SELECT * FROM ' . PhpMyAdmin\Util::backquote($table) . ' LIMIT 1;',
         null,
         PhpMyAdmin\DatabaseInterface::QUERY_STORE
     );
diff --git a/user_password.php b/user_password.php
index 306c16d32a..de5392d6d2 100644
--- a/user_password.php
+++ b/user_password.php
@@ -8,7 +8,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 /**
@@ -95,7 +95,7 @@ function PMA_getChangePassMessage($change_password_message, $sql_query = '')
             $response->addJSON('message', $change_password_message['msg']);
             $response->setRequestStatus(false);
         } else {
-            $sql_query = PMA\libraries\Util::getMessage(
+            $sql_query = PhpMyAdmin\Util::getMessage(
                 $change_password_message['msg'],
                 $sql_query,
                 'success'
@@ -150,7 +150,7 @@ function PMA_changePassword($password, $message, $change_password_message)
 
     list($username, $hostname) = $GLOBALS['dbi']->getCurrentUserAndHost();
 
-    $serverType = PMA\libraries\Util::getServerType();
+    $serverType = PhpMyAdmin\Util::getServerType();
 
     if (isset($_REQUEST['authentication_plugin'])
         && ! empty($_REQUEST['authentication_plugin'])
@@ -230,9 +230,9 @@ function PMA_changePassHashingFunction()
 function PMA_changePassUrlParamsAndSubmitQuery(
     $username, $hostname, $password, $sql_query, $hashing_function, $orig_auth_plugin
 ) {
-    $err_url = 'user_password.php' . URL::getCommon();
+    $err_url = 'user_password.php' . Url::getCommon();
 
-    $serverType = PMA\libraries\Util::getServerType();
+    $serverType = PhpMyAdmin\Util::getServerType();
 
     if ($serverType == 'MySQL' && PMA_MYSQL_INT_VERSION >= 50706) {
         $local_query = 'ALTER USER \'' . $username . '\'@\'' . $hostname . '\''
@@ -270,7 +270,7 @@ function PMA_changePassUrlParamsAndSubmitQuery(
                 . $GLOBALS['dbi']->escapeString($password) . '\')');
     }
     if (! @$GLOBALS['dbi']->tryQuery($local_query)) {
-        PMA\libraries\Util::mysqlDie(
+        PhpMyAdmin\Util::mysqlDie(
             $GLOBALS['dbi']->getError(),
             $sql_query,
             false,
@@ -293,10 +293,10 @@ function PMA_changePassUrlParamsAndSubmitQuery(
 function PMA_changePassDisplayPage($message, $sql_query)
 {
     echo '<h1>' , __('Change password') , '</h1>' , "\n\n";
-    echo PMA\libraries\Util::getMessage(
+    echo PhpMyAdmin\Util::getMessage(
         $message, $sql_query, 'success'
     );
-    echo '<a href="index.php' , URL::getCommon()
+    echo '<a href="index.php' , Url::getCommon()
         , ' target="_parent">' , "\n"
         , '<strong>' , __('Back') , '</strong></a>';
     exit;
diff --git a/version_check.php b/version_check.php
index a238040a84..4805e5735c 100644
--- a/version_check.php
+++ b/version_check.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\VersionInformation;
+use PhpMyAdmin\VersionInformation;
 use PhpMyAdmin\Response;
 
 $_GET['ajax_request'] = 'true';
diff --git a/view_create.php b/view_create.php
index 9432b664fd..fbe8e6747c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -9,7 +9,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
 
 require_once './libraries/common.inc.php';
@@ -78,11 +78,11 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     if (! empty($_REQUEST['view']['definer'])) {
         if (strpos($_REQUEST['view']['definer'], '@') === FALSE) {
             $sql_query .= $sep . 'DEFINER='
-                . PMA\libraries\Util::backquote($_REQUEST['view']['definer']);
+                . PhpMyAdmin\Util::backquote($_REQUEST['view']['definer']);
         } else {
             $arr = explode('@', $_REQUEST['view']['definer']);
-            $sql_query .= $sep . 'DEFINER=' . PMA\libraries\Util::backquote($arr[0]);
-            $sql_query .= '@' . PMA\libraries\Util::backquote($arr[1]) . ' ';
+            $sql_query .= $sep . 'DEFINER=' . PhpMyAdmin\Util::backquote($arr[0]);
+            $sql_query .= '@' . PhpMyAdmin\Util::backquote($arr[1]) . ' ';
         }
     }
 
@@ -94,7 +94,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     }
 
     $sql_query .= $sep . ' VIEW '
-        . PMA\libraries\Util::backquote($_REQUEST['view']['name']);
+        . PhpMyAdmin\Util::backquote($_REQUEST['view']['name']);
 
     if (! empty($_REQUEST['view']['column_names'])) {
         $sql_query .= $sep . ' (' . $_REQUEST['view']['column_names'] . ')';
@@ -163,7 +163,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     } else {
         $response->addJSON(
             'message',
-            PMA\libraries\Util::getMessage(
+            PhpMyAdmin\Util::getMessage(
                 PhpMyAdmin\Message::success(),
                 $sql_query
             )
@@ -200,7 +200,7 @@ $url_params['reload'] = 1;
 $htmlString = '<!-- CREATE VIEW options -->'
     . '<div id="div_view_options">'
     . '<form method="post" action="view_create.php">'
-    . URL::getHiddenInputs($url_params)
+    . Url::getHiddenInputs($url_params)
     . '<fieldset>'
     . '<legend>'
     . (isset($_REQUEST['ajax_dialog']) ?
diff --git a/view_operations.php b/view_operations.php
index a030e3e4ea..529ee2cbb7 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -5,9 +5,9 @@
  *
  * @package PhpMyAdmin
  */
-use PMA\libraries\Table;
+use PhpMyAdmin\Table;
 use PhpMyAdmin\Response;
-use PMA\libraries\URL;
+use PhpMyAdmin\Url;
 
 /**
  *
@@ -79,7 +79,7 @@ if (isset($result)) {
         $_message->isError(true);
         unset($warning_messages);
     }
-    echo PMA\libraries\Util::getMessage(
+    echo PhpMyAdmin\Util::getMessage(
         $_message, $sql_query, $_type
     );
 }
@@ -95,7 +95,7 @@ $url_params['back'] = 'view_operations.php';
 <!-- Table operations -->
 <div>
 <form method="post" action="view_operations.php">
-<?php echo URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
+<?php echo Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
 <input type="hidden" name="reload" value="1" />
 <fieldset>
     <legend><?php echo __('Operations'); ?></legend>
@@ -120,7 +120,7 @@ $url_params['back'] = 'view_operations.php';
 $drop_view_url_params = array_merge(
     $url_params,
     array(
-        'sql_query' => 'DROP VIEW ' . PMA\libraries\Util::backquote(
+        'sql_query' => 'DROP VIEW ' . PhpMyAdmin\Util::backquote(
             $GLOBALS['table']
         ),
         'goto' => 'tbl_structure.php',