diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index 56c9d08572..bb4510a480 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build NHibernate dumps of tables
  *
- * @package phpMyAdmin-Export-Codegen
+ * @package phpMyAdmin-Export
+ * @subpackage Codegen
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -148,7 +149,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
 
 /**
  *
- * @package phpMyAdmin-Export-Codegen
+ * @package phpMyAdmin-Export
+ * @subpackage Codegen
  */
 class TableProperty
 {
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 050db6c7c7..62b1537375 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -3,7 +3,8 @@
 /**
  * CSV export code
  *
- * @package phpMyAdmin-Export-CSV
+ * @package phpMyAdmin-Export
+ * @subpackage CSV
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index 5afbd7e154..df329de1b0 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build CSV dumps of tables for excel
  *
- * @package phpMyAdmin-Export-CSV-Excel
+ * @package phpMyAdmin-Export
+ * @subpackage CSV-Excel
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 6598873d29..af5af76546 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build HTML dumps of tables
  *
- * @package phpMyAdmin-Export-HTMLWord
+ * @package phpMyAdmin-Export
+ * @subpackage HTMLWord
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/json.php b/libraries/export/json.php
index d45c01b8a0..c9bba1e7d7 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build dumps of tables as JSON
  *
- * @package phpMyAdmin-Export-JSON
+ * @package phpMyAdmin-Export
+ * @subpackage JSON
  */
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 01e7ea10b7..565c29cba2 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build LaTeX dumps of tables
  *
- * @package phpMyAdmin-Export-Latex
+ * @package phpMyAdmin-Export
+ * @subpackage Latex
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index 2363979221..538c31c533 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build MediaWiki dumps of tables
  *
- * @package phpMyAdmin-Export-MediaWiki
+ * @package phpMyAdmin-Export
+ * @subpackage MediaWiki
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 0237627e48..699aa0fa2e 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build OpenDocument Spreadsheet dumps of tables
  *
- * @package phpMyAdmin-Export-ODS
+ * @package phpMyAdmin-Export
+ * @subpackage ODS
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 2210a1213d..d3c42de6b1 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build OpenDocument Text dumps of tables
  *
- * @package phpMyAdmin-Export-ODT
+ * @package phpMyAdmin-Export
+ * @subpackage ODT
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index fe9b46c874..e864454b64 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -3,7 +3,8 @@
 /**
  * Produce a PDF report (export) from a query
  *
- * @package phpMyAdmin-Export-PDF
+ * @package phpMyAdmin-Export
+ * @subpackage PDF
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -39,7 +40,8 @@ require_once './libraries/tcpdf/tcpdf.php';
 
 /**
  * Adapted from a LGPL script by Philip Clarke
- * @package phpMyAdmin-Export-PDF
+ * @package phpMyAdmin-Export
+ * @subpackage PDF
  */
 class PMA_PDF extends TCPDF
 {
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 2687eb7bbb..66a0aa6070 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build dumps of tables as PHP Arrays
  *
- * @package phpMyAdmin-Export-PHP
+ * @package phpMyAdmin-Export
+ * @subpackage PHP
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index b1bd4579b1..ed61a07d1d 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build SQL dumps of tables
  *
- * @package phpMyAdmin-Export-SQL
+ * @package phpMyAdmin-Export
+ * @subpackage SQL
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index d15b43e1c3..2b290f1725 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -3,7 +3,8 @@
 /**
  * Export to Texy! text.
  *
- * @package phpMyAdmin-Export-Texy
+ * @package phpMyAdmin-Export
+ * @subpackage Texy
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 4461c2ec0a..2a1f2192a7 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build dumps of tables as Excel files.
  *
- * @package phpMyAdmin-Export-XLS
+ * @package phpMyAdmin-Export
+ * @subpackage XLS
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index db65add198..487c2dfb59 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build dumps of tables as Excel 2007 files.
  *
- * @package phpMyAdmin-Export-XLSX
+ * @package phpMyAdmin-Export
+ * @subpackage XLSX
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index de2d12aff2..ba1e4fa12f 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build XML dumps of tables
  *
- * @package phpMyAdmin-Export-XML
+ * @package phpMyAdmin-Export
+ * @subpackage XML
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 9d9f7e5b87..8c3fad045d 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -3,7 +3,8 @@
 /**
  * Set of functions used to build YAML dumps of tables
  *
- * @package phpMyAdmin-Export-YAML
+ * @package phpMyAdmin-Export
+ * @subpackage YAML
  */
 if (! defined('PHPMYADMIN')) {
     exit;