diff --git a/libraries/PDF.php b/libraries/PDF.php
index 150424d2ac..b45b09a7d5 100644
--- a/libraries/PDF.php
+++ b/libraries/PDF.php
@@ -87,7 +87,7 @@ class PDF extends TCPDF
      *
      * @return void
      */
-    public function SetAlias($name, $value)
+    public function setAlias($name, $value)
     {
         $name = TCPDF_FONTS::UTF8ToUTF16BE(
             $name, false, true, $this->CurrentFont
@@ -136,7 +136,7 @@ class PDF extends TCPDF
      *
      * @return void
      */
-    public function Download($filename)
+    public function download($filename)
     {
         $pdfData = $this->getPDFData();
         Response::getInstance()->disable();
diff --git a/libraries/Response.php b/libraries/Response.php
index 845a03532d..87b99624c7 100644
--- a/libraries/Response.php
+++ b/libraries/Response.php
@@ -464,7 +464,7 @@ class Response
      *
      * @return void
      */
-    public function http_response_code($response_code)
+    public function httpResponseCode($response_code)
     {
         http_response_code($response_code);
     }
@@ -476,9 +476,9 @@ class Response
      *
      * @return void
      */
-    public function set_http_response_code($response_code)
+    public function setHttpResponseCode($response_code)
     {
-        $this->http_response_code($response_code);
+        $this->httpResponseCode($response_code);
         switch ($response_code) {
             case 100: $httpStatusMsg = ' Continue'; break;
             case 101: $httpStatusMsg = ' Switching Protocols'; break;
@@ -533,7 +533,7 @@ class Response
      */
     public function generateHeader303($location)
     {
-        $this->set_http_response_code(303);
+        $this->setHttpResponseCode(303);
         $this->header('Location: '.$location);
         if (!defined('TESTSUITE')) {
             exit;
diff --git a/libraries/StorageEngine.php b/libraries/StorageEngine.php
index 07c7dcc11c..735080eff2 100644
--- a/libraries/StorageEngine.php
+++ b/libraries/StorageEngine.php
@@ -17,11 +17,11 @@ use PMA\libraries\engines\Innobase;
 use PMA\libraries\engines\Innodb;
 use PMA\libraries\engines\Memory;
 use PMA\libraries\engines\Merge;
-use PMA\libraries\engines\Mrg_Myisam;
+use PMA\libraries\engines\MrgMyisam;
 use PMA\libraries\engines\Myisam;
 use PMA\libraries\engines\Ndbcluster;
 use PMA\libraries\engines\Pbxt;
-use PMA\libraries\engines\Performance_Schema;
+use PMA\libraries\engines\PerformanceSchema;
 
 define('PMA_ENGINE_SUPPORT_NO', 0);
 define('PMA_ENGINE_SUPPORT_DISABLED', 1);
@@ -203,7 +203,7 @@ class StorageEngine
         case 'merge':
             return new Merge($engine);
         case 'mrg_myisam':
-            return new Mrg_Myisam($engine);
+            return new MrgMyisam($engine);
         case 'myisam':
             return new Myisam($engine);
         case 'ndbcluster':
@@ -211,7 +211,7 @@ class StorageEngine
         case 'pbxt':
             return new Pbxt($engine);
         case 'performance_schema':
-            return new Performance_Schema($engine);
+            return new PerformanceSchema($engine);
         default:
             return new StorageEngine($engine);
         }
@@ -458,4 +458,3 @@ class StorageEngine
         return $this->$id();
     }
 }
-
diff --git a/libraries/engines/Mrg_Myisam.php b/libraries/engines/MrgMyisam.php
similarity index 93%
rename from libraries/engines/Mrg_Myisam.php
rename to libraries/engines/MrgMyisam.php
index 39bd272066..8fdc76e850 100644
--- a/libraries/engines/Mrg_Myisam.php
+++ b/libraries/engines/MrgMyisam.php
@@ -12,7 +12,7 @@ namespace PMA\libraries\engines;
  *
  * @package PhpMyAdmin-Engines
  */
-class Mrg_Myisam extends Merge
+class MrgMyisam extends Merge
 {
     /**
      * returns string with filename for the MySQL helppage
@@ -25,4 +25,3 @@ class Mrg_Myisam extends Merge
         return 'merge-storage-engine';
     }
 }
-
diff --git a/libraries/engines/Performance_Schema.php b/libraries/engines/PerformanceSchema.php
similarity index 91%
rename from libraries/engines/Performance_Schema.php
rename to libraries/engines/PerformanceSchema.php
index e0c53aef7f..46909f9c08 100644
--- a/libraries/engines/Performance_Schema.php
+++ b/libraries/engines/PerformanceSchema.php
@@ -14,7 +14,7 @@ use PMA\libraries\StorageEngine;
  *
  * @package PhpMyAdmin-Engines
  */
-class Performance_Schema extends StorageEngine
+class PerformanceSchema extends StorageEngine
 {
     /**
      * Returns string with filename for the MySQL helppage
@@ -27,4 +27,3 @@ class Performance_Schema extends StorageEngine
         return 'performance-schema';
     }
 }
-
diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php
index cf044d4a70..927bc56802 100644
--- a/libraries/plugins/auth/AuthenticationHttp.php
+++ b/libraries/plugins/auth/AuthenticationHttp.php
@@ -66,7 +66,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         // remove non US-ASCII to respect RFC2616
         $realm_message = preg_replace('/[^\x20-\x7e]/i', '', $realm_message);
         $response->header('WWW-Authenticate: Basic realm="' . $realm_message . '"');
-        $response->set_http_response_code(401);
+        $response->setHttpResponseCode(401);
 
         /* HTML header */
         $footer = $response->getFooter();
diff --git a/libraries/plugins/export/ExportCodegen.php b/libraries/plugins/export/ExportCodegen.php
index 52c9a29a64..8cf6c10d50 100644
--- a/libraries/plugins/export/ExportCodegen.php
+++ b/libraries/plugins/export/ExportCodegen.php
@@ -15,7 +15,7 @@ use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
 use PMA;
 use PMA\libraries\properties\options\items\SelectPropertyItem;
-use PMA\libraries\plugins\export\TableProperty;
+use PMA\libraries\plugins\export\helpers\TableProperty;
 
 /**
  * Handles the export for the CodeGen class
diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/plugins/export/ExportPdf.php
index 3204154546..4f6f907dec 100644
--- a/libraries/plugins/export/ExportPdf.php
+++ b/libraries/plugins/export/ExportPdf.php
@@ -12,7 +12,7 @@ use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\properties\plugins\ExportPluginProperties;
 use PMA\libraries\properties\options\groups\OptionsPropertyMainGroup;
 use PMA\libraries\properties\options\groups\OptionsPropertyRootGroup;
-use PMA\libraries\plugins\export\PMA_ExportPdf;
+use PMA\libraries\plugins\export\helpers\Pdf;
 use PMA\libraries\properties\options\items\RadioPropertyItem;
 use PMA\libraries\properties\options\items\TextPropertyItem;
 
@@ -35,9 +35,9 @@ require_once 'libraries/transformations.lib.php';
 class ExportPdf extends ExportPlugin
 {
     /**
-     * PMA\libraries\plugins\export\PMA_ExportPdf instance
+     * PMA\libraries\plugins\export\helpers\Pdf instance
      *
-     * @var PMA_ExportPdf
+     * @var Pdf
      */
     private $_pdf;
     /**
@@ -68,7 +68,7 @@ class ExportPdf extends ExportPlugin
         if (!empty($_POST['pdf_report_title'])) {
             $this->_setPdfReportTitle($_POST['pdf_report_title']);
         }
-        $this->_setPdf(new PMA_ExportPdf('L', 'pt', 'A3'));
+        $this->_setPdf(new Pdf('L', 'pt', 'A3'));
     }
 
     /**
@@ -345,9 +345,9 @@ class ExportPdf extends ExportPlugin
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
 
     /**
-     * Gets the PMA\libraries\plugins\export\PMA_ExportPdf instance
+     * Gets the PMA\libraries\plugins\export\helpers\Pdf instance
      *
-     * @return PMA_ExportPdf
+     * @return Pdf
      */
     private function _getPdf()
     {
@@ -355,9 +355,9 @@ class ExportPdf extends ExportPlugin
     }
 
     /**
-     * Instantiates the PMA\libraries\plugins\export\PMA_ExportPdf class
+     * Instantiates the PMA\libraries\plugins\export\helpers\Pdf class
      *
-     * @param PMA_ExportPdf $pdf The instance
+     * @param Pdf $pdf The instance
      *
      * @return void
      */
diff --git a/libraries/plugins/export/PMA_ExportPdf.php b/libraries/plugins/export/helpers/Pdf.php
similarity index 98%
rename from libraries/plugins/export/PMA_ExportPdf.php
rename to libraries/plugins/export/helpers/Pdf.php
index 409a302ae8..aef8339ed5 100644
--- a/libraries/plugins/export/PMA_ExportPdf.php
+++ b/libraries/plugins/export/helpers/Pdf.php
@@ -1,15 +1,15 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * PMA\libraries\plugins\export\TableProperty class
+ * PMA\libraries\plugins\export\helpers\Pdf class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage PDF
  */
-namespace PMA\libraries\plugins\export;
+namespace PMA\libraries\plugins\export\helpers;
 
 use PMA\libraries\DatabaseInterface;
-use PMA\libraries\PDF;
+use PMA\libraries\PDF as PdfLib;
 use PMA\libraries\Util;
 use TCPDF_STATIC;
 
@@ -19,7 +19,7 @@ use TCPDF_STATIC;
  * @package    PhpMyAdmin-Export
  * @subpackage PDF
  */
-class PMA_ExportPdf extends PDF
+class Pdf extends PdfLib
 {
     var $tablewidths;
     var $headerset;
@@ -104,14 +104,14 @@ class PMA_ExportPdf extends PDF
             $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 5);
             $this->cellFontSize = $this->FontSizePt;
             $this->SetFont(
-                PDF::PMA_PDF_FONT,
+                PdfLib::PMA_PDF_FONT,
                 '',
                 ($this->titleFontSize
                     ? $this->titleFontSize
                     : $this->FontSizePt)
             );
             $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
-            $this->SetFont(PDF::PMA_PDF_FONT, '', $this->cellFontSize);
+            $this->SetFont(PdfLib::PMA_PDF_FONT, '', $this->cellFontSize);
             $this->SetY(($this->tMargin) - ($this->FontSizePt / $this->k) * 2.5);
             $this->Cell(
                 0,
@@ -328,7 +328,7 @@ class PMA_ExportPdf extends PDF
 
         $this->setY($this->tMargin);
         $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
+        $this->SetFont(PdfLib::PMA_PDF_FONT, '', 9);
 
         $l = $this->lMargin;
         $startheight = $h = $this->dataY;
@@ -510,7 +510,7 @@ class PMA_ExportPdf extends PDF
 
         $this->setY($this->tMargin);
         $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
+        $this->SetFont(PdfLib::PMA_PDF_FONT, '', 9);
 
         // Now let's start to write the table structure
 
@@ -805,8 +805,8 @@ class PMA_ExportPdf extends PDF
         );
         $this->setY($this->tMargin);
         $this->AddPage();
-        $this->SetFont(PDF::PMA_PDF_FONT, '', 9);
+        $this->SetFont(PdfLib::PMA_PDF_FONT, '', 9);
         $this->morepagestable($this->FontSizePt);
         $GLOBALS['dbi']->freeResult($this->results);
     } // end of mysqlReport function
-} // end of PMA_Export_PDF class
+} // end of Pdf class
diff --git a/libraries/plugins/export/TableProperty.php b/libraries/plugins/export/helpers/TableProperty.php
similarity index 96%
rename from libraries/plugins/export/TableProperty.php
rename to libraries/plugins/export/helpers/TableProperty.php
index eb32870a22..ade7689be3 100644
--- a/libraries/plugins/export/TableProperty.php
+++ b/libraries/plugins/export/helpers/TableProperty.php
@@ -1,15 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Holds the PMA\libraries\plugins\export\TableProperty class
+ * Holds the PMA\libraries\plugins\export\helpers\TableProperty class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage CodeGen
  */
-namespace PMA\libraries\plugins\export;
+namespace PMA\libraries\plugins\export\helpers;
+
+use PMA\libraries\plugins\export\ExportCodegen;
 
 /**
- * PMA\libraries\plugins\export\TableProperty class
+ * PMA\libraries\plugins\export\helpers\TableProperty class
  *
  * @package    PhpMyAdmin-Export
  * @subpackage CodeGen
diff --git a/libraries/plugins/schema/pdf/Pdf.php b/libraries/plugins/schema/pdf/Pdf.php
index 6a3721c952..7971090048 100644
--- a/libraries/plugins/schema/pdf/Pdf.php
+++ b/libraries/plugins/schema/pdf/Pdf.php
@@ -277,7 +277,7 @@ class Pdf extends PDF_lib
      *
      * @return void
      */
-    public function SetWidths($w)
+    public function setWidths($w)
     {
         // column widths
         $this->widths = $w;
@@ -291,13 +291,13 @@ class Pdf extends PDF_lib
      *
      * @return void
      */
-    public function Row($data, $links)
+    public function row($data, $links)
     {
         // line height
         $nb = 0;
         $data_cnt = count($data);
         for ($i = 0;$i < $data_cnt;$i++) {
-            $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i]));
+            $nb = max($nb, $this->numLines($this->widths[$i], $data[$i]));
         }
         $il = $this->FontSize;
         $h = ($il + 1) * $nb;
@@ -332,7 +332,7 @@ class Pdf extends PDF_lib
      *
      * @return int
      */
-    public function NbLines($w, $txt)
+    public function numLines($w, $txt)
     {
         $cw = &$this->CurrentFont['cw'];
         if ($w == 0) {
diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/plugins/schema/pdf/PdfRelationSchema.php
index 3d2d1b1472..a8e4c97764 100644
--- a/libraries/plugins/schema/pdf/PdfRelationSchema.php
+++ b/libraries/plugins/schema/pdf/PdfRelationSchema.php
@@ -128,7 +128,7 @@ class PdfRelationSchema extends ExportRelationSchema
         if ($this->_withDoc) {
             $this->diagram->SetLink($this->diagram->PMA_links['RT']['-'], -1);
             $this->diagram->Bookmark(__('Relational schema'));
-            $this->diagram->SetAlias('{00}', $this->diagram->PageNo());
+            $this->diagram->setAlias('{00}', $this->diagram->PageNo());
             $this->_topMargin = 28;
             $this->_bottomMargin = 28;
         }
@@ -307,7 +307,7 @@ class PdfRelationSchema extends ExportRelationSchema
      */
     public function showOutput()
     {
-        $this->diagram->Download($this->getFileName('.pdf'));
+        $this->diagram->download($this->getFileName('.pdf'));
     }
 
     /**
@@ -531,7 +531,7 @@ class PdfRelationSchema extends ExportRelationSchema
             $this->diagram->SetAutoPageBreak(true, 15);
             $this->diagram->addpage($this->orientation);
             $this->diagram->Bookmark($table);
-            $this->diagram->SetAlias(
+            $this->diagram->setAlias(
                 '{' . sprintf("%02d", $z) . '}', $this->diagram->PageNo()
             );
             $this->diagram->PMA_links['RT'][$table]['-']
@@ -645,7 +645,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 }
                 $this->diagram->Cell($comments_width, 8, __('Comments'), 1, 0, 'C');
                 $this->diagram->Cell(45, 8, 'MIME', 1, 1, 'C');
-                $this->diagram->SetWidths(
+                $this->diagram->setWidths(
                     array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45)
                 );
             } else {
@@ -658,7 +658,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 $this->diagram->Cell(30, 8, __('Links to'), 1, 0, 'C');
                 $this->diagram->Cell(30, 8, __('Comments'), 1, 0, 'C');
                 $this->diagram->Cell(30, 8, 'MIME', 1, 1, 'C');
-                $this->diagram->SetWidths(array(20, 20, 20, 10, 15, 15, 30, 30, 30));
+                $this->diagram->setWidths(array(20, 20, 20, 10, 15, 15, 30, 30, 30));
             }
             $this->diagram->SetFont($this->_ff, '');
 
@@ -724,7 +724,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 } else {
                     unset($links[6]);
                 }
-                $this->diagram->Row($this->diagram_row, $links);
+                $this->diagram->row($this->diagram_row, $links);
             } // end foreach
             $this->diagram->SetFont($this->_ff, '', 14);
         } //end each
diff --git a/test/PMATestCase.php b/test/PMATestCase.php
index b7dd727411..d69813b704 100644
--- a/test/PMATestCase.php
+++ b/test/PMATestCase.php
@@ -36,7 +36,7 @@ class PMATestCase extends PHPUnit_Framework_TestCase
             ->setMethods(array(
                 'header', 'headersSent', 'disable', 'isAjax',
                 'setRequestStatus', 'addJSON', 'addHTML',
-                'getFooter', 'getHeader','http_response_code',
+                'getFooter', 'getHeader','httpResponseCode',
             ))
             ->getMock();
 
@@ -56,7 +56,7 @@ class PMATestCase extends PHPUnit_Framework_TestCase
                         $param = array_slice($param, 0, -1);
 
                         $header_method = $mockResponse->expects($this->once())
-                        ->method('http_response_code')->with($http_response_code_param);
+                        ->method('httpResponseCode')->with($http_response_code_param);
                     }
                 }
 
diff --git a/test/classes/PDFTest.php b/test/classes/PDFTest.php
index cf328b0fc6..5d529b0efe 100644
--- a/test/classes/PDFTest.php
+++ b/test/classes/PDFTest.php
@@ -52,7 +52,7 @@ class PDFTest extends PMATestCase
     public function testAlias()
     {
         $arr = new PDF();
-        $arr->SetAlias('{00}', '32');
+        $arr->setAlias('{00}', '32');
         $this->assertContains('PDF', $arr->getPDFData());
     }
 
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 15cddaca3e..2a2f7d81ae 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -133,11 +133,11 @@ class StorageEngineTest extends PMATestCase
             array('PMA\libraries\engines\Innodb', 'Innodb'),
             array('PMA\libraries\engines\Memory', 'Memory'),
             array('PMA\libraries\engines\Merge', 'Merge'),
-            array('PMA\libraries\engines\Mrg_Myisam', 'Mrg_Myisam'),
+            array('PMA\libraries\engines\MrgMyisam', 'Mrg_Myisam'),
             array('PMA\libraries\engines\Myisam', 'Myisam'),
             array('PMA\libraries\engines\Ndbcluster', 'Ndbcluster'),
             array('PMA\libraries\engines\Pbxt', 'Pbxt'),
-            array('PMA\libraries\engines\Performance_Schema', 'Performance_Schema'),
+            array('PMA\libraries\engines\PerformanceSchema', 'Performance_Schema'),
         );
     }
 
diff --git a/test/classes/engines/Mrg_MyisamTest.php b/test/classes/engines/MrgMyisamTest.php
similarity index 82%
rename from test/classes/engines/Mrg_MyisamTest.php
rename to test/classes/engines/MrgMyisamTest.php
index c48981bdac..6e9f726d3e 100644
--- a/test/classes/engines/Mrg_MyisamTest.php
+++ b/test/classes/engines/MrgMyisamTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for PMA\libraries\engines\Mrg_Myisam
+ * Tests for PMA\libraries\engines\MrgMyisam
  *
  * @package PhpMyAdmin-test
  */
@@ -9,17 +9,17 @@
  * Include to test.
  */
 
-use PMA\libraries\engines\Mrg_Myisam;
+use PMA\libraries\engines\MrgMyisam;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * Tests for PMA\libraries\engines\Mrg_Myisam
+ * Tests for PMA\libraries\engines\MrgMyisam
  *
  * @package PhpMyAdmin-test
  */
-class Mrg_MyisamTest extends PMATestCase
+class MrgMyisamTest extends PMATestCase
 {
     /**
      * @access protected
@@ -36,7 +36,7 @@ class Mrg_MyisamTest extends PMATestCase
     protected function setUp()
     {
         $GLOBALS['server'] = 0;
-        $this->object = new Mrg_Myisam('mrg_myisam');
+        $this->object = new MrgMyisam('mrg_myisam');
     }
 
     /**
diff --git a/test/classes/plugin/export/ExportPdfTest.php b/test/classes/plugin/export/ExportPdfTest.php
index 03c854d67f..9bc4676326 100644
--- a/test/classes/plugin/export/ExportPdfTest.php
+++ b/test/classes/plugin/export/ExportPdfTest.php
@@ -6,7 +6,7 @@
  * @package PhpMyAdmin-test
  */
 use PMA\libraries\plugins\export\ExportPdf;
-use PMA\libraries\plugins\export\PMA_ExportPdf;
+use PMA\libraries\plugins\export\helpers\Pdf;
 
 require_once 'libraries/export.lib.php';
 require_once 'libraries/config.default.php';
@@ -181,7 +181,7 @@ class ExportPdfTest extends PMATestCase
      */
     public function testExportHeader()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
+        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -210,7 +210,7 @@ class ExportPdfTest extends PMATestCase
      */
     public function testExportFooter()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
+        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -269,7 +269,7 @@ class ExportPdfTest extends PMATestCase
      */
     public function testExportData()
     {
-        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\PMA_ExportPdf')
+        $pdf = $this->getMockBuilder('PMA\libraries\plugins\export\helpers\Pdf')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -309,12 +309,12 @@ class ExportPdfTest extends PMATestCase
     {
         $setter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_setPdf');
         $setter->setAccessible(true);
-        $setter->invoke($this->object, new PMA_ExportPdf);
+        $setter->invoke($this->object, new Pdf);
 
         $getter = new ReflectionMethod('PMA\libraries\plugins\export\ExportPdf', '_getPdf');
         $getter->setAccessible(true);
         $this->assertInstanceOf(
-            'PMA\libraries\plugins\export\PMA_ExportPdf',
+            'PMA\libraries\plugins\export\helpers\Pdf',
             $getter->invoke($this->object)
         );
     }
diff --git a/test/classes/plugin/export/TablePropertyTest.php b/test/classes/plugin/export/helpers/TablePropertyTest.php
similarity index 86%
rename from test/classes/plugin/export/TablePropertyTest.php
rename to test/classes/plugin/export/helpers/TablePropertyTest.php
index f23540c060..7bb29e23a7 100644
--- a/test/classes/plugin/export/TablePropertyTest.php
+++ b/test/classes/plugin/export/helpers/TablePropertyTest.php
@@ -1,17 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA\libraries\plugins\export\TableProperty class
+ * tests for PMA\libraries\plugins\export\helpers\TableProperty class
  *
  * @package PhpMyAdmin-test
  */
-use PMA\libraries\plugins\export\TableProperty;
+use PMA\libraries\plugins\export\helpers\TableProperty;
 
 require_once 'libraries/config.default.php';
 require_once 'test/PMATestCase.php';
 
 /**
- * tests for PMA\libraries\plugins\export\TableProperty class
+ * tests for PMA\libraries\plugins\export\helpers\TableProperty class
  *
  * @package PhpMyAdmin-test
  */
@@ -42,7 +42,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::__construct
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::__construct
      *
      * @return void
     */
@@ -80,7 +80,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getPureType
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getPureType
      *
      * @return void
     */
@@ -102,7 +102,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isNotNull
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isNotNull
      *
      * @param string $nullable nullable value
      * @param string $expected expected output
@@ -135,7 +135,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isUnique
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isUnique
      *
      * @param string $key      key value
      * @param string $expected expected output
@@ -170,7 +170,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getDotNetPrimitiveType
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getDotNetPrimitiveType
      *
      * @param string $type     type value
      * @param string $expected expected output
@@ -211,7 +211,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getDotNetObjectType
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getDotNetObjectType
      *
      * @param string $type     type value
      * @param string $expected expected output
@@ -252,7 +252,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::getIndexName
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::getIndexName
      *
      * @return void
      */
@@ -275,7 +275,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::isPK
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::isPK
      *
      * @return void
      */
@@ -295,7 +295,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::formatCs
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::formatCs
      *
      * @return void
     */
@@ -310,7 +310,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::formatXml
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::formatXml
      *
      * @return void
     */
@@ -325,7 +325,7 @@ class TablePropertyTest extends PMATestCase
     }
 
     /**
-     * Test for PMA\libraries\plugins\export\TableProperty::format
+     * Test for PMA\libraries\plugins\export\helpers\TableProperty::format
      *
      * @return void
     */