diff --git a/test/classes/PMA_Advisor_test.php b/test/classes/AdvisorTest.php
similarity index 99%
rename from test/classes/PMA_Advisor_test.php
rename to test/classes/AdvisorTest.php
index 8c618371d3..ab7ce04578 100644
--- a/test/classes/PMA_Advisor_test.php
+++ b/test/classes/AdvisorTest.php
@@ -21,7 +21,7 @@ use PMA\libraries\Theme;
  *
  * @package PhpMyAdmin-test
  */
-class Advisor_Test extends PHPUnit_Framework_TestCase
+class AdvisorTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/PMA_Config_test.php b/test/classes/ConfigTest.php
similarity index 99%
rename from test/classes/PMA_Config_test.php
rename to test/classes/ConfigTest.php
index 9cee5b6caa..57026bac14 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/ConfigTest.php
@@ -23,7 +23,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ConfigTest extends PHPUnit_Framework_TestCase
+class ConfigTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Turn off backup globals
diff --git a/test/classes/PMA_DatabaseInterface_test.php b/test/classes/DatabaseInterfaceTest.php
similarity index 97%
rename from test/classes/PMA_DatabaseInterface_test.php
rename to test/classes/DatabaseInterfaceTest.php
index e4f0b48672..d640867b73 100644
--- a/test/classes/PMA_DatabaseInterface_test.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/dbi/DBIDummy.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_DatabaseInterface_Test extends PHPUnit_Framework_TestCase
+class DatabaseInterfaceTest extends PHPUnit_Framework_TestCase
 {
 
     private $_dbi;
diff --git a/test/classes/PMA_DbQbe_test.php b/test/classes/DbQbeTest.php
similarity index 99%
rename from test/classes/PMA_DbQbe_test.php
rename to test/classes/DbQbeTest.php
index c5d5753515..f96ff4771b 100644
--- a/test/classes/PMA_DbQbe_test.php
+++ b/test/classes/DbQbeTest.php
@@ -21,7 +21,7 @@ use PMA\libraries\DbQbe;
  *
  *  @package PhpMyAdmin-test
  */
-class PMA_DbQbe_Test extends PHPUnit_Framework_TestCase
+class DbQbeTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/DbSearchTest.php
similarity index 99%
rename from test/classes/PMA_DbSearch_test.php
rename to test/classes/DbSearchTest.php
index e533d30841..547a3b6124 100644
--- a/test/classes/PMA_DbSearch_test.php
+++ b/test/classes/DbSearchTest.php
@@ -22,7 +22,7 @@ use PMA\libraries\Theme;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
+class DbSearchTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/DisplayResultsTest.php
similarity index 99%
rename from test/classes/PMA_DisplayResults_test.php
rename to test/classes/DisplayResultsTest.php
index 850e402b1c..9c8532fbcf 100644
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/DisplayResultsTest.php
@@ -22,7 +22,7 @@ require_once 'libraries/string.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
+class DisplayResultsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_ErrorHandler_test.php b/test/classes/ErrorHandlerTest.php
similarity index 99%
rename from test/classes/PMA_ErrorHandler_test.php
rename to test/classes/ErrorHandlerTest.php
index 4ffd60da4f..ccdadd6423 100644
--- a/test/classes/PMA_ErrorHandler_test.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/sanitizing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ErrorHandler_Test extends PHPUnit_Framework_TestCase
+class ErrorHandlerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_Error_test.php b/test/classes/ErrorTest.php
similarity index 98%
rename from test/classes/PMA_Error_test.php
rename to test/classes/ErrorTest.php
index 9203391c48..117158c2e2 100644
--- a/test/classes/PMA_Error_test.php
+++ b/test/classes/ErrorTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/sanitizing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Error_Test extends PHPUnit_Framework_TestCase
+class ErrorTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_File_test.php b/test/classes/FileTest.php
similarity index 96%
rename from test/classes/PMA_File_test.php
rename to test/classes/FileTest.php
index 5263567288..e2e3cf1709 100644
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/FileTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_File_Test extends PHPUnit_Framework_TestCase
+class FileTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Setup function for test cases
diff --git a/test/classes/PMA_Font_test.php b/test/classes/FontTest.php
similarity index 99%
rename from test/classes/PMA_Font_test.php
rename to test/classes/FontTest.php
index f9178b3c44..20e9a2ff64 100644
--- a/test/classes/PMA_Font_test.php
+++ b/test/classes/FontTest.php
@@ -10,7 +10,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Font_Test extends PHPUnit_Framework_TestCase
+class FontTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Test getStringWidth with different characters.
diff --git a/test/classes/PMA_Footer_test.php b/test/classes/FooterTest.php
similarity index 99%
rename from test/classes/PMA_Footer_test.php
rename to test/classes/FooterTest.php
index bc3728a836..ae39766d4f 100644
--- a/test/classes/PMA_Footer_test.php
+++ b/test/classes/FooterTest.php
@@ -23,7 +23,7 @@ require_once 'libraries/relation.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Footer_Test extends PHPUnit_Framework_TestCase
+class FooterTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/PMA_Header_test.php b/test/classes/HeaderTest.php
similarity index 98%
rename from test/classes/PMA_Header_test.php
rename to test/classes/HeaderTest.php
index 316b2b0b52..3d32fa5a5a 100644
--- a/test/classes/PMA_Header_test.php
+++ b/test/classes/HeaderTest.php
@@ -26,7 +26,7 @@ require_once 'libraries/js_escape.lib.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_Header_Test extends PHPUnit_Framework_TestCase
+class HeaderTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Configures global environment.
diff --git a/test/classes/PMA_Index_test.php b/test/classes/IndexTest.php
similarity index 98%
rename from test/classes/PMA_Index_test.php
rename to test/classes/IndexTest.php
index 3de7fd779d..689f78aec0 100644
--- a/test/classes/PMA_Index_test.php
+++ b/test/classes/IndexTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Index_Test extends PHPUnit_Framework_TestCase
+class IndexTest extends PHPUnit_Framework_TestCase
 {
     private $_params = array();
 
diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/ListDatabaseTest.php
similarity index 97%
rename from test/classes/PMA_List_Database_test.php
rename to test/classes/ListDatabaseTest.php
index f3f17b7f57..6910f155dd 100644
--- a/test/classes/PMA_List_Database_test.php
+++ b/test/classes/ListDatabaseTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/relation.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_List_Database_Test extends PHPUnit_Framework_TestCase
+class ListDatabaseTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/PMA_Menu_test.php b/test/classes/MenuTest.php
similarity index 98%
rename from test/classes/PMA_Menu_test.php
rename to test/classes/MenuTest.php
index d25f6daf04..b96130052e 100644
--- a/test/classes/PMA_Menu_test.php
+++ b/test/classes/MenuTest.php
@@ -25,7 +25,7 @@ require_once 'libraries/relation.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Menu_Test extends PHPUnit_Framework_TestCase
+class MenuTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Configures global environment.
diff --git a/test/classes/PMA_Message_test.php b/test/classes/MessageTest.php
similarity index 99%
rename from test/classes/PMA_Message_test.php
rename to test/classes/MessageTest.php
index 110ccfda25..9dfb51931a 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/MessageTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Message_Test extends PHPUnit_Framework_TestCase
+class MessageTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var    PMA\libraries\Message
diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PDFTest.php
similarity index 96%
rename from test/classes/PMA_PDF_test.php
rename to test/classes/PDFTest.php
index 6673742b8d..f51dee881f 100644
--- a/test/classes/PMA_PDF_test.php
+++ b/test/classes/PDFTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/core.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_PDF_Test extends PHPUnit_Framework_TestCase
+class PDFTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/ScriptsTest.php
similarity index 99%
rename from test/classes/PMA_Scripts_test.php
rename to test/classes/ScriptsTest.php
index c5f7b780e9..f88d0b5242 100644
--- a/test/classes/PMA_Scripts_test.php
+++ b/test/classes/ScriptsTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/url_generating.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Scripts_Test extends PHPUnit_Framework_TestCase
+class ScriptsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_ServerStatusData_test.php b/test/classes/ServerStatusDataTest.php
similarity index 98%
rename from test/classes/PMA_ServerStatusData_test.php
rename to test/classes/ServerStatusDataTest.php
index f218afe574..1b09500e31 100644
--- a/test/classes/PMA_ServerStatusData_test.php
+++ b/test/classes/ServerStatusDataTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ServerStatusData_Test extends PHPUnit_Framework_TestCase
+class ServerStatusDataTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_StorageEngine_test.php b/test/classes/StorageEngineTest.php
similarity index 98%
rename from test/classes/PMA_StorageEngine_test.php
rename to test/classes/StorageEngineTest.php
index 349b078ec8..e7dc814401 100644
--- a/test/classes/PMA_StorageEngine_test.php
+++ b/test/classes/StorageEngineTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_StorageEngineTest extends PHPUnit_Framework_TestCase
+class StorageEngineTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/PMA_SystemDatabase_test.php b/test/classes/SystemDatabaseTest.php
similarity index 98%
rename from test/classes/PMA_SystemDatabase_test.php
rename to test/classes/SystemDatabaseTest.php
index ffc4611130..eb4d896501 100644
--- a/test/classes/PMA_SystemDatabase_test.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_SystemDatabaseTest extends PHPUnit_Framework_TestCase
+class SystemDatabaseTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Setup function for test cases
diff --git a/test/classes/PMA_Table_test.php b/test/classes/TableTest.php
similarity index 99%
rename from test/classes/PMA_Table_test.php
rename to test/classes/TableTest.php
index 87144b4690..08d5e2c324 100644
--- a/test/classes/PMA_Table_test.php
+++ b/test/classes/TableTest.php
@@ -24,7 +24,7 @@ require_once 'libraries/relation.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Table_Test extends PHPUnit_Framework_TestCase
+class TableTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Configures environment
diff --git a/test/classes/PMA_Template_test.php b/test/classes/TemplateTest.php
similarity index 95%
rename from test/classes/PMA_Template_test.php
rename to test/classes/TemplateTest.php
index 722723546d..b3913f9b1f 100644
--- a/test/classes/PMA_Template_test.php
+++ b/test/classes/TemplateTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Template_Test extends PHPUnit_Framework_TestCase
+class TemplateTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Test for render
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/ThemeManagerTest.php
similarity index 98%
rename from test/classes/PMA_Theme_Manager_test.php
rename to test/classes/ThemeManagerTest.php
index 30c083ddb5..731d0a8838 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/ThemeManagerTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/core.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Theme_Manager_Test extends PHPUnit_Framework_TestCase
+class ThemeManagerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/ThemeTest.php
similarity index 99%
rename from test/classes/PMA_Theme_test.php
rename to test/classes/ThemeTest.php
index d5e45fd12c..ad43e93fe0 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/ThemeTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/url_generating.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ThemeTest extends PHPUnit_Framework_TestCase
+class ThemeTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Theme
diff --git a/test/classes/PMA_Types_MySQL_test.php b/test/classes/TypesMySQLTest.php
similarity index 99%
rename from test/classes/PMA_Types_MySQL_test.php
rename to test/classes/TypesMySQLTest.php
index d58b5c244e..210660c1a5 100644
--- a/test/classes/PMA_Types_MySQL_test.php
+++ b/test/classes/TypesMySQLTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Types_MySQL_Test extends PHPUnit_Framework_TestCase
+class TypesMySQLTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var PMA\libraries\Types
diff --git a/test/classes/PMA_Types_test.php b/test/classes/TypesTest.php
similarity index 99%
rename from test/classes/PMA_Types_test.php
rename to test/classes/TypesTest.php
index f900c045c7..eb1f51dd3b 100644
--- a/test/classes/PMA_Types_test.php
+++ b/test/classes/TypesTest.php
@@ -11,7 +11,7 @@ use PMA\libraries\Types;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_TypesTest extends PHPUnit_Framework_TestCase
+class TypesTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Types
diff --git a/test/classes/PMA_Util_test.php b/test/classes/UtilTest.php
similarity index 97%
rename from test/classes/PMA_Util_test.php
rename to test/classes/UtilTest.php
index a60d84a35e..3df90b82b4 100644
--- a/test/classes/PMA_Util_test.php
+++ b/test/classes/UtilTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Util_Test extends PHPUnit_Framework_TestCase
+class UtilTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/VersionInformation_test.php b/test/classes/VersionInformationTest.php
similarity index 100%
rename from test/classes/VersionInformation_test.php
rename to test/classes/VersionInformationTest.php
diff --git a/test/classes/config/PMA_FormDisplay_test.php b/test/classes/config/FormDisplayTest.php
similarity index 99%
rename from test/classes/config/PMA_FormDisplay_test.php
rename to test/classes/config/FormDisplayTest.php
index 8664e0e83f..83ed963c1e 100644
--- a/test/classes/config/PMA_FormDisplay_test.php
+++ b/test/classes/config/FormDisplayTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/user_preferences.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
+class FormDisplayTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var FormDisplay
diff --git a/test/classes/config/PMA_Form_test.php b/test/classes/config/FormTest.php
similarity index 99%
rename from test/classes/config/PMA_Form_test.php
rename to test/classes/config/FormTest.php
index 3de7743d73..a736ae2789 100644
--- a/test/classes/config/PMA_Form_test.php
+++ b/test/classes/config/FormTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Form_Test extends PHPUnit_Framework_TestCase
+class FormTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Form
diff --git a/test/classes/controllers/DatabaseStructureController_test.php b/test/classes/controllers/DatabaseStructureControllerTest.php
similarity index 99%
rename from test/classes/controllers/DatabaseStructureController_test.php
rename to test/classes/controllers/DatabaseStructureControllerTest.php
index 658905782c..48f7b76c99 100644
--- a/test/classes/controllers/DatabaseStructureController_test.php
+++ b/test/classes/controllers/DatabaseStructureControllerTest.php
@@ -26,7 +26,7 @@ require_once 'test/libraries/stubs/ResponseStub.php';
  *
  * @package PhpMyAdmin-test
  */
-class DatabaseStructureController_Test extends PHPUnit_Framework_TestCase
+class DatabaseStructureControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var \PMA\Test\Stubs\Response
diff --git a/test/classes/controllers/TableIndexesController_test.php b/test/classes/controllers/TableIndexesControllerTest.php
similarity index 98%
rename from test/classes/controllers/TableIndexesController_test.php
rename to test/classes/controllers/TableIndexesControllerTest.php
index 5ad6069d7f..77d1756a29 100644
--- a/test/classes/controllers/TableIndexesController_test.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -31,7 +31,7 @@ require_once 'test/libraries/stubs/ResponseStub.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_TableIndexesControllerTest extends PHPUnit_Framework_TestCase
+class TableIndexesControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Setup function for test cases
diff --git a/test/classes/controllers/TableRelationController_test.php b/test/classes/controllers/TableRelationControllerTest.php
similarity index 99%
rename from test/classes/controllers/TableRelationController_test.php
rename to test/classes/controllers/TableRelationControllerTest.php
index 5d8c8b008f..4932024261 100644
--- a/test/classes/controllers/TableRelationController_test.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -23,7 +23,7 @@ require_once 'test/libraries/stubs/ResponseStub.php';
  *
  * @package PhpMyAdmin-test
  */
-class TableRelationController_Test extends PHPUnit_Framework_TestCase
+class TableRelationControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var \PMA\Test\Stubs\Response
diff --git a/test/classes/controllers/TableSearchController_test.php b/test/classes/controllers/TableSearchControllerTest.php
similarity index 99%
rename from test/classes/controllers/TableSearchController_test.php
rename to test/classes/controllers/TableSearchControllerTest.php
index 82651b6617..1bf87c0969 100644
--- a/test/classes/controllers/TableSearchController_test.php
+++ b/test/classes/controllers/TableSearchControllerTest.php
@@ -21,7 +21,7 @@ require_once 'test/libraries/stubs/ResponseStub.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_TableSearchController_Test extends PHPUnit_Framework_TestCase
+class TableSearchControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var PMA\Test\Stubs\Response
diff --git a/test/classes/controllers/TableStructureController_test.php b/test/classes/controllers/TableStructureControllerTest.php
similarity index 99%
rename from test/classes/controllers/TableStructureController_test.php
rename to test/classes/controllers/TableStructureControllerTest.php
index 689557b025..80a96efb07 100644
--- a/test/classes/controllers/TableStructureController_test.php
+++ b/test/classes/controllers/TableStructureControllerTest.php
@@ -24,7 +24,7 @@ require_once 'test/libraries/stubs/ResponseStub.php';
  *
  * @package PhpMyAdmin-test
  */
-class TableStructureController_Test extends PHPUnit_Framework_TestCase
+class TableStructureControllerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var \PMA\Test\Stubs\Response
diff --git a/test/classes/dbi/DBIMysql_test.php b/test/classes/dbi/DBIMysqlTest.php
similarity index 99%
rename from test/classes/dbi/DBIMysql_test.php
rename to test/classes/dbi/DBIMysqlTest.php
index b5edc27dbb..134f1e2bac 100644
--- a/test/classes/dbi/DBIMysql_test.php
+++ b/test/classes/dbi/DBIMysqlTest.php
@@ -22,7 +22,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_DBI_Mysql_Test extends PHPUnit_Framework_TestCase
+class DBIMysqlTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/dbi/DBIMysqli_test.php b/test/classes/dbi/DBIMysqliTest.php
similarity index 99%
rename from test/classes/dbi/DBIMysqli_test.php
rename to test/classes/dbi/DBIMysqliTest.php
index cc391066ed..fe1c185af4 100644
--- a/test/classes/dbi/DBIMysqli_test.php
+++ b/test/classes/dbi/DBIMysqliTest.php
@@ -21,7 +21,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_DBI_Mysqli_Test extends PHPUnit_Framework_TestCase
+class DBIMysqliTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/GISFactoryTest.php
similarity index 96%
rename from test/classes/gis/PMA_GIS_Factory_test.php
rename to test/classes/gis/GISFactoryTest.php
index d1fc44c6b1..5a1a924d0f 100644
--- a/test/classes/gis/PMA_GIS_Factory_test.php
+++ b/test/classes/gis/GISFactoryTest.php
@@ -12,7 +12,7 @@ use PMA\libraries\gis\GISFactory;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
+class GISFactoryTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/GISGeomTest.php
similarity index 91%
rename from test/classes/gis/PMA_GIS_Geom_test.php
rename to test/classes/gis/GISGeomTest.php
index 88ffc91722..e303bd8137 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/GISGeomTest.php
@@ -7,11 +7,11 @@
  */
 
 /**
- * Abstract parent class for all PMA_GIS_<Geom_type> test classes
+ * Abstract parent class for all GIS<Geom_type> test classes
  *
  * @package PhpMyAdmin-test
  */
-abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
+abstract class GISGeomTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/GISGeometryTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Geometry_test.php
rename to test/classes/gis/GISGeometryTest.php
index f427eb7b1d..d21b5596f8 100644
--- a/test/classes/gis/PMA_GIS_Geometry_test.php
+++ b/test/classes/gis/GISGeometryTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
+class GISGeometryTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/GISGeometrycollectionTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Geometrycollection_test.php
rename to test/classes/gis/GISGeometrycollectionTest.php
index c6c647d498..9a49cd203a 100644
--- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php
+++ b/test/classes/gis/GISGeometrycollectionTest.php
@@ -15,7 +15,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_GeometryCollectionTest extends PHPUnit_Framework_TestCase
+class GISGeometryCollectionTest extends PHPUnit_Framework_TestCase
 {
 
     /**
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/GISLinestringTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Linestring_test.php
rename to test/classes/gis/GISLinestringTest.php
index 5c6d05d3a7..26cff4a5e8 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/GISLinestringTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
+class GISLinestringTest extends GISGeomTest
 {
     /**
      * @var    GISLinestring
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/GISMultilinestringTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Multilinestring_test.php
rename to test/classes/gis/GISMultilinestringTest.php
index cfd3c23ea2..8f3db77d12 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/GISMultilinestringTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
+class GISMultilinestringTest extends GISGeomTest
 {
     /**
      * @var    GISMultilinestring
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/GISMultipointTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Multipoint_test.php
rename to test/classes/gis/GISMultipointTest.php
index 1094e42a50..c43fb87de1 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/GISMultipointTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
+class GISMultipointTest extends GISGeomTest
 {
     /**
      * @var    GISMultipoint
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/GISMultipolygonTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Multipolygon_test.php
rename to test/classes/gis/GISMultipolygonTest.php
index c69908ee0c..1c0304073b 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/GISMultipolygonTest.php
@@ -17,7 +17,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
+class GISMultipolygonTest extends GISGeomTest
 {
     /**
      * @var    GISMultipolygon
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/GISPointTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Point_test.php
rename to test/classes/gis/GISPointTest.php
index 19153ecca9..b37ed6ac92 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/GISPointTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_PointTest extends PMA_GIS_GeomTest
+class GISPointTest extends GISGeomTest
 {
     /**
      * @var    GISPoint
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/GISPolygonTest.php
similarity index 99%
rename from test/classes/gis/PMA_GIS_Polygon_test.php
rename to test/classes/gis/GISPolygonTest.php
index a45a379128..65ee3acce8 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/GISPolygonTest.php
@@ -16,7 +16,7 @@ require_once 'libraries/tcpdf/tcpdf.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
+class GISPolygonTest extends GISGeomTest
 {
     /**
      * @var    GISPolygon
diff --git a/test/classes/navigation/PMA_Navigation_test.php b/test/classes/navigation/NavigationTest.php
similarity index 98%
rename from test/classes/navigation/PMA_Navigation_test.php
rename to test/classes/navigation/NavigationTest.php
index 5cc5d6a087..529d666d50 100644
--- a/test/classes/navigation/PMA_Navigation_test.php
+++ b/test/classes/navigation/NavigationTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_NavigationTest extends PHPUnit_Framework_TestCase
+class NavigationTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var PMA\libraries\navigation\Navigation
diff --git a/test/classes/navigation/PMA_NavigationTree_test.php b/test/classes/navigation/NavigationTreeTest.php
similarity index 97%
rename from test/classes/navigation/PMA_NavigationTree_test.php
rename to test/classes/navigation/NavigationTreeTest.php
index 8d7a74b1ef..45d37b6763 100644
--- a/test/classes/navigation/PMA_NavigationTree_test.php
+++ b/test/classes/navigation/NavigationTreeTest.php
@@ -27,7 +27,7 @@ require_once 'libraries/check_user_privileges.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_NavigationTreeTest extends PHPUnit_Framework_TestCase
+class NavigationTreeTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var NavigationTree
diff --git a/test/classes/navigation/PMA_Node_Column_Container_test.php b/test/classes/navigation/NodeColumnContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Column_Container_test.php
rename to test/classes/navigation/NodeColumnContainerTest.php
index afba75464c..dde0d35876 100644
--- a/test/classes/navigation/PMA_Node_Column_Container_test.php
+++ b/test/classes/navigation/NodeColumnContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Column_Container_Test extends PHPUnit_Framework_TestCase
+class NodeColumnContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/NodeColumnTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Column_test.php
rename to test/classes/navigation/NodeColumnTest.php
index 64b5d79adc..b1315324c0 100644
--- a/test/classes/navigation/PMA_Node_Column_test.php
+++ b/test/classes/navigation/NodeColumnTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Column_Test extends PHPUnit_Framework_TestCase
+class NodeColumnTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_DatabaseChild_test.php b/test/classes/navigation/NodeDatabaseChildTest.php
similarity index 97%
rename from test/classes/navigation/PMA_Node_DatabaseChild_test.php
rename to test/classes/navigation/NodeDatabaseChildTest.php
index b1bf3dd725..35dc1c2f36 100644
--- a/test/classes/navigation/PMA_Node_DatabaseChild_test.php
+++ b/test/classes/navigation/NodeDatabaseChildTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_DatabaseChildTest extends PHPUnit_Framework_TestCase
+class NodeDatabaseChildTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var NodeDatabaseChild
diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/NodeDatabaseTest.php
similarity index 98%
rename from test/classes/navigation/PMA_Node_Database_test.php
rename to test/classes/navigation/NodeDatabaseTest.php
index 47c8384fd6..561043969e 100644
--- a/test/classes/navigation/PMA_Node_Database_test.php
+++ b/test/classes/navigation/NodeDatabaseTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Database_Test extends PHPUnit_Framework_TestCase
+class NodeDatabaseTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/NodeEventContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Event_Container_test.php
rename to test/classes/navigation/NodeEventContainerTest.php
index 690c56c6ff..e5e552229b 100644
--- a/test/classes/navigation/PMA_Node_Event_Container_test.php
+++ b/test/classes/navigation/NodeEventContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Event_Container_Test extends PHPUnit_Framework_TestCase
+class NodeEventContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/NodeEventTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Event_test.php
rename to test/classes/navigation/NodeEventTest.php
index 8729fc6ab5..987e4c923c 100644
--- a/test/classes/navigation/PMA_Node_Event_test.php
+++ b/test/classes/navigation/NodeEventTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/navigation/NodeFactory.php';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Event_Test extends PHPUnit_Framework_TestCase
+class NodeEventTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_NodeFactory_test.php b/test/classes/navigation/NodeFactoryTest.php
similarity index 97%
rename from test/classes/navigation/PMA_NodeFactory_test.php
rename to test/classes/navigation/NodeFactoryTest.php
index 5f672ba84f..9cbf67c135 100644
--- a/test/classes/navigation/PMA_NodeFactory_test.php
+++ b/test/classes/navigation/NodeFactoryTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class NodeFactory_Test extends PHPUnit_Framework_TestCase
+class NodeFactoryTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/NodeFunctionContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Function_Container_test.php
rename to test/classes/navigation/NodeFunctionContainerTest.php
index 5d3e5e584d..69186efd44 100644
--- a/test/classes/navigation/PMA_Node_Function_Container_test.php
+++ b/test/classes/navigation/NodeFunctionContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Function_Container_Test extends PHPUnit_Framework_TestCase
+class NodeFunctionContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/NodeFunctionTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Function_test.php
rename to test/classes/navigation/NodeFunctionTest.php
index c33c06627e..c2c3f9fc94 100644
--- a/test/classes/navigation/PMA_Node_Function_test.php
+++ b/test/classes/navigation/NodeFunctionTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Function_Test extends PHPUnit_Framework_TestCase
+class NodeFunctionTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/NodeIndexContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Index_Container_test.php
rename to test/classes/navigation/NodeIndexContainerTest.php
index 0556c3b3a0..7e29e0d789 100644
--- a/test/classes/navigation/PMA_Node_Index_Container_test.php
+++ b/test/classes/navigation/NodeIndexContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Index_Container_Test extends PHPUnit_Framework_TestCase
+class NodeIndexContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/NodeIndexTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Index_test.php
rename to test/classes/navigation/NodeIndexTest.php
index 1ff0c46a46..f93953045a 100644
--- a/test/classes/navigation/PMA_Node_Index_test.php
+++ b/test/classes/navigation/NodeIndexTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Index_Test extends PHPUnit_Framework_TestCase
+class NodeIndexTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/NodeProcedureContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Procedure_Container_test.php
rename to test/classes/navigation/NodeProcedureContainerTest.php
index 1e2f320f28..0b47158686 100644
--- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php
+++ b/test/classes/navigation/NodeProcedureContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase
+class NodeProcedureContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/NodeProcedureTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Procedure_test.php
rename to test/classes/navigation/NodeProcedureTest.php
index c43e956598..b6ccaf2319 100644
--- a/test/classes/navigation/PMA_Node_Procedure_test.php
+++ b/test/classes/navigation/NodeProcedureTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Procedure_Test extends PHPUnit_Framework_TestCase
+class NodeProcedureTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/NodeTableContainerTest.php
similarity index 95%
rename from test/classes/navigation/PMA_Node_Table_Container_test.php
rename to test/classes/navigation/NodeTableContainerTest.php
index 2f3ef52450..270acc31e2 100644
--- a/test/classes/navigation/PMA_Node_Table_Container_test.php
+++ b/test/classes/navigation/NodeTableContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
+class NodeTableContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/NodeTableTest.php
similarity index 97%
rename from test/classes/navigation/PMA_Node_Table_test.php
rename to test/classes/navigation/NodeTableTest.php
index 0a0e6dc326..a606916065 100644
--- a/test/classes/navigation/PMA_Node_Table_test.php
+++ b/test/classes/navigation/NodeTableTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Table_Test extends PHPUnit_Framework_TestCase
+class NodeTableTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/NodeTest.php
similarity index 99%
rename from test/classes/navigation/PMA_Node_test.php
rename to test/classes/navigation/NodeTest.php
index ab272585cf..d12b62fb95 100644
--- a/test/classes/navigation/PMA_Node_test.php
+++ b/test/classes/navigation/NodeTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Test extends PHPUnit_Framework_TestCase
+class NodeTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/NodeTriggerContainerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Trigger_Container_test.php
rename to test/classes/navigation/NodeTriggerContainerTest.php
index 8fd0da91ac..e66b2d73d1 100644
--- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php
+++ b/test/classes/navigation/NodeTriggerContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
+class NodeTriggerContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/NodeTriggerTest.php
similarity index 94%
rename from test/classes/navigation/PMA_Node_Trigger_test.php
rename to test/classes/navigation/NodeTriggerTest.php
index d43e4748ae..ab0a454572 100644
--- a/test/classes/navigation/PMA_Node_Trigger_test.php
+++ b/test/classes/navigation/NodeTriggerTest.php
@@ -18,7 +18,7 @@ require_once 'libraries/navigation/NodeFactory.php';
  *
  * @package PhpMyAdmin-test
  */
-class Node_Trigger_Test extends PHPUnit_Framework_TestCase
+class NodeTriggerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/NodeViewContainerTest.php
similarity index 95%
rename from test/classes/navigation/PMA_Node_View_Container_test.php
rename to test/classes/navigation/NodeViewContainerTest.php
index 66796bb412..560a67736e 100644
--- a/test/classes/navigation/PMA_Node_View_Container_test.php
+++ b/test/classes/navigation/NodeViewContainerTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_View_Container_Test extends PHPUnit_Framework_TestCase
+class NodeViewContainerTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/NodeViewTest.php
similarity index 95%
rename from test/classes/navigation/PMA_Node_View_test.php
rename to test/classes/navigation/NodeViewTest.php
index 099b0b4f38..f01edcb4bc 100644
--- a/test/classes/navigation/PMA_Node_View_test.php
+++ b/test/classes/navigation/NodeViewTest.php
@@ -19,7 +19,7 @@ require_once 'libraries/php-gettext/gettext.inc';
  *
  * @package PhpMyAdmin-test
  */
-class Node_View_Test extends PHPUnit_Framework_TestCase
+class NodeViewTest extends PHPUnit_Framework_TestCase
 {
     /**
      * SetUp for test cases
diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/AuthenticationConfigTest.php
similarity index 98%
rename from test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
rename to test/classes/plugin/auth/AuthenticationConfigTest.php
index 1db0e94e99..8732c027e9 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
+++ b/test/classes/plugin/auth/AuthenticationConfigTest.php
@@ -17,7 +17,7 @@ require_once 'libraries/js_escape.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
+class AuthenticationConfigTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
similarity index 99%
rename from test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
rename to test/classes/plugin/auth/AuthenticationCookieTest.php
index 050012b579..14eb83dc55 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -24,7 +24,7 @@ require_once 'libraries/plugins/auth/AuthenticationCookie.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
+class AuthenticationCookieTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var AuthenticationCookie
diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/AuthenticationHttpTest.php
similarity index 99%
rename from test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
rename to test/classes/plugin/auth/AuthenticationHttpTest.php
index 59a2f263ff..17fabdde71 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
+++ b/test/classes/plugin/auth/AuthenticationHttpTest.php
@@ -17,7 +17,7 @@ require_once 'libraries/sanitizing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase
+class AuthenticationHttpTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var AuthenticationHttp
diff --git a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php b/test/classes/plugin/auth/AuthenticationSignonTest.php
similarity index 99%
rename from test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
rename to test/classes/plugin/auth/AuthenticationSignonTest.php
index 10ad2dce0d..3b634d844d 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
+++ b/test/classes/plugin/auth/AuthenticationSignonTest.php
@@ -17,7 +17,7 @@ require_once 'libraries/sanitizing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_AuthenticationSignon_Test extends PHPUnit_Framework_TestCase
+class AuthenticationSignonTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportCodegen_test.php b/test/classes/plugin/export/ExportCodegenTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportCodegen_test.php
rename to test/classes/plugin/export/ExportCodegenTest.php
index 2ab6136024..ca6f30001f 100644
--- a/test/classes/plugin/export/PMA_ExportCodegen_test.php
+++ b/test/classes/plugin/export/ExportCodegenTest.php
@@ -17,7 +17,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportCodegen_Test extends PHPUnit_Framework_TestCase
+class ExportCodegenTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportCsv_test.php b/test/classes/plugin/export/ExportCsvTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportCsv_test.php
rename to test/classes/plugin/export/ExportCsvTest.php
index 8c02422a52..e748713234 100644
--- a/test/classes/plugin/export/PMA_ExportCsv_test.php
+++ b/test/classes/plugin/export/ExportCsvTest.php
@@ -17,7 +17,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportCsv_Test extends PHPUnit_Framework_TestCase
+class ExportCsvTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportExcel_test.php b/test/classes/plugin/export/ExportExcelTest.php
similarity index 98%
rename from test/classes/plugin/export/PMA_ExportExcel_test.php
rename to test/classes/plugin/export/ExportExcelTest.php
index cfcafbc6b5..cd3d247e0b 100644
--- a/test/classes/plugin/export/PMA_ExportExcel_test.php
+++ b/test/classes/plugin/export/ExportExcelTest.php
@@ -17,7 +17,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportExcel_Test extends PHPUnit_Framework_TestCase
+class ExportExcelTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/ExportHtmlwordTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportHtmlword_test.php
rename to test/classes/plugin/export/ExportHtmlwordTest.php
index 80397f95fc..17b6d92992 100644
--- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php
+++ b/test/classes/plugin/export/ExportHtmlwordTest.php
@@ -19,7 +19,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
+class ExportHtmlwordTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportJson_test.php b/test/classes/plugin/export/ExportJsonTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportJson_test.php
rename to test/classes/plugin/export/ExportJsonTest.php
index 10e4ad806e..13c27f54e1 100644
--- a/test/classes/plugin/export/PMA_ExportJson_test.php
+++ b/test/classes/plugin/export/ExportJsonTest.php
@@ -17,7 +17,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportJson_Test extends PHPUnit_Framework_TestCase
+class ExportJsonTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/ExportLatexTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportLatex_test.php
rename to test/classes/plugin/export/ExportLatexTest.php
index f0b2b5d1bd..034602fe6b 100644
--- a/test/classes/plugin/export/PMA_ExportLatex_test.php
+++ b/test/classes/plugin/export/ExportLatexTest.php
@@ -19,7 +19,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
+class ExportLatexTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportMediawiki_test.php b/test/classes/plugin/export/ExportMediawikiTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportMediawiki_test.php
rename to test/classes/plugin/export/ExportMediawikiTest.php
index 12caee1548..d66db87d02 100644
--- a/test/classes/plugin/export/PMA_ExportMediawiki_test.php
+++ b/test/classes/plugin/export/ExportMediawikiTest.php
@@ -18,7 +18,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportMediawiki_Test extends PHPUnit_Framework_TestCase
+class ExportMediawikiTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportOds_test.php b/test/classes/plugin/export/ExportOdsTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportOds_test.php
rename to test/classes/plugin/export/ExportOdsTest.php
index 1843a77ceb..655dc305ea 100644
--- a/test/classes/plugin/export/PMA_ExportOds_test.php
+++ b/test/classes/plugin/export/ExportOdsTest.php
@@ -21,7 +21,7 @@ require_once 'libraries/opendocument.lib.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportOds_Test extends PHPUnit_Framework_TestCase
+class ExportOdsTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/ExportOdtTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportOdt_test.php
rename to test/classes/plugin/export/ExportOdtTest.php
index 0a09e8409a..3f51872c67 100644
--- a/test/classes/plugin/export/PMA_ExportOdt_test.php
+++ b/test/classes/plugin/export/ExportOdtTest.php
@@ -22,7 +22,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
+class ExportOdtTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportPdf_test.php b/test/classes/plugin/export/ExportPdfTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportPdf_test.php
rename to test/classes/plugin/export/ExportPdfTest.php
index 66a1a22d8c..13cb0938e0 100644
--- a/test/classes/plugin/export/PMA_ExportPdf_test.php
+++ b/test/classes/plugin/export/ExportPdfTest.php
@@ -19,7 +19,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportPdf_Test extends PHPUnit_Framework_TestCase
+class ExportPdfTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportPhparray_test.php b/test/classes/plugin/export/ExportPhparrayTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportPhparray_test.php
rename to test/classes/plugin/export/ExportPhparrayTest.php
index 4a8292db3e..6c5bd4c934 100644
--- a/test/classes/plugin/export/PMA_ExportPhparray_test.php
+++ b/test/classes/plugin/export/ExportPhparrayTest.php
@@ -18,7 +18,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportPhparray_Test extends PHPUnit_Framework_TestCase
+class ExportPhparrayTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/ExportSqlTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportSql_test.php
rename to test/classes/plugin/export/ExportSqlTest.php
index 4065d6cce4..5128b0928b 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/ExportSqlTest.php
@@ -23,7 +23,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
+class ExportSqlTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/ExportTexytextTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportTexytext_test.php
rename to test/classes/plugin/export/ExportTexytextTest.php
index b60768e7d3..04b0874d0f 100644
--- a/test/classes/plugin/export/PMA_ExportTexytext_test.php
+++ b/test/classes/plugin/export/ExportTexytextTest.php
@@ -20,7 +20,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase
+class ExportTexytextTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportXml_test.php b/test/classes/plugin/export/ExportXmlTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportXml_test.php
rename to test/classes/plugin/export/ExportXmlTest.php
index 3b6cea0cb7..d85b097f23 100644
--- a/test/classes/plugin/export/PMA_ExportXml_test.php
+++ b/test/classes/plugin/export/ExportXmlTest.php
@@ -21,7 +21,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase
+class ExportXmlTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_ExportYaml_test.php b/test/classes/plugin/export/ExportYamlTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_ExportYaml_test.php
rename to test/classes/plugin/export/ExportYamlTest.php
index d1049905d9..2793417ca9 100644
--- a/test/classes/plugin/export/PMA_ExportYaml_test.php
+++ b/test/classes/plugin/export/ExportYamlTest.php
@@ -19,7 +19,7 @@ require_once 'export.php';
  * @package PhpMyAdmin-test
  * @group medium
  */
-class PMA_ExportYaml_Test extends PHPUnit_Framework_TestCase
+class ExportYamlTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/export/PMA_TableProperty_test.php b/test/classes/plugin/export/TablePropertyTest.php
similarity index 99%
rename from test/classes/plugin/export/PMA_TableProperty_test.php
rename to test/classes/plugin/export/TablePropertyTest.php
index 52331c8948..0041dcc796 100644
--- a/test/classes/plugin/export/PMA_TableProperty_test.php
+++ b/test/classes/plugin/export/TablePropertyTest.php
@@ -15,7 +15,7 @@ require_once 'libraries/config.default.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_TableProperty_Test extends PHPUnit_Framework_TestCase
+class TablePropertyTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/plugin/import/ImportCsv_test.php b/test/classes/plugin/import/ImportCsvTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportCsv_test.php
rename to test/classes/plugin/import/ImportCsvTest.php
index 053745a2d0..e4704cee50 100644
--- a/test/classes/plugin/import/ImportCsv_test.php
+++ b/test/classes/plugin/import/ImportCsvTest.php
@@ -28,7 +28,7 @@ require_once 'libraries/sanitizing.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportCsv_Test extends PHPUnit_Framework_TestCase
+class ImportCsvTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var ImportCsv
diff --git a/test/classes/plugin/import/ImportLdi_test.php b/test/classes/plugin/import/ImportLdiTest.php
similarity index 99%
rename from test/classes/plugin/import/ImportLdi_test.php
rename to test/classes/plugin/import/ImportLdiTest.php
index 05c4120fcc..e08529916c 100644
--- a/test/classes/plugin/import/ImportLdi_test.php
+++ b/test/classes/plugin/import/ImportLdiTest.php
@@ -28,7 +28,7 @@ require_once 'libraries/import.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportLdi_Test extends PHPUnit_Framework_TestCase
+class ImportLdiTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportMediawiki_test.php b/test/classes/plugin/import/ImportMediawikiTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportMediawiki_test.php
rename to test/classes/plugin/import/ImportMediawikiTest.php
index af85d5268d..3207c873e3 100644
--- a/test/classes/plugin/import/ImportMediawiki_test.php
+++ b/test/classes/plugin/import/ImportMediawikiTest.php
@@ -25,7 +25,7 @@ require_once 'libraries/import.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportMediawiki_Test extends PHPUnit_Framework_TestCase
+class ImportMediawikiTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportOds_test.php b/test/classes/plugin/import/ImportOdsTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportOds_test.php
rename to test/classes/plugin/import/ImportOdsTest.php
index aa44c11220..735a9d9d2e 100644
--- a/test/classes/plugin/import/ImportOds_test.php
+++ b/test/classes/plugin/import/ImportOdsTest.php
@@ -28,7 +28,7 @@ require_once 'libraries/plugins/import/ImportOds.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportOds_Test extends PHPUnit_Framework_TestCase
+class ImportOdsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportShp_test.php b/test/classes/plugin/import/ImportShpTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportShp_test.php
rename to test/classes/plugin/import/ImportShpTest.php
index 1b384e632e..36cafc29b6 100644
--- a/test/classes/plugin/import/ImportShp_test.php
+++ b/test/classes/plugin/import/ImportShpTest.php
@@ -23,7 +23,7 @@ require_once 'libraries/import.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportShp_Test extends PHPUnit_Framework_TestCase
+class ImportShpTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var ImportShp
diff --git a/test/classes/plugin/import/ImportSql_test.php b/test/classes/plugin/import/ImportSqlTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportSql_test.php
rename to test/classes/plugin/import/ImportSqlTest.php
index f1d9cf81aa..1ac0417449 100644
--- a/test/classes/plugin/import/ImportSql_test.php
+++ b/test/classes/plugin/import/ImportSqlTest.php
@@ -26,7 +26,7 @@ require_once 'libraries/import.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportSql_Test extends PHPUnit_Framework_TestCase
+class ImportSqlTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/import/ImportXml_test.php b/test/classes/plugin/import/ImportXmlTest.php
similarity index 98%
rename from test/classes/plugin/import/ImportXml_test.php
rename to test/classes/plugin/import/ImportXmlTest.php
index b48a3d70f2..143301ec2d 100644
--- a/test/classes/plugin/import/ImportXml_test.php
+++ b/test/classes/plugin/import/ImportXmlTest.php
@@ -26,7 +26,7 @@ require_once 'libraries/import.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class ImportXml_Test extends PHPUnit_Framework_TestCase
+class ImportXmlTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/plugin/transformations/Transformation_Plugins_test.php b/test/classes/plugin/transformations/TransformationPluginsTest.php
similarity index 99%
rename from test/classes/plugin/transformations/Transformation_Plugins_test.php
rename to test/classes/plugin/transformations/TransformationPluginsTest.php
index f41c895c1f..6d952696a4 100644
--- a/test/classes/plugin/transformations/Transformation_Plugins_test.php
+++ b/test/classes/plugin/transformations/TransformationPluginsTest.php
@@ -34,7 +34,7 @@ require_once 'libraries/config.default.php';
  *
  * @package PhpMyAdmin-test
  */
-class Transformation_Plugins_Test extends PHPUnit_Framework_TestCase
+class TransformationPluginsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Sets up the fixture, for example, opens a network connection.
diff --git a/test/classes/properties/PMA_PropertyItem_test.php b/test/classes/properties/PropertyItemTest.php
similarity index 93%
rename from test/classes/properties/PMA_PropertyItem_test.php
rename to test/classes/properties/PropertyItemTest.php
index 024a8515b4..08e5606be0 100644
--- a/test/classes/properties/PMA_PropertyItem_test.php
+++ b/test/classes/properties/PropertyItemTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_PropertyItem_Test extends PHPUnit_Framework_TestCase
+class PropertyItemTest extends PHPUnit_Framework_TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php b/test/classes/properties/options/OptionsPropertyGroupTest.php
similarity index 97%
rename from test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
rename to test/classes/properties/options/OptionsPropertyGroupTest.php
index e657117130..5bfcc3616e 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
+++ b/test/classes/properties/options/OptionsPropertyGroupTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertyGroup_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertyGroupTest extends PHPUnit_Framework_TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php b/test/classes/properties/options/OptionsPropertyItemTest.php
similarity index 97%
rename from test/classes/properties/options/PMA_OptionsPropertyItem_test.php
rename to test/classes/properties/options/OptionsPropertyItemTest.php
index 96c4823786..9811d8d644 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php
+++ b/test/classes/properties/options/OptionsPropertyItemTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertyItem_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertyItemTest extends PHPUnit_Framework_TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php b/test/classes/properties/options/OptionsPropertyOneItemTest.php
similarity index 97%
rename from test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
rename to test/classes/properties/options/OptionsPropertyOneItemTest.php
index e27486feb3..e312442198 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
+++ b/test/classes/properties/options/OptionsPropertyOneItemTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertyOneItem_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertyOneItemTest extends PHPUnit_Framework_TestCase
 {
     protected $stub;
 
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
similarity index 93%
rename from test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
rename to test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
index e817003be7..5474c4d72c 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
+++ b/test/classes/properties/options/groups/OptionsPropertyMainGroupTest.php
@@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertyMainGroup_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertyMainGroupTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
similarity index 93%
rename from test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
rename to test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
index 1756c799fb..b52eb4e1ae 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
+++ b/test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php
@@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertyRootGroup_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertyRootGroupTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
similarity index 95%
rename from test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
rename to test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
index b0603ec6aa..b12f6257f4 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
+++ b/test/classes/properties/options/groups/OptionsPropertySubgroupTest.php
@@ -13,7 +13,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertySubgroup;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_OptionsPropertySubgroup_Test extends PHPUnit_Framework_TestCase
+class OptionsPropertySubgroupTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/options/items/PMA_PropertyItems_test.php b/test/classes/properties/options/items/PropertyItemsTest.php
similarity index 97%
rename from test/classes/properties/options/items/PMA_PropertyItems_test.php
rename to test/classes/properties/options/items/PropertyItemsTest.php
index 1afc237836..b2aeb8f205 100644
--- a/test/classes/properties/options/items/PMA_PropertyItems_test.php
+++ b/test/classes/properties/options/items/PropertyItemsTest.php
@@ -19,7 +19,7 @@ use PMA\libraries\properties\options\items\TextPropertyItem;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_PropertyItems_Test extends PHPUnit_Framework_TestCase
+class PropertyItemsTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Test for PMA\libraries\properties\options\items\BoolPropertyItem::getItemType
diff --git a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php b/test/classes/properties/plugins/ExportPluginPropertiesTest.php
similarity index 95%
rename from test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
rename to test/classes/properties/plugins/ExportPluginPropertiesTest.php
index 17eefdcad8..ed93f9654e 100644
--- a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
+++ b/test/classes/properties/plugins/ExportPluginPropertiesTest.php
@@ -16,7 +16,7 @@ require_once 'test/classes/properties/plugins/PMA_ImportPluginProperties_test.ph
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ExportPluginProperties_Test extends PMA_ImportPluginProperties_Test
+class ExportPluginPropertiesTest extends PMA_ImportPluginProperties_Test
 {
     protected $object;
 
diff --git a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php b/test/classes/properties/plugins/ImportPluginPropertiesTest.php
similarity index 96%
rename from test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
rename to test/classes/properties/plugins/ImportPluginPropertiesTest.php
index 872a6f9729..53eb0455ff 100644
--- a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
+++ b/test/classes/properties/plugins/ImportPluginPropertiesTest.php
@@ -13,7 +13,7 @@ use PMA\libraries\properties\plugins\ImportPluginProperties;
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ImportPluginProperties_Test extends PHPUnit_Framework_TestCase
+class ImportPluginPropertiesTest extends PHPUnit_Framework_TestCase
 {
     protected $object;
 
diff --git a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php b/test/classes/properties/plugins/PluginPropertyItemTest.php
similarity index 94%
rename from test/classes/properties/plugins/PMA_PluginPropertyItem_test.php
rename to test/classes/properties/plugins/PluginPropertyItemTest.php
index e11b9d6903..4e578b64c5 100644
--- a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php
+++ b/test/classes/properties/plugins/PluginPropertyItemTest.php
@@ -11,7 +11,7 @@
  *
  * @package PhpMyAdmin-test
  */
-class PMA_PluginPropertyItem_Test extends PHPUnit_Framework_TestCase
+class PluginPropertyItemTest extends PHPUnit_Framework_TestCase
 {
     protected $stub;
 
diff --git a/test/classes/schema/Dia_Relation_Schema_test.php b/test/classes/schema/DiaRelationSchemaTest.php
similarity index 98%
rename from test/classes/schema/Dia_Relation_Schema_test.php
rename to test/classes/schema/DiaRelationSchemaTest.php
index 71b7cbd1e1..5fec91e182 100644
--- a/test/classes/schema/Dia_Relation_Schema_test.php
+++ b/test/classes/schema/DiaRelationSchemaTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Dia_Relation_Schema_Test extends PHPUnit_Framework_TestCase
+class DiaRelationSchemaTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/Eps_Relation_Schema_test.php b/test/classes/schema/EpsRelationSchemaTest.php
similarity index 98%
rename from test/classes/schema/Eps_Relation_Schema_test.php
rename to test/classes/schema/EpsRelationSchemaTest.php
index 8151c80ba3..273bbf42b5 100644
--- a/test/classes/schema/Eps_Relation_Schema_test.php
+++ b/test/classes/schema/EpsRelationSchemaTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Eps_Relation_Schema_Test extends PHPUnit_Framework_TestCase
+class EpsRelationSchemaTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/Export_Relation_Schema_test.php b/test/classes/schema/ExportRelationSchemaTest.php
similarity index 98%
rename from test/classes/schema/Export_Relation_Schema_test.php
rename to test/classes/schema/ExportRelationSchemaTest.php
index 0de74b6406..4050ba5488 100644
--- a/test/classes/schema/Export_Relation_Schema_test.php
+++ b/test/classes/schema/ExportRelationSchemaTest.php
@@ -21,7 +21,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Export_Relation_Schema_Test extends PHPUnit_Framework_TestCase
+class ExportRelationSchemaTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/Pdf_Relation_Schema_test.php b/test/classes/schema/PdfRelationSchemaTest.php
similarity index 99%
rename from test/classes/schema/Pdf_Relation_Schema_test.php
rename to test/classes/schema/PdfRelationSchemaTest.php
index e21c8773f3..bc9c051d4b 100644
--- a/test/classes/schema/Pdf_Relation_Schema_test.php
+++ b/test/classes/schema/PdfRelationSchemaTest.php
@@ -21,7 +21,7 @@ require_once 'libraries/transformations.lib.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Pdf_Relation_Schema_Test extends PHPUnit_Framework_TestCase
+class PdfRelationSchemaTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected
diff --git a/test/classes/schema/Svg_Relation_Schema_test.php b/test/classes/schema/SvgRelationSchemaTest.php
similarity index 98%
rename from test/classes/schema/Svg_Relation_Schema_test.php
rename to test/classes/schema/SvgRelationSchemaTest.php
index 74c16a279a..1c2efbea58 100644
--- a/test/classes/schema/Svg_Relation_Schema_test.php
+++ b/test/classes/schema/SvgRelationSchemaTest.php
@@ -20,7 +20,7 @@ require_once 'libraries/database_interface.inc.php';
  *
  * @package PhpMyAdmin-test
  */
-class PMA_Svg_Relation_Schema_Test extends PHPUnit_Framework_TestCase
+class SvgRelationSchemaTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @access protected