diff --git a/db_structure.php b/db_structure.php
index 35f513ec86..09c4aee4e2 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -6,16 +6,15 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Database\DatabaseStructureController'
 );
diff --git a/libraries/classes/Controllers/Controller.php b/libraries/classes/Controllers/Controller.php
index 621e0a1817..fb30c3ca8d 100644
--- a/libraries/classes/Controllers/Controller.php
+++ b/libraries/classes/Controllers/Controller.php
@@ -8,7 +8,7 @@
 namespace PhpMyAdmin\Controllers;
 
 use PhpMyAdmin\DatabaseInterface;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/database_interface.inc.php';
@@ -32,7 +32,7 @@ abstract class Controller
     protected $dbi;
 
     /**
-     * @var \PMA\libraries\di\Container
+     * @var \PhpMyAdmin\Di\Container
      */
     protected $container;
 
diff --git a/libraries/di/AliasItem.php b/libraries/classes/Di/AliasItem.php
similarity index 85%
rename from libraries/di/AliasItem.php
rename to libraries/classes/Di/AliasItem.php
index 9dd93be191..a0893bdfa5 100644
--- a/libraries/di/AliasItem.php
+++ b/libraries/classes/Di/AliasItem.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\AliasItem class
+ * Holds the PhpMyAdmin\Di\AliasItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Class AliasItem
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class AliasItem implements Item
 {
diff --git a/libraries/di/Container.php b/libraries/classes/Di/Container.php
similarity index 97%
rename from libraries/di/Container.php
rename to libraries/classes/Di/Container.php
index 557a20c002..cba560a46e 100644
--- a/libraries/di/Container.php
+++ b/libraries/classes/Di/Container.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\Container class
+ * Holds the PhpMyAdmin\Di\Container class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Psr\Container\ContainerInterface;
 
 /**
  * Class Container
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class Container implements ContainerInterface
 {
diff --git a/libraries/di/ContainerException.php b/libraries/classes/Di/ContainerException.php
similarity index 65%
rename from libraries/di/ContainerException.php
rename to libraries/classes/Di/ContainerException.php
index 53fae18382..a5a2da0ee3 100644
--- a/libraries/di/ContainerException.php
+++ b/libraries/classes/Di/ContainerException.php
@@ -1,11 +1,11 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ContainerException class
+ * Holds the PhpMyAdmin\Di\ContainerException class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Exception;
 use Psr\Container\ContainerExceptionInterface;
@@ -13,7 +13,7 @@ use Psr\Container\ContainerExceptionInterface;
 /**
  * Class ContainerException
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ContainerException extends Exception implements ContainerExceptionInterface
 {
diff --git a/libraries/di/FactoryItem.php b/libraries/classes/Di/FactoryItem.php
similarity index 74%
rename from libraries/di/FactoryItem.php
rename to libraries/classes/Di/FactoryItem.php
index b79ab294f8..21e6b948ed 100644
--- a/libraries/di/FactoryItem.php
+++ b/libraries/classes/Di/FactoryItem.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\FactoryItem class
+ * Holds the PhpMyAdmin\Di\FactoryItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Factory manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class FactoryItem extends ReflectorItem
 {
diff --git a/libraries/di/Item.php b/libraries/classes/Di/Item.php
similarity index 70%
rename from libraries/di/Item.php
rename to libraries/classes/Di/Item.php
index 4958ddd33a..882428d317 100644
--- a/libraries/di/Item.php
+++ b/libraries/classes/Di/Item.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\Item class
+ * Holds the PhpMyAdmin\Di\Item class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Interface Item
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 interface Item
 {
diff --git a/libraries/di/NotFoundException.php b/libraries/classes/Di/NotFoundException.php
similarity index 65%
rename from libraries/di/NotFoundException.php
rename to libraries/classes/Di/NotFoundException.php
index e405a1bf75..f861ff8e85 100644
--- a/libraries/di/NotFoundException.php
+++ b/libraries/classes/Di/NotFoundException.php
@@ -1,18 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\NotFoundException class
+ * Holds the PhpMyAdmin\Di\NotFoundException class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class NotFoundException
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class NotFoundException extends ContainerException implements NotFoundExceptionInterface
 {
diff --git a/libraries/di/ReflectorItem.php b/libraries/classes/Di/ReflectorItem.php
similarity index 96%
rename from libraries/di/ReflectorItem.php
rename to libraries/classes/Di/ReflectorItem.php
index 222af468b3..72ab683c4a 100644
--- a/libraries/di/ReflectorItem.php
+++ b/libraries/classes/Di/ReflectorItem.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ReflectorItem class
+ * Holds the PhpMyAdmin\Di\ReflectorItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Reflector manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 abstract class ReflectorItem implements Item
 {
diff --git a/libraries/di/ServiceItem.php b/libraries/classes/Di/ServiceItem.php
similarity index 80%
rename from libraries/di/ServiceItem.php
rename to libraries/classes/Di/ServiceItem.php
index e834dd6bc5..608e8a482d 100644
--- a/libraries/di/ServiceItem.php
+++ b/libraries/classes/Di/ServiceItem.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ServiceItem class
+ * Holds the PhpMyAdmin\Di\ServiceItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Service manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ServiceItem extends ReflectorItem
 {
diff --git a/libraries/di/ValueItem.php b/libraries/classes/Di/ValueItem.php
similarity index 81%
rename from libraries/di/ValueItem.php
rename to libraries/classes/Di/ValueItem.php
index e0f1402b7a..52f20509f9 100644
--- a/libraries/di/ValueItem.php
+++ b/libraries/classes/Di/ValueItem.php
@@ -1,16 +1,16 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\di\ValueItem class
+ * Holds the PhpMyAdmin\Di\ValueItem class
  *
- * @package PMA
+ * @package PhpMyAdmin\Di
  */
-namespace PMA\libraries\di;
+namespace PhpMyAdmin\Di;
 
 /**
  * Value manager
  *
- * @package PMA\libraries\di
+ * @package PhpMyAdmin\Di
  */
 class ValueItem implements Item
 {
diff --git a/libraries/database_interface.inc.php b/libraries/database_interface.inc.php
index 9921c6c9ca..a34921eb12 100644
--- a/libraries/database_interface.inc.php
+++ b/libraries/database_interface.inc.php
@@ -9,7 +9,7 @@
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\Dbi\DbiDummy;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Dbi\DbiMysql;
 use PhpMyAdmin\Dbi\DbiMysqli;
diff --git a/libraries/gis/GISFactory.php b/libraries/gis/GISFactory.php
index 3cf1b2a940..c5f98cf87e 100644
--- a/libraries/gis/GISFactory.php
+++ b/libraries/gis/GISFactory.php
@@ -5,11 +5,8 @@
  *
  * @package PhpMyAdmin-GIS
  */
-
 namespace PMA\libraries\gis;
 
-use PMA;
-
 /**
  * Factory class that handles the creation of geometric objects.
  *
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 297d97a7d2..71f9a5f093 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -6,6 +6,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Transformations;
@@ -91,7 +93,7 @@ $comments_map = PMA_getComments($db, $table);
 $move_columns = array();
 if (isset($fields_meta)) {
     /** @var PhpMyAdmin\DatabaseInterface $dbi */
-    $dbi = \PMA\libraries\di\Container::getDefaultContainer()->get('dbi');
+    $dbi = Container::getDefaultContainer()->get('dbi');
     $move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
 }
 
diff --git a/server_binlog.php b/server_binlog.php
index b98a806ce6..f7153da743 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server binary log page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerCollationsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerBinlogController'
 );
diff --git a/server_collations.php b/server_collations.php
index fd70ce355d..0c9d9320c5 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server charsets and collations page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerCollationsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerCollationsController'
 );
diff --git a/server_databases.php b/server_databases.php
index 55a43552e3..a30d6795fa 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server databases page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerDatabasesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerDatabasesController'
 );
diff --git a/server_engines.php b/server_engines.php
index 0fecf7420f..8206f529bb 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server engines page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerEnginesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerEnginesController'
 );
diff --git a/server_plugins.php b/server_plugins.php
index 6e35bc185c..db7117fdbe 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server plugins page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerPluginsController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerPluginsController'
 );
diff --git a/server_variables.php b/server_variables.php
index 95f371fb84..b087601e27 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -1,20 +1,18 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-
 /**
  * Handles server variables page.
  *
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Server\ServerVariablesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Server\ServerVariablesController'
 );
diff --git a/tbl_chart.php b/tbl_chart.php
index 3ba750d4ac..59ff97977f 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -6,14 +6,13 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableChartController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableChartController');
 $container->alias(
     'TableChartController', 'PhpMyAdmin\Controllers\Table\TableChartController'
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index 123f81504b..f9e37d3b75 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -7,6 +7,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -15,7 +17,7 @@ use PhpMyAdmin\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 40eb576d39..4b92db0068 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -6,15 +6,14 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableGisVisualizationController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory(
     'PhpMyAdmin\Controllers\Table\TableGisVisualizationController'
 );
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 81057861e6..a86d50d06b 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -6,15 +6,14 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableIndexesController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableIndexesController');
 $container->alias(
     'TableIndexesController',
diff --git a/tbl_relation.php b/tbl_relation.php
index f4189575d9..1782198563 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -14,19 +14,15 @@
  * @package PhpMyAdmin
  */
 
-/**
- * Get the TableRelationController
- */
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableRelationController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Util;
 
 require_once 'libraries/common.inc.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableRelationController');
 $container->alias(
     'TableRelationController',
diff --git a/tbl_select.php b/tbl_select.php
index fe628c9382..2a1f6e7754 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -8,6 +8,9 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Controllers\Table\TableSearchController;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -16,9 +19,7 @@ use PhpMyAdmin\Response;
 require_once 'libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-use PhpMyAdmin\Controllers\Table\TableSearchController;
-
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
diff --git a/tbl_structure.php b/tbl_structure.php
index a6921f3dbf..a0c959fb3b 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -7,10 +7,8 @@
  * @package PhpMyAdmin
  */
 
-namespace PMA;
-
 use PhpMyAdmin\Controllers\Table\TableStructureController;
-use PMA\libraries\controllers\Table;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 require_once 'libraries/common.inc.php';
@@ -18,7 +16,7 @@ require_once 'libraries/config/messages.inc.php';
 require_once 'libraries/config/user_preferences.forms.php';
 require_once 'libraries/config/page_settings.forms.php';
 
-$container = libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableStructureController');
 $container->alias(
     'TableStructureController',
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 4983ad2877..5d73a6460e 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -7,6 +7,8 @@
  *
  * @package PhpMyAdmin
  */
+
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 /**
@@ -15,7 +17,7 @@ use PhpMyAdmin\Response;
 require_once './libraries/common.inc.php';
 require_once 'libraries/tbl_common.inc.php';
 
-$container = \PMA\libraries\di\Container::getDefaultContainer();
+$container = Container::getDefaultContainer();
 $container->factory('PhpMyAdmin\Controllers\Table\TableSearchController');
 $container->alias(
     'TableSearchController', 'PhpMyAdmin\Controllers\Table\TableSearchController'
diff --git a/test/classes/controllers/DatabaseStructureControllerTest.php b/test/classes/controllers/DatabaseStructureControllerTest.php
index 3444967f9f..e31ba9f4b6 100644
--- a/test/classes/controllers/DatabaseStructureControllerTest.php
+++ b/test/classes/controllers/DatabaseStructureControllerTest.php
@@ -12,7 +12,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Controllers\Database\DatabaseStructureController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Theme;
 
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php
index 0e99932a6c..a76d1f2832 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/controllers/ServerBinlogControllerTest.php
@@ -8,7 +8,7 @@
 
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerBinlogController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Util;
 
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index 770737141a..7690682f9e 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Charsets;
 
diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php
index 5e3871b343..07c8b157ea 100644
--- a/test/classes/controllers/ServerPluginsControllerTest.php
+++ b/test/classes/controllers/ServerPluginsControllerTest.php
@@ -11,7 +11,7 @@
  */
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Controllers\Server\ServerPluginsController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index 6fcdd33723..f10625f50c 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Core;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php
index bdf22f22e2..9ee7f463c3 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -7,7 +7,7 @@
  */
 
 use PhpMyAdmin\Controllers\Table\TableIndexesController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Response;
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php
index e3a9a11ef5..72836f29ec 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -9,7 +9,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/controllers/TableSearchControllerTest.php b/test/classes/controllers/TableSearchControllerTest.php
index d986a97a36..b660ff0ff4 100644
--- a/test/classes/controllers/TableSearchControllerTest.php
+++ b/test/classes/controllers/TableSearchControllerTest.php
@@ -10,7 +10,7 @@
  * Include to test.
  */
 use PhpMyAdmin\Controllers\Table\TableSearchController;
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 use PhpMyAdmin\TypesMySQL;
 
diff --git a/test/classes/controllers/TableStructureControllerTest.php b/test/classes/controllers/TableStructureControllerTest.php
index 626306a759..df33f8cad4 100644
--- a/test/classes/controllers/TableStructureControllerTest.php
+++ b/test/classes/controllers/TableStructureControllerTest.php
@@ -11,7 +11,7 @@
 /*
  * Include to test.
  */
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Theme;
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/di/ContainerExceptionTest.php b/test/classes/di/ContainerExceptionTest.php
index 84f4a00300..cd8606fd62 100644
--- a/test/classes/di/ContainerExceptionTest.php
+++ b/test/classes/di/ContainerExceptionTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\ContainerException class
+ * Tests for PhpMyAdmin\Di\ContainerException class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\ContainerException;
+use PhpMyAdmin\Di\ContainerException;
 
 /**
- * Tests for PMA\libraries\di\ContainerException class
+ * Tests for PhpMyAdmin\Di\ContainerException class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/di/ContainerTest.php b/test/classes/di/ContainerTest.php
index 2679469fd4..043013eb09 100644
--- a/test/classes/di/ContainerTest.php
+++ b/test/classes/di/ContainerTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\Container class
+ * Tests for PhpMyAdmin\Di\Container class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\Container;
+use PhpMyAdmin\Di\Container;
 
 /**
- * Tests for PMA\libraries\di\Container class
+ * Tests for PhpMyAdmin\Di\Container class
  *
  * @package PhpMyAdmin-test
  */
diff --git a/test/classes/di/NotFoundExceptionTest.php b/test/classes/di/NotFoundExceptionTest.php
index 3fa1c8ed76..c317a611c5 100644
--- a/test/classes/di/NotFoundExceptionTest.php
+++ b/test/classes/di/NotFoundExceptionTest.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for PMA\libraries\di\NotFoundException class
+ * Tests for PhpMyAdmin\Di\NotFoundException class
  *
  * @package PhpMyAdmin-test
  */
@@ -11,10 +11,10 @@
  */
 require_once 'test/PMATestCase.php';
 
-use PMA\libraries\di\NotFoundException;
+use PhpMyAdmin\Di\NotFoundException;
 
 /**
- * Tests for PMA\libraries\di\NotFoundException class
+ * Tests for PhpMyAdmin\Di\NotFoundException class
  *
  * @package PhpMyAdmin-test
  */