From e56949f160b9de33a8ca642e6d9d8efa81c112fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 25 Oct 2011 10:13:17 +0200
Subject: [PATCH] Use package name PhpMyAdmin

Needed to match phpdoc rules as package name must begin with upper case.
---
 browse_foreigners.php                                       | 2 +-
 changelog.php                                               | 2 +-
 chk_rel.php                                                 | 2 +-
 config.sample.inc.php                                       | 2 +-
 db_create.php                                               | 2 +-
 db_datadict.php                                             | 2 +-
 db_events.php                                               | 2 +-
 db_export.php                                               | 2 +-
 db_import.php                                               | 2 +-
 db_operations.php                                           | 2 +-
 db_printview.php                                            | 2 +-
 db_qbe.php                                                  | 2 +-
 db_routines.php                                             | 2 +-
 db_search.php                                               | 2 +-
 db_sql.php                                                  | 2 +-
 db_structure.php                                            | 2 +-
 db_tracking.php                                             | 2 +-
 db_triggers.php                                             | 2 +-
 enum_editor.php                                             | 2 +-
 export.php                                                  | 2 +-
 file_echo.php                                               | 2 +-
 import.php                                                  | 2 +-
 import_status.php                                           | 2 +-
 index.php                                                   | 2 +-
 js/get_image.js.php                                         | 2 +-
 js/messages.php                                             | 2 +-
 js/pmd/ajax.js                                              | 2 +-
 js/pmd/iecanvas.js                                          | 2 +-
 js/pmd/move.js                                              | 2 +-
 libraries/Advisor.class.php                                 | 2 +-
 libraries/Config.class.php                                  | 4 ++--
 libraries/Error.class.php                                   | 4 ++--
 libraries/Error_Handler.class.php                           | 4 ++--
 libraries/File.class.php                                    | 4 ++--
 libraries/Index.class.php                                   | 6 +++---
 libraries/List.class.php                                    | 4 ++--
 libraries/List_Database.class.php                           | 4 ++--
 libraries/Message.class.php                                 | 4 ++--
 libraries/PMA.php                                           | 4 ++--
 libraries/Partition.class.php                               | 4 ++--
 libraries/RecentTable.class.php                             | 4 ++--
 libraries/StorageEngine.class.php                           | 4 ++--
 libraries/Table.class.php                                   | 4 ++--
 libraries/Theme.class.php                                   | 4 ++--
 libraries/Theme_Manager.class.php                           | 4 ++--
 libraries/Tracker.class.php                                 | 4 ++--
 libraries/auth/config.auth.lib.php                          | 2 +-
 libraries/auth/cookie.auth.lib.php                          | 2 +-
 libraries/auth/http.auth.lib.php                            | 2 +-
 libraries/auth/signon.auth.lib.php                          | 2 +-
 libraries/bookmark.lib.php                                  | 2 +-
 libraries/build_html_for_db.lib.php                         | 2 +-
 libraries/charset_conversion.lib.php                        | 2 +-
 libraries/check_user_privileges.lib.php                     | 2 +-
 libraries/cleanup.lib.php                                   | 2 +-
 libraries/common.inc.php                                    | 2 +-
 libraries/common.lib.php                                    | 2 +-
 libraries/config.default.php                                | 2 +-
 libraries/config.values.php                                 | 2 +-
 libraries/config/ConfigFile.class.php                       | 2 +-
 libraries/config/Form.class.php                             | 2 +-
 libraries/config/FormDisplay.class.php                      | 2 +-
 libraries/config/FormDisplay.tpl.php                        | 2 +-
 libraries/config/config_functions.lib.php                   | 2 +-
 libraries/config/messages.inc.php                           | 2 +-
 libraries/config/setup.forms.php                            | 2 +-
 libraries/config/user_preferences.forms.php                 | 2 +-
 libraries/config/validate.lib.php                           | 2 +-
 libraries/core.lib.php                                      | 2 +-
 libraries/data_dictionary_relations.lib.php                 | 2 +-
 libraries/data_drizzle.inc.php                              | 2 +-
 libraries/data_mysql.inc.php                                | 2 +-
 libraries/database_interface.lib.php                        | 2 +-
 libraries/db_common.inc.php                                 | 2 +-
 libraries/db_info.inc.php                                   | 2 +-
 libraries/db_links.inc.php                                  | 2 +-
 libraries/db_structure.lib.php                              | 2 +-
 libraries/db_table_exists.lib.php                           | 2 +-
 libraries/dbi/drizzle-wrappers.lib.php                      | 2 +-
 libraries/dbi/drizzle.dbi.lib.php                           | 2 +-
 libraries/dbi/mysql.dbi.lib.php                             | 2 +-
 libraries/dbi/mysqli.dbi.lib.php                            | 2 +-
 libraries/display_change_password.lib.php                   | 2 +-
 libraries/display_create_database.lib.php                   | 2 +-
 libraries/display_create_table.lib.php                      | 2 +-
 libraries/display_export.lib.php                            | 2 +-
 libraries/display_import.lib.php                            | 2 +-
 libraries/display_import_ajax.lib.php                       | 2 +-
 libraries/display_select_lang.lib.php                       | 2 +-
 libraries/display_tbl.lib.php                               | 2 +-
 libraries/engines/bdb.lib.php                               | 4 ++--
 libraries/engines/berkeleydb.lib.php                        | 4 ++--
 libraries/engines/binlog.lib.php                            | 4 ++--
 libraries/engines/innobase.lib.php                          | 4 ++--
 libraries/engines/innodb.lib.php                            | 4 ++--
 libraries/engines/memory.lib.php                            | 4 ++--
 libraries/engines/merge.lib.php                             | 4 ++--
 libraries/engines/mrg_myisam.lib.php                        | 4 ++--
 libraries/engines/myisam.lib.php                            | 4 ++--
 libraries/engines/ndbcluster.lib.php                        | 4 ++--
 libraries/engines/pbms.lib.php                              | 4 ++--
 libraries/engines/pbxt.lib.php                              | 4 ++--
 libraries/error.inc.php                                     | 2 +-
 libraries/export/codegen.php                                | 4 ++--
 libraries/export/csv.php                                    | 2 +-
 libraries/export/excel.php                                  | 2 +-
 libraries/export/htmlword.php                               | 2 +-
 libraries/export/json.php                                   | 2 +-
 libraries/export/latex.php                                  | 2 +-
 libraries/export/mediawiki.php                              | 2 +-
 libraries/export/ods.php                                    | 2 +-
 libraries/export/odt.php                                    | 2 +-
 libraries/export/pdf.php                                    | 4 ++--
 libraries/export/php_array.php                              | 2 +-
 libraries/export/sql.php                                    | 2 +-
 libraries/export/texytext.php                               | 2 +-
 libraries/export/xml.php                                    | 2 +-
 libraries/export/yaml.php                                   | 2 +-
 libraries/file_listing.php                                  | 2 +-
 libraries/footer.inc.php                                    | 2 +-
 libraries/gis/pma_gis_factory.php                           | 2 +-
 libraries/gis/pma_gis_geometry.php                          | 2 +-
 libraries/gis/pma_gis_geometrycollection.php                | 2 +-
 libraries/gis/pma_gis_linestring.php                        | 2 +-
 libraries/gis/pma_gis_multilinestring.php                   | 2 +-
 libraries/gis/pma_gis_multipoint.php                        | 2 +-
 libraries/gis/pma_gis_multipolygon.php                      | 2 +-
 libraries/gis/pma_gis_point.php                             | 2 +-
 libraries/gis/pma_gis_polygon.php                           | 2 +-
 libraries/gis/pma_gis_visualization.php                     | 2 +-
 libraries/gis_visualization.lib.php                         | 2 +-
 libraries/grab_globals.lib.php                              | 2 +-
 libraries/header.inc.php                                    | 2 +-
 libraries/header_http.inc.php                               | 2 +-
 libraries/header_meta_style.inc.php                         | 2 +-
 libraries/header_printview.inc.php                          | 2 +-
 libraries/header_scripts.inc.php                            | 2 +-
 libraries/iconv_wrapper.lib.php                             | 2 +-
 libraries/import.lib.php                                    | 2 +-
 libraries/import/csv.php                                    | 2 +-
 libraries/import/docsql.php                                 | 2 +-
 libraries/import/ldi.php                                    | 2 +-
 libraries/import/ods.php                                    | 2 +-
 libraries/import/shp.php                                    | 2 +-
 libraries/import/sql.php                                    | 2 +-
 libraries/import/upload/apc.php                             | 2 +-
 libraries/import/upload/noplugin.php                        | 2 +-
 libraries/import/upload/uploadprogress.php                  | 2 +-
 libraries/import/xml.php                                    | 2 +-
 libraries/information_schema_relations.lib.php              | 2 +-
 libraries/ip_allow_deny.lib.php                             | 2 +-
 libraries/js_escape.lib.php                                 | 2 +-
 libraries/kanji-encoding.lib.php                            | 2 +-
 libraries/logging.lib.php                                   | 2 +-
 libraries/mime.lib.php                                      | 2 +-
 libraries/mult_submits.inc.php                              | 2 +-
 libraries/mysql_charsets.lib.php                            | 2 +-
 libraries/navigation_header.inc.php                         | 2 +-
 libraries/ob.lib.php                                        | 2 +-
 libraries/opendocument.lib.php                              | 2 +-
 libraries/parse_analyze.lib.php                             | 2 +-
 libraries/plugin_interface.lib.php                          | 2 +-
 libraries/pmd_common.php                                    | 2 +-
 libraries/relation.lib.php                                  | 2 +-
 libraries/relation_cleanup.lib.php                          | 2 +-
 libraries/replication.inc.php                               | 2 +-
 libraries/replication_gui.lib.php                           | 2 +-
 libraries/rte/rte_events.lib.php                            | 2 +-
 libraries/rte/rte_export.lib.php                            | 2 +-
 libraries/rte/rte_footer.lib.php                            | 2 +-
 libraries/rte/rte_list.lib.php                              | 2 +-
 libraries/rte/rte_main.inc.php                              | 2 +-
 libraries/rte/rte_routines.lib.php                          | 2 +-
 libraries/rte/rte_triggers.lib.php                          | 2 +-
 libraries/sanitizing.lib.php                                | 2 +-
 libraries/schema/Dia_Relation_Schema.class.php              | 2 +-
 libraries/schema/Eps_Relation_Schema.class.php              | 2 +-
 libraries/schema/Export_Relation_Schema.class.php           | 2 +-
 libraries/schema/Pdf_Relation_Schema.class.php              | 2 +-
 libraries/schema/Svg_Relation_Schema.class.php              | 2 +-
 libraries/schema/User_Schema.class.php                      | 2 +-
 libraries/schema/Visio_Relation_Schema.class.php            | 2 +-
 libraries/select_lang.lib.php                               | 2 +-
 libraries/select_server.lib.php                             | 2 +-
 libraries/server_common.inc.php                             | 2 +-
 libraries/server_links.inc.php                              | 2 +-
 libraries/server_synchronize.lib.php                        | 2 +-
 libraries/session.inc.php                                   | 2 +-
 libraries/sql_query_form.lib.php                            | 2 +-
 libraries/sqlparser.data.php                                | 2 +-
 libraries/sqlparser.lib.php                                 | 2 +-
 libraries/sqlvalidator.class.php                            | 4 ++--
 libraries/sqlvalidator.lib.php                              | 2 +-
 libraries/string.lib.php                                    | 2 +-
 libraries/string_mb.lib.php                                 | 2 +-
 libraries/string_native.lib.php                             | 2 +-
 libraries/string_type_ctype.lib.php                         | 2 +-
 libraries/string_type_native.lib.php                        | 2 +-
 libraries/svg_plot/pma_scatter_plot.php                     | 2 +-
 libraries/svg_plot/pma_svg_data_element.php                 | 2 +-
 libraries/svg_plot/pma_svg_data_point.php                   | 2 +-
 libraries/sysinfo.lib.php                                   | 2 +-
 libraries/tbl_common.php                                    | 2 +-
 libraries/tbl_info.inc.php                                  | 2 +-
 libraries/tbl_links.inc.php                                 | 2 +-
 libraries/tbl_properties.inc.php                            | 2 +-
 libraries/tbl_replace_fields.inc.php                        | 2 +-
 libraries/tbl_select.lib.php                                | 2 +-
 libraries/transformations.lib.php                           | 2 +-
 .../application_octetstream__download.inc.php               | 2 +-
 .../transformations/application_octetstream__hex.inc.php    | 2 +-
 libraries/transformations/global.inc.php                    | 2 +-
 libraries/transformations/image_jpeg__inline.inc.php        | 2 +-
 libraries/transformations/image_jpeg__link.inc.php          | 2 +-
 libraries/transformations/image_png__inline.inc.php         | 2 +-
 libraries/transformations/text_plain__dateformat.inc.php    | 2 +-
 libraries/transformations/text_plain__external.inc.php      | 2 +-
 libraries/transformations/text_plain__formatted.inc.php     | 2 +-
 libraries/transformations/text_plain__imagelink.inc.php     | 2 +-
 libraries/transformations/text_plain__link.inc.php          | 2 +-
 libraries/transformations/text_plain__longToIpv4.inc.php    | 2 +-
 libraries/transformations/text_plain__sql.inc.php           | 2 +-
 libraries/transformations/text_plain__substr.inc.php        | 2 +-
 libraries/url_generating.lib.php                            | 2 +-
 libraries/user_preferences.inc.php                          | 2 +-
 libraries/user_preferences.lib.php                          | 2 +-
 libraries/vendor_config.php                                 | 2 +-
 libraries/zip.lib.php                                       | 4 ++--
 license.php                                                 | 2 +-
 main.php                                                    | 2 +-
 navigation.php                                              | 2 +-
 phpinfo.php                                                 | 2 +-
 phpmyadmin.css.php                                          | 2 +-
 pmd_display_field.php                                       | 2 +-
 pmd_general.php                                             | 2 +-
 pmd_pdf.php                                                 | 2 +-
 pmd_relation_new.php                                        | 2 +-
 pmd_relation_upd.php                                        | 2 +-
 pmd_save_pos.php                                            | 2 +-
 prefs_forms.php                                             | 2 +-
 prefs_manage.php                                            | 2 +-
 querywindow.php                                             | 2 +-
 schema_edit.php                                             | 2 +-
 schema_export.php                                           | 2 +-
 scripts/decode_bug.php                                      | 2 +-
 scripts/openid.php                                          | 2 +-
 scripts/signon-script.php                                   | 2 +-
 scripts/signon.php                                          | 2 +-
 server_binlog.php                                           | 2 +-
 server_collations.php                                       | 2 +-
 server_databases.php                                        | 2 +-
 server_engines.php                                          | 2 +-
 server_export.php                                           | 2 +-
 server_import.php                                           | 2 +-
 server_plugins.php                                          | 2 +-
 server_privileges.php                                       | 2 +-
 server_replication.php                                      | 2 +-
 server_sql.php                                              | 2 +-
 server_status.php                                           | 2 +-
 server_synchronize.php                                      | 2 +-
 server_variables.php                                        | 2 +-
 setup/config.php                                            | 2 +-
 setup/frames/config.inc.php                                 | 2 +-
 setup/frames/form.inc.php                                   | 2 +-
 setup/frames/index.inc.php                                  | 2 +-
 setup/frames/menu.inc.php                                   | 2 +-
 setup/frames/servers.inc.php                                | 2 +-
 setup/lib/ConfigGenerator.class.php                         | 4 ++--
 setup/lib/common.inc.php                                    | 2 +-
 setup/lib/form_processing.lib.php                           | 2 +-
 setup/lib/index.lib.php                                     | 2 +-
 setup/validate.php                                          | 2 +-
 show_config_errors.php                                      | 2 +-
 sql.php                                                     | 2 +-
 tbl_addfield.php                                            | 2 +-
 tbl_alter.php                                               | 2 +-
 tbl_change.php                                              | 2 +-
 tbl_chart.php                                               | 2 +-
 tbl_create.php                                              | 2 +-
 tbl_export.php                                              | 2 +-
 tbl_get_field.php                                           | 2 +-
 tbl_gis_visualization.php                                   | 2 +-
 tbl_import.php                                              | 2 +-
 tbl_indexes.php                                             | 2 +-
 tbl_move_copy.php                                           | 2 +-
 tbl_operations.php                                          | 2 +-
 tbl_printview.php                                           | 2 +-
 tbl_relation.php                                            | 2 +-
 tbl_replace.php                                             | 2 +-
 tbl_row_action.php                                          | 2 +-
 tbl_select.php                                              | 2 +-
 tbl_sql.php                                                 | 2 +-
 tbl_structure.php                                           | 2 +-
 tbl_tracking.php                                            | 2 +-
 tbl_triggers.php                                            | 2 +-
 test/AllSeleniumTests.php                                   | 2 +-
 test/AllTests.php                                           | 2 +-
 test/Environment_test.php                                   | 4 ++--
 test/PMA_showHint_test.php                                  | 2 +-
 test/classes/Advisor_test.php                               | 2 +-
 test/classes/PMA_Config_test.php                            | 2 +-
 test/classes/PMA_File_test.php                              | 2 +-
 test/classes/PMA_List_Database_test.php                     | 2 +-
 test/classes/PMA_Message_test.php                           | 2 +-
 test/classes/PMA_PDF_test.php                               | 2 +-
 test/classes/PMA_Theme_Manager_test.php                     | 2 +-
 test/classes/gis/PMA_GIS_Factory_test.php                   | 2 +-
 test/classes/gis/PMA_GIS_Geom_test.php                      | 2 +-
 test/classes/gis/PMA_GIS_Geometry_test.php                  | 2 +-
 test/classes/gis/PMA_GIS_Linestring_test.php                | 2 +-
 test/classes/gis/PMA_GIS_Multilinestring_test.php           | 2 +-
 test/classes/gis/PMA_GIS_Multipoint_test.php                | 2 +-
 test/classes/gis/PMA_GIS_Multipolygon_test.php              | 2 +-
 test/classes/gis/PMA_GIS_Point_test.php                     | 2 +-
 test/classes/gis/PMA_GIS_Polygon_test.php                   | 2 +-
 test/libraries/PMA_GIS_modifyQuery_test.php                 | 2 +-
 test/libraries/PMA_SQL_parser_data_test.php                 | 2 +-
 test/libraries/PMA_SQL_parser_test.php                      | 2 +-
 test/libraries/PMA_STR_sub_test.php                         | 2 +-
 test/libraries/PMA_blowfish_test.php                        | 2 +-
 test/libraries/PMA_escapeJsString_test.php                  | 2 +-
 test/libraries/PMA_generateCommonUrl_test.php               | 2 +-
 test/libraries/PMA_sanitize_test.php                        | 2 +-
 test/libraries/PMA_transformation_getOptions_test.php       | 2 +-
 test/libraries/common/PMA_ajaxResponse_test.php             | 2 +-
 test/libraries/common/PMA_browseUploadFile_test.php         | 2 +-
 test/libraries/common/PMA_buildActionTitles_test.php        | 2 +-
 test/libraries/common/PMA_cache_test.php                    | 2 +-
 test/libraries/common/PMA_checkParameters_test.php          | 2 +-
 .../common/PMA_contains_nonprintable_ascii_test.php         | 2 +-
 .../libraries/common/PMA_convert_bit_default_value_test.php | 2 +-
 test/libraries/common/PMA_displayMaximumUploadSize_test.php | 2 +-
 test/libraries/common/PMA_display_html_checkbox_test.php    | 2 +-
 test/libraries/common/PMA_display_html_radio_test.php       | 2 +-
 test/libraries/common/PMA_escapeMySqlWildcards_test.php     | 2 +-
 test/libraries/common/PMA_expandUserString_test.php         | 2 +-
 test/libraries/common/PMA_extractFieldSpec_test.php         | 2 +-
 .../common/PMA_extractValueFromFormattedSize_test.php       | 2 +-
 test/libraries/common/PMA_foreignKeySupported_test.php      | 2 +-
 test/libraries/common/PMA_formatNumberByteDown_test.php     | 2 +-
 test/libraries/common/PMA_formatSql_test.php                | 2 +-
 .../libraries/common/PMA_generateHiddenMaxFileSize_test.php | 2 +-
 test/libraries/common/PMA_generate_html_dropdown_test.php   | 2 +-
 test/libraries/common/PMA_generate_slider_effect_test.php   | 2 +-
 test/libraries/common/PMA_getDbLink_test.php                | 2 +-
 test/libraries/common/PMA_getIcon_test.php                  | 2 +-
 test/libraries/common/PMA_getTitleForTarget_test.php        | 2 +-
 test/libraries/common/PMA_localisedDateTimespan_test.php    | 2 +-
 test/libraries/common/PMA_pow_test.php                      | 2 +-
 test/libraries/common/PMA_printableBitValue_test.php        | 2 +-
 test/libraries/common/PMA_quoting_slashing_test.php         | 2 +-
 test/libraries/common/PMA_showDocu_test.php                 | 2 +-
 test/libraries/common/PMA_showMessage_test_disabled.php     | 2 +-
 test/libraries/common/PMA_showPHPDocu_test.php              | 2 +-
 test/libraries/common/PMA_stringOperations_test.php         | 2 +-
 test/libraries/common/PMA_unsupportedDatatypes_test.php     | 2 +-
 test/libraries/common/PMA_whichCrlf_test.php                | 2 +-
 test/libraries/core/PMA_array_test.php                      | 2 +-
 test/libraries/core/PMA_checkPageValidity_test.php          | 2 +-
 test/libraries/core/PMA_fatalError_test.php                 | 2 +-
 test/libraries/core/PMA_getLinks_test.php                   | 2 +-
 test/libraries/core/PMA_getTableCount_test_dis.php          | 2 +-
 test/libraries/core/PMA_get_real_size_test.php              | 2 +-
 test/libraries/core/PMA_headerLocation_test_disabled.php    | 4 ++--
 test/libraries/core/PMA_ifSetOr_test.php                    | 2 +-
 test/libraries/core/PMA_isValid_test.php                    | 2 +-
 test/libraries/core/PMA_securePath_test.php                 | 2 +-
 test/libraries/core/PMA_warnMissingExtension_test.php       | 2 +-
 test/libraries/js_escape_test.php                           | 2 +-
 test/libraries/php-gettext/Locales_test.php                 | 2 +-
 test/libraries/php-gettext/Parsing_test.php                 | 2 +-
 test/libraries/rte/PMA_EVN_getDataFromRequest_test.php      | 2 +-
 test/libraries/rte/PMA_EVN_getEditorForm_test.php           | 2 +-
 test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php     | 2 +-
 test/libraries/rte/PMA_RTN_ParameterParser_test.php         | 2 +-
 test/libraries/rte/PMA_RTN_getDataFromRequest_test.php      | 2 +-
 test/libraries/rte/PMA_RTN_getEditorForm_test.php           | 2 +-
 test/libraries/rte/PMA_RTN_getExecuteForm_test.php          | 2 +-
 test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php     | 2 +-
 test/libraries/rte/PMA_TRI_getDataFromRequest_test.php      | 2 +-
 test/libraries/rte/PMA_TRI_getEditorForm_test.php           | 2 +-
 test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php     | 2 +-
 test/libraries/select_lang/PMA_langDetails_test.php         | 2 +-
 test/libraries/select_lang/PMA_langList_test.php            | 2 +-
 test/libraries/select_lang/PMA_langName_test.php            | 2 +-
 test/selenium/PmaSeleniumLoginTest.php                      | 2 +-
 test/selenium/PmaSeleniumPrivilegesTest.php                 | 2 +-
 test/selenium/PmaSeleniumTestCase.php                       | 2 +-
 test/selenium/PmaSeleniumXssTest.php                        | 2 +-
 test/theme.php                                              | 2 +-
 test/wui.php                                                | 2 +-
 themes.php                                                  | 2 +-
 themes/original/css/theme_left.css.php                      | 2 +-
 themes/original/css/theme_print.css.php                     | 2 +-
 themes/original/css/theme_right.css.php                     | 2 +-
 themes/original/info.inc.php                                | 2 +-
 themes/original/layout.inc.php                              | 2 +-
 themes/pmahomme/css/theme_left.css.php                      | 2 +-
 themes/pmahomme/css/theme_print.css.php                     | 2 +-
 themes/pmahomme/css/theme_right.css.php                     | 2 +-
 themes/pmahomme/info.inc.php                                | 2 +-
 themes/pmahomme/layout.inc.php                              | 2 +-
 themes/sprites.css.php                                      | 2 +-
 themes/svg_gradient.php                                     | 2 +-
 transformation_overview.php                                 | 2 +-
 transformation_wrapper.php                                  | 2 +-
 user_password.php                                           | 2 +-
 view_create.php                                             | 2 +-
 view_operations.php                                         | 2 +-
 webapp.php                                                  | 2 +-
 410 files changed, 446 insertions(+), 446 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php
index 1a8150454c..ab5385cd27 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -3,7 +3,7 @@
 /**
  * display selection for relational field values
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/changelog.php b/changelog.php
index 9892638193..8cc66e097e 100644
--- a/changelog.php
+++ b/changelog.php
@@ -3,7 +3,7 @@
 /**
  * Simple script to set correct charset for changelog
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/chk_rel.php b/chk_rel.php
index d13f075ef0..e838d2e741 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 70d2666dd6..aa363d67f0 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -7,7 +7,7 @@
  * All directives are explained in Documentation.html and on phpMyAdmin
  * wiki <http://wiki.phpmyadmin.net>.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /*
diff --git a/db_create.php b/db_create.php
index fe86dc9613..2402705e3a 100644
--- a/db_create.php
+++ b/db_create.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_datadict.php b/db_datadict.php
index e99ccf5582..1f62a09d60 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_events.php b/db_events.php
index 6d18641557..7716fb0965 100644
--- a/db_events.php
+++ b/db_events.php
@@ -3,7 +3,7 @@
 /**
  * Events management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_export.php b/db_export.php
index 5c880dd100..326b73ae86 100644
--- a/db_export.php
+++ b/db_export.php
@@ -3,7 +3,7 @@
 /**
  * dumps a database
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_import.php b/db_import.php
index f39f7c8cf7..fcf56b6551 100644
--- a/db_import.php
+++ b/db_import.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_operations.php b/db_operations.php
index 6589587942..4461d71924 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -9,7 +9,7 @@
  *  - adding tables
  *  - viewing PDF schemas
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_printview.php b/db_printview.php
index a03b8b1f97..acd0d9f26d 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_qbe.php b/db_qbe.php
index de09953cd2..b4249bff32 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -3,7 +3,7 @@
 /**
  * query by example the whole database
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_routines.php b/db_routines.php
index 633a848c38..1d4ee0cb40 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -3,7 +3,7 @@
 /**
  * Routines management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_search.php b/db_search.php
index 88ae5d3a5b..da4863fc71 100644
--- a/db_search.php
+++ b/db_search.php
@@ -5,7 +5,7 @@
  *
  * @todo    make use of UNION when searching multiple tables
  * @todo    display executed query, optional?
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_sql.php b/db_sql.php
index 2f495ac861..9b4e74d19e 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_structure.php b/db_structure.php
index 326680bac6..16df6a70f5 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_tracking.php b/db_tracking.php
index d00d106964..1078fa26fb 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/db_triggers.php b/db_triggers.php
index 66a1085561..210dbfd07b 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -3,7 +3,7 @@
 /**
  * Triggers management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/enum_editor.php b/enum_editor.php
index 77bf0975b4..e7bba622a4 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -5,7 +5,7 @@
  * Displays a form for editing ENUM and SET values with more space (as an alternative to doing it in tbl_alter.php)
  * This form is only for users with JavaScript disabled -- users with JavaScript enabled will see a different form
  * defined in tbl_properties.inc.php
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once './libraries/common.inc.php';
diff --git a/export.php b/export.php
index ba3d883d87..d91c0eb8c5 100644
--- a/export.php
+++ b/export.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Main export hanling code
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/file_echo.php b/file_echo.php
index bdfc1735c2..d3391fcbc0 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -4,7 +4,7 @@
  * "Echo" service to allow force downloading of exported charts (png or svg)
  * and server status monitor settings
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once './libraries/common.inc.php';
diff --git a/import.php b/import.php
index fab1d3f3b2..c6cec254fe 100644
--- a/import.php
+++ b/import.php
@@ -3,7 +3,7 @@
 /**
  * Core script for import, this is just the glue around all other stuff
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/import_status.php b/import_status.php
index 75a336104f..ebe3a97356 100644
--- a/import_status.php
+++ b/import_status.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once './libraries/common.inc.php';
diff --git a/index.php b/index.php
index c8c7756b49..f94bdbf2c1 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
  * forms frameset
  *
  *                                              or common.inc.php
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/js/get_image.js.php b/js/get_image.js.php
index 6064731d07..b327844bdb 100644
--- a/js/get_image.js.php
+++ b/js/get_image.js.php
@@ -4,7 +4,7 @@
  * Provides the functionality for retreiving images
  * which may be actual images or an icon from a sprite
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 chdir('..');
 
diff --git a/js/messages.php b/js/messages.php
index 96f759b186..e966f9bd96 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -3,7 +3,7 @@
 /**
  * Exporting of translated messages from PHP to Javascript
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 chdir('..');
diff --git a/js/pmd/ajax.js b/js/pmd/ajax.js
index 7f48147c92..bd23dc538a 100644
--- a/js/pmd/ajax.js
+++ b/js/pmd/ajax.js
@@ -1,7 +1,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/js/pmd/iecanvas.js b/js/pmd/iecanvas.js
index 5f304b5662..60b2200502 100644
--- a/js/pmd/iecanvas.js
+++ b/js/pmd/iecanvas.js
@@ -1,7 +1,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 73d7c8f750..6bb971744f 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -1,6 +1,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
index b43455c001..f5ed188c02 100644
--- a/libraries/Advisor.class.php
+++ b/libraries/Advisor.class.php
@@ -4,7 +4,7 @@
  * A simple rules engine, that parses and executes the rules in advisory_rules.txt. Adjusted to phpMyAdmin
  *
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 class Advisor
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e655d9b070..a806dfab3a 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -3,7 +3,7 @@
 /**
  * Configuration handling.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -14,7 +14,7 @@ require './libraries/vendor_config.php';
 /**
  * Configuration class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Config
 {
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 1925a611d6..d332b06d7c 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -3,7 +3,7 @@
 /**
  * Holds class PMA_Error
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -14,7 +14,7 @@ require_once './libraries/Message.class.php';
 /**
  * a single error
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Error extends PMA_Message
 {
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index ac132fa2fc..8f14c08de6 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -3,7 +3,7 @@
 /**
  * Holds class PMA_Error_Handler
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -14,7 +14,7 @@ require_once './libraries/Error.class.php';
 /**
  * handling errors
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Error_Handler
 {
diff --git a/libraries/File.class.php b/libraries/File.class.php
index 592127b3e5..3745866929 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -3,14 +3,14 @@
 /**
  * file upload functions
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  *
  * @todo when uploading a file into a blob field, should we also consider using
  *       chunks like in import? UPDATE `table` SET `field` = `field` + [chunk]
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_File
 {
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 47c9950ee4..d790df9136 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -3,13 +3,13 @@
 /**
  * holds the database index class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  * @since phpMyAdmin 3.0.0
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Index
 {
@@ -580,7 +580,7 @@ class PMA_Index
 }
 
 /**
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Index_Column
 {
diff --git a/libraries/List.class.php b/libraries/List.class.php
index 8303227b68..661073b27e 100644
--- a/libraries/List.class.php
+++ b/libraries/List.class.php
@@ -3,14 +3,14 @@
 /**
  * hold the PMA_List base class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  * @todo add caching
  * @since phpMyAdmin 2.9.10
  * @abstract
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 abstract class PMA_List extends ArrayObject
 {
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index dd5593ad77..e5283205fc 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -3,7 +3,7 @@
 /**
  * holds the PMA_List_Database class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -23,7 +23,7 @@ require_once './libraries/List.class.php';
  * @todo ? support --skip-showdatabases and user has only global rights
  * @access public
  * @since phpMyAdmin 2.9.10
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 /*public*/ class PMA_List_Database extends PMA_List
 {
diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index 5a6afacd22..3cae14e632 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -3,7 +3,7 @@
 /**
  * Holds class PMA_Message
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -54,7 +54,7 @@
  * // strSomeLocaleMessage <sup>1</sup> strSomeMoreLocale<br />
  * // strSomeEvenMoreLocale - some final words
  * </code>
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Message
 {
diff --git a/libraries/PMA.php b/libraries/PMA.php
index ea2c27e8d2..db13babc59 100644
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Enter description here...
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  *
  */
 
@@ -15,7 +15,7 @@ require_once './libraries/List_Database.class.php';
  *
  *
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA
 {
diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php
index 6c5f2566fe..0fb68c4c7a 100644
--- a/libraries/Partition.class.php
+++ b/libraries/Partition.class.php
@@ -3,13 +3,13 @@
 /**
  * Library for extracting information about the partitions
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 
 /**
  * base Partition Class
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Partition
 {
diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php
index def9c37c03..1e858995a5 100644
--- a/libraries/RecentTable.class.php
+++ b/libraries/RecentTable.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once './libraries/Message.class.php';
@@ -12,7 +12,7 @@ require_once './libraries/Message.class.php';
  *
  * @TODO Change the release version in table pma_recent (#recent in Documentation.html)
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_RecentTable
 {
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index de30ad78cb..4f98a4a60f 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -3,7 +3,7 @@
 /**
  * Library for extracting information about the available storage engines
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -21,7 +21,7 @@ define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN',   3); // 'ON' or 'OFF'
 
 /**
  * base Storage Engine Class
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_StorageEngine
 {
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 7878b8ecd0..0f91593422 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -2,12 +2,12 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  * @todo make use of PMA_Message and PMA_Error
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Table
 {
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index bc5635d2af..11ebb0d333 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -3,7 +3,7 @@
 /**
  * hold PMA_Theme class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -14,7 +14,7 @@
  * @todo make css optionally replacing 'parent' css or extending it (by appending at the end)
  * @todo add an optional global css file - which will be used for both frames
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Theme
 {
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 840e611a97..68468e131d 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -2,12 +2,12 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class PMA_Theme_Manager
 {
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 97f62f05a3..07d176896a 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -2,14 +2,14 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
  * This class tracks changes on databases, tables and views.
  * For more information please see phpMyAdmin/Documentation.html
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  *
  * @todo use stristr instead of strstr
  */
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 573bede0df..3c1e52728f 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run config authentication (ie no authentication).
  *
- * @package phpMyAdmin-Auth-Config
+ * @package PhpMyAdmin-Auth-Config
  */
 
 
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index c50f2e38b8..c21dbd6226 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run cookie based authentication.
  *
- * @package phpMyAdmin-Auth-Cookie
+ * @package PhpMyAdmin-Auth-Cookie
  */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php
index b54cf34edd..147a507307 100644
--- a/libraries/auth/http.auth.lib.php
+++ b/libraries/auth/http.auth.lib.php
@@ -4,7 +4,7 @@
  * Set of functions used to run http authentication.
  * NOTE: Requires PHP loaded as a Apache module.
  *
- * @package phpMyAdmin-Auth-HTTP
+ * @package PhpMyAdmin-Auth-HTTP
  */
 
 
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index fb105c2ad6..1363a9e1db 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run single signon authentication.
  *
- * @package phpMyAdmin-Auth-Signon
+ * @package PhpMyAdmin-Auth-Signon
  */
 
 
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 723b042b8b..84b97f84b8 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the bookmark feature
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php
index 422beffef0..a6836c8c5a 100644
--- a/libraries/build_html_for_db.lib.php
+++ b/libraries/build_html_for_db.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index ecd71bcd94..7c1ac13297 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -3,7 +3,7 @@
 /**
  * Charset conversion functions.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 726b4a658a..1de903ef37 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -3,7 +3,7 @@
 /**
  * Get user's global privileges and some db-specific privileges
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/cleanup.lib.php b/libraries/cleanup.lib.php
index 26a559c16d..92b5c47046 100644
--- a/libraries/cleanup.lib.php
+++ b/libraries/cleanup.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for cleanup of user input.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 4a81f14c76..1c7e4d1abd 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -28,7 +28,7 @@
  * - db connection
  * - authentication work
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 8c3f285241..c1463bb7c2 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3,7 +3,7 @@
 /**
  * Misc functions used all over the scripts.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 1d54bdb2ee..e91638dcc9 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -16,7 +16,7 @@
  *
  * All directives are explained in Documentation.html
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 0e7cd93fb7..6abe3bfee5 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -4,7 +4,7 @@
  * Database with allowed values for configuration stored in the $cfg array,
  * used by setup script and user preferences to generate forms.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index c1b01ec3de..dfe2235e10 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -3,7 +3,7 @@
 /**
  * Config file management
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config/Form.class.php b/libraries/config/Form.class.php
index 1ec8073f91..ffd58b97de 100644
--- a/libraries/config/Form.class.php
+++ b/libraries/config/Form.class.php
@@ -3,7 +3,7 @@
 /**
  * Form handling code.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index 3b217dd455..26b3532900 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -10,7 +10,7 @@
  * o translated_path - work_path modified for HTML field name, a path with
  *                     slashes changed to hyphens, eg. Servers-4-verbose
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 58d6d3e789..d874f87967 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -3,7 +3,7 @@
 /**
  * Form templates
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index daa335fcf7..5ac2176aa6 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common config manipulation functions
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index d938197c2d..f3965504f2 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -7,7 +7,7 @@
  * configuration subsystem, with $strConfig as a prefix, _desc or _name
  * as a suffix, and the directive name in between.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 if (!function_exists('__')) {
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 6160456c5d..cddb88d8a6 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -19,7 +19,7 @@
  * End group blocks with:
  * ':group:end'
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 $forms = array();
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 2b0d5e2784..e0b2d18ab4 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -17,7 +17,7 @@
  * End group blocks with:
  * ':group:end'
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 $forms = array();
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 989b324ead..e995c0e50f 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -12,7 +12,7 @@
  *
  * Valdiation functions are assigned in $cfg_db['_validators'] (config.values.php).
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 209e4bf3d1..a27bb17c7f 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -5,7 +5,7 @@
  * This script is distinct from libraries/common.inc.php because this
  * script is called from /test.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/data_dictionary_relations.lib.php b/libraries/data_dictionary_relations.lib.php
index 51e9dccb19..168d71546e 100644
--- a/libraries/data_dictionary_relations.lib.php
+++ b/libraries/data_dictionary_relations.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php
index 907aac7a1a..7b06ee075a 100644
--- a/libraries/data_drizzle.inc.php
+++ b/libraries/data_drizzle.inc.php
@@ -2,7 +2,7 @@
 /**
  * Column types and functions supported by MySQL
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php
index 2571475788..9b1bd481a5 100644
--- a/libraries/data_mysql.inc.php
+++ b/libraries/data_mysql.inc.php
@@ -2,7 +2,7 @@
 /**
  * Column types and functions supported by MySQL
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 76faffdb5e..f77a682ddc 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common Option Constants For DBI Functions
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 05ee295f7f..5a3c4f73a2 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 3e5f3427b1..cb5bf4cf30 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -9,7 +9,7 @@
  *
  * speedup view on locked tables
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 8f49d3fd76..aa09d79b5a 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php
index 961c64a3bb..c70b6bf88f 100644
--- a/libraries/db_structure.lib.php
+++ b/libraries/db_structure.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index cd74d78456..b2f3446de2 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -4,7 +4,7 @@
  * Ensure the database and the table exist (else move to the "parent" script)
  * and display headers
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/dbi/drizzle-wrappers.lib.php b/libraries/dbi/drizzle-wrappers.lib.php
index 14f46a373e..844128529d 100644
--- a/libraries/dbi/drizzle-wrappers.lib.php
+++ b/libraries/dbi/drizzle-wrappers.lib.php
@@ -7,7 +7,7 @@
  * This wrapper is not complete and hides a lot of original functionality, but allows for easy usage
  * of the drizzle PHP extension.
  *
- * @package phpMyAdmin-DBI-Drizzle
+ * @package PhpMyAdmin-DBI-Drizzle
  */
 
 // TODO: drizzle module segfaults while freeing resources, often. This allows at least for some development
diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php
index 668d0cbdf2..4c32ae17ee 100644
--- a/libraries/dbi/drizzle.dbi.lib.php
+++ b/libraries/dbi/drizzle.dbi.lib.php
@@ -8,7 +8,7 @@
  * TODO: This file and drizzle-wrappers.lib.php should be devoid of any segault related hacks.
  * TODO: Crashing versions of drizzle module and/or libdrizzle should be blacklisted
  *
- * @package phpMyAdmin-DBI-Drizzle
+ * @package PhpMyAdmin-DBI-Drizzle
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 13a6136668..4e41149823 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -3,7 +3,7 @@
 /**
  * Interface to the classic MySQL extension
  *
- * @package phpMyAdmin-DBI-MySQL
+ * @package PhpMyAdmin-DBI-MySQL
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0355961d92..3d8a2e28c2 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -3,7 +3,7 @@
 /**
  * Interface to the improved MySQL extension (MySQLi)
  *
- * @package phpMyAdmin-DBI-MySQLi
+ * @package PhpMyAdmin-DBI-MySQLi
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 48444a6326..3397dd0efb 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -3,7 +3,7 @@
 /**
  * Displays form for password change
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php
index 121e2a8a2a..ed8a6193ce 100644
--- a/libraries/display_create_database.lib.php
+++ b/libraries/display_create_database.lib.php
@@ -3,7 +3,7 @@
 /**
  * Displays form for creating database (if user has privileges for that)
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index e7cd401c90..e0410b0997 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -22,7 +22,7 @@
  * warnings about the lack of privileges for CREATE TABLE. Tested
  * on MySQL 5.0.18.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 8ee404c1bf..7a5824e165 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 611d8a68ed..3e5a66e0c3 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index 3495a5288f..a0a4f7a7eb 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @package phpMyAdmin
+* @package PhpMyAdmin
 */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index fcc2b72f5e..f112fdcfd6 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -3,7 +3,7 @@
 /**
  * Code for displaying language selection
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5515d5c329..e85ec3f3fd 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -3,7 +3,7 @@
 /**
  * library for displaying table with results from all sort of select queries
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
index 2325d15a63..1a8f2cd7c7 100644
--- a/libraries/engines/bdb.lib.php
+++ b/libraries/engines/bdb.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_bdb extends PMA_StorageEngine
 {
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
index b112e2999b..5b6e34a7ff 100644
--- a/libraries/engines/berkeleydb.lib.php
+++ b/libraries/engines/berkeleydb.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
@@ -11,7 +11,7 @@ require_once './libraries/engines/bdb.lib.php';
 
 /**
  * This is same as BDB.
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_berkeleydb extends PMA_StorageEngine_bdb
 {
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
index 07eff4803b..27e733f223 100644
--- a/libraries/engines/binlog.lib.php
+++ b/libraries/engines/binlog.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_binlog extends PMA_StorageEngine
 {
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
index 818e9e11a3..faa2509d86 100644
--- a/libraries/engines/innobase.lib.php
+++ b/libraries/engines/innobase.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
@@ -12,7 +12,7 @@ require_once './libraries/engines/innodb.lib.php';
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_innobase extends PMA_StorageEngine_innodb
 {
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index 8ab2527850..ece7adbaac 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_innodb extends PMA_StorageEngine
 {
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
index 636a8df755..68d2ab2db0 100644
--- a/libraries/engines/memory.lib.php
+++ b/libraries/engines/memory.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  * the MEMORY (HEAP) storage engine
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_memory extends PMA_StorageEngine
 {
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
index 9c9ef1e2b4..2d9d871e82 100644
--- a/libraries/engines/merge.lib.php
+++ b/libraries/engines/merge.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_merge extends PMA_StorageEngine
 {
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
index 808f33a4b2..61468f4439 100644
--- a/libraries/engines/mrg_myisam.lib.php
+++ b/libraries/engines/mrg_myisam.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
@@ -11,7 +11,7 @@ require_once './libraries/engines/merge.lib.php';
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_mrg_myisam extends PMA_StorageEngine_merge
 {
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
index f6ca061297..339709e046 100644
--- a/libraries/engines/myisam.lib.php
+++ b/libraries/engines/myisam.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  * the MyISAM storage engine
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_myisam extends PMA_StorageEngine
 {
diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php
index 29793852af..0054ab90fe 100644
--- a/libraries/engines/ndbcluster.lib.php
+++ b/libraries/engines/ndbcluster.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  *
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_ndbcluster extends PMA_StorageEngine
 {
diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php
index 7f8f58cedb..e86c29186c 100644
--- a/libraries/engines/pbms.lib.php
+++ b/libraries/engines/pbms.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  * the PBMS daemon
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_pbms extends PMA_StorageEngine
 {
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index dc3c47dba5..847d49091c 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -1,12 +1,12 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 
 /**
  * the MyISAM storage engine
- * @package phpMyAdmin-Engines
+ * @package PhpMyAdmin-Engines
  */
 class PMA_StorageEngine_pbxt extends PMA_StorageEngine
 {
diff --git a/libraries/error.inc.php b/libraries/error.inc.php
index 95d8847921..316639addb 100644
--- a/libraries/error.inc.php
+++ b/libraries/error.inc.php
@@ -3,7 +3,7 @@
 /**
  * phpMyAdmin fatal error display page
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index b8b35d5a1c..0108442cfd 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build NHibernate dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage Codegen
  */
 if (! defined('PHPMYADMIN')) {
@@ -133,7 +133,7 @@ if (isset($plugin_list)) {
 
     /**
      *
-     * @package phpMyAdmin-Export
+     * @package PhpMyAdmin-Export
      * @subpackage Codegen
      */
     class TableProperty
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 8b04841ba1..7410767a20 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -3,7 +3,7 @@
 /**
  * CSV export code
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage CSV
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index 44bbc44e17..01507e5b65 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables for excel
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage CSV-Excel
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 7f047033cd..e14ecc971d 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to export a set of queries to a MS Word document
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage HTMLWord
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/json.php b/libraries/export/json.php
index 860d640caa..cca82b93cf 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build dumps of tables as JSON
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage JSON
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index ad10478b3b..1dbe21a9ab 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build LaTeX dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage Latex
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index d03610d836..41af34b1ba 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build MediaWiki dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage MediaWiki
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index a13360fbfe..868edf3ef4 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build OpenDocument Spreadsheet dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage ODS
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index b2c88eb0d9..94a01fc123 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build OpenDocument Text dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage ODT
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 903df74da5..90f0a30949 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -3,7 +3,7 @@
 /**
  * Produce a PDF report (export) from a query
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage PDF
  */
 if (! defined('PHPMYADMIN')) {
@@ -34,7 +34,7 @@ if (isset($plugin_list)) {
 
     /**
      * Adapted from a LGPL script by Philip Clarke
-     * @package phpMyAdmin-Export
+     * @package PhpMyAdmin-Export
      * @subpackage PDF
      */
     class PMA_Export_PDF extends PMA_PDF
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 642475954a..32e9b6c7c1 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build dumps of tables as PHP Arrays
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage PHP
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index dff5a94aba..869813b8f9 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build SQL dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage SQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index 351ce718e5..151b1230d5 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -3,7 +3,7 @@
 /**
  * Export to Texy! text.
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage Texy
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index a6b494030c..056dbca676 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build XML dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage XML
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 0ec1551208..6fda141094 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build YAML dumps of tables
  *
- * @package phpMyAdmin-Export
+ * @package PhpMyAdmin-Export
  * @subpackage YAML
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/file_listing.php b/libraries/file_listing.php
index 5d9058acea..733f20f741 100644
--- a/libraries/file_listing.php
+++ b/libraries/file_listing.php
@@ -4,7 +4,7 @@
  * Functions for listing directories
  *
  * @todo rename to file_listing.lib.php
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 7482ee20b5..4a4a4b233c 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -13,7 +13,7 @@
  *
  * always use $GLOBALS, as this script is also included by functions
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/gis/pma_gis_factory.php b/libraries/gis/pma_gis_factory.php
index f6f723253f..bf51072aa8 100644
--- a/libraries/gis/pma_gis_factory.php
+++ b/libraries/gis/pma_gis_factory.php
@@ -2,7 +2,7 @@
 /**
  * Factory class that handles the creation of geometric objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Factory
 {
diff --git a/libraries/gis/pma_gis_geometry.php b/libraries/gis/pma_gis_geometry.php
index c49c1a1eb8..f99b7d18bd 100644
--- a/libraries/gis/pma_gis_geometry.php
+++ b/libraries/gis/pma_gis_geometry.php
@@ -2,7 +2,7 @@
 /**
  * Base class for all GIS data type classes.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 abstract class PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_geometrycollection.php b/libraries/gis/pma_gis_geometrycollection.php
index 96074d5767..964c9fd7e1 100644
--- a/libraries/gis/pma_gis_geometrycollection.php
+++ b/libraries/gis/pma_gis_geometrycollection.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS GEOMETRYCOLLECTION objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Geometrycollection extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_linestring.php b/libraries/gis/pma_gis_linestring.php
index fc36b220ab..7ce635a78e 100644
--- a/libraries/gis/pma_gis_linestring.php
+++ b/libraries/gis/pma_gis_linestring.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS LINESTRING objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Linestring extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_multilinestring.php b/libraries/gis/pma_gis_multilinestring.php
index f5aa31f3ef..ed76165a82 100644
--- a/libraries/gis/pma_gis_multilinestring.php
+++ b/libraries/gis/pma_gis_multilinestring.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS MULTILINESTRING objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Multilinestring extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_multipoint.php b/libraries/gis/pma_gis_multipoint.php
index b557465b17..7b1285d2f8 100644
--- a/libraries/gis/pma_gis_multipoint.php
+++ b/libraries/gis/pma_gis_multipoint.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS MULTIPOINT objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Multipoint extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php
index 2c247b9d6c..732f5fea9b 100644
--- a/libraries/gis/pma_gis_multipolygon.php
+++ b/libraries/gis/pma_gis_multipolygon.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS MULTIPOLYGON objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Multipolygon extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_point.php b/libraries/gis/pma_gis_point.php
index 82fb00c4ce..f32cb4a3fd 100644
--- a/libraries/gis/pma_gis_point.php
+++ b/libraries/gis/pma_gis_point.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS POINT objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Point extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_polygon.php b/libraries/gis/pma_gis_polygon.php
index b8594aa287..035eeca941 100644
--- a/libraries/gis/pma_gis_polygon.php
+++ b/libraries/gis/pma_gis_polygon.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of GIS POLYGON objects.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Polygon extends PMA_GIS_Geometry
 {
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 1c9ea58f39..f69d6d288f 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -2,7 +2,7 @@
 /**
  * Generates the JavaScripts needed to visualize GIS data.
  *
- * @package phpMyAdmin-GIS
+ * @package PhpMyAdmin-GIS
  */
 class PMA_GIS_Visualization
 {
diff --git a/libraries/gis_visualization.lib.php b/libraries/gis_visualization.lib.php
index a35af807ef..f89bb14f43 100644
--- a/libraries/gis_visualization.lib.php
+++ b/libraries/gis_visualization.lib.php
@@ -2,7 +2,7 @@
 /**
  * Functions used to generate GIS visualizations.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 
diff --git a/libraries/grab_globals.lib.php b/libraries/grab_globals.lib.php
index 993ca9d921..13596260ba 100644
--- a/libraries/grab_globals.lib.php
+++ b/libraries/grab_globals.lib.php
@@ -6,7 +6,7 @@
  * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and
  * $HTTP_AUTHORIZATION.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 4997ef603d..67319dea8c 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index 4b4e454f6f..337fe4796a 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 133afd43b2..21e5d2f597 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
index 39ec4cfb26..2f39b87c3a 100644
--- a/libraries/header_printview.inc.php
+++ b/libraries/header_printview.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index a6bc313cb8..514f6ed000 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/iconv_wrapper.lib.php b/libraries/iconv_wrapper.lib.php
index 1b05e04b5e..e23d26e240 100644
--- a/libraries/iconv_wrapper.lib.php
+++ b/libraries/iconv_wrapper.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index c44cb16b2a..3387406aea 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -3,7 +3,7 @@
 /**
  * Library that provides common import functions that are used by import plugins
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/import/csv.php b/libraries/import/csv.php
index a0b3348a8c..9d0e2aaa00 100644
--- a/libraries/import/csv.php
+++ b/libraries/import/csv.php
@@ -4,7 +4,7 @@
  * CSV import plugin for phpMyAdmin
  *
  * @todo    add an option for handling NULL values
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage CSV
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 4710940c23..cf583aa216 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -3,7 +3,7 @@
 /**
  * DocSQL import plugin for phpMyAdmin
  *
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage DocSQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php
index b3b711eb91..47319568f6 100644
--- a/libraries/import/ldi.php
+++ b/libraries/import/ldi.php
@@ -3,7 +3,7 @@
 /**
  * CSV import plugin for phpMyAdmin using LOAD DATA
  *
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage LDI
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index 79a920b6ff..b6857d56b7 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -5,7 +5,7 @@
  *
  * @todo    Pretty much everything
  * @todo    Importing of accented characters seems to fail
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage ODS
  */
 
diff --git a/libraries/import/shp.php b/libraries/import/shp.php
index 948b87c388..88220591e7 100644
--- a/libraries/import/shp.php
+++ b/libraries/import/shp.php
@@ -2,7 +2,7 @@
 /**
  * ESRI Shape file import plugin for phpMyAdmin
  *
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage ESRI_Shape
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/sql.php b/libraries/import/sql.php
index 7a957d9f7b..08f95aa0d0 100644
--- a/libraries/import/sql.php
+++ b/libraries/import/sql.php
@@ -3,7 +3,7 @@
 /**
  * SQL import plugin for phpMyAdmin
  *
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage SQL
  */
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/upload/apc.php b/libraries/import/upload/apc.php
index 5fe34bb220..97c8963a5e 100644
--- a/libraries/import/upload/apc.php
+++ b/libraries/import/upload/apc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @package phpMyAdmin
+* @package PhpMyAdmin
 */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/upload/noplugin.php b/libraries/import/upload/noplugin.php
index 00dcb11443..af62d0ee8e 100644
--- a/libraries/import/upload/noplugin.php
+++ b/libraries/import/upload/noplugin.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @package phpMyAdmin
+* @package PhpMyAdmin
 */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/import/upload/uploadprogress.php b/libraries/import/upload/uploadprogress.php
index d5c361c1d4..086b1c9173 100644
--- a/libraries/import/upload/uploadprogress.php
+++ b/libraries/import/upload/uploadprogress.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
-* @package phpMyAdmin
+* @package PhpMyAdmin
 */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index ea0bddbafc..65f99bd5fe 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -4,7 +4,7 @@
  * XML import plugin for phpMyAdmin
  *
  * @todo    Improve efficiency
- * @package phpMyAdmin-Import
+ * @package PhpMyAdmin-Import
  * @subpackage XML
  */
 
diff --git a/libraries/information_schema_relations.lib.php b/libraries/information_schema_relations.lib.php
index 5c7d0e1183..68ba11c4b3 100644
--- a/libraries/information_schema_relations.lib.php
+++ b/libraries/information_schema_relations.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index ad4b4a3d14..fd0bc025bc 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -6,7 +6,7 @@
  *
  * @todo Broken for IPv6
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index b91f180ee3..c410eb92b6 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -3,7 +3,7 @@
 /**
  * Javascript escaping functions.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  *
  */
 
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
index 6ee78c61eb..86c4f09a16 100644
--- a/libraries/kanji-encoding.lib.php
+++ b/libraries/kanji-encoding.lib.php
@@ -9,7 +9,7 @@
  *
  * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp>
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php
index e58f96de48..b2688fe3d8 100644
--- a/libraries/logging.lib.php
+++ b/libraries/logging.lib.php
@@ -5,7 +5,7 @@
  *
  * This includes web server specific code to log some information.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/mime.lib.php b/libraries/mime.lib.php
index e9eb386dde..71b3f940d5 100644
--- a/libraries/mime.lib.php
+++ b/libraries/mime.lib.php
@@ -3,7 +3,7 @@
 /**
  * MIME detection code.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  * @todo Maybe we could try to use fileinfo module if loaded
  */
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 1c3713bafd..6c67b27305 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index e9d8d675af..83d7d77a1c 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 6e5ecf24f0..81b12a43a9 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -3,7 +3,7 @@
 /**
  * displays the pma logo, links and db and server selection in left frame
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php
index 14f3202315..be7e463db7 100644
--- a/libraries/ob.lib.php
+++ b/libraries/ob.lib.php
@@ -9,7 +9,7 @@
  * Check for all the needed functions for output buffering
  * Make some wrappers for the top and bottoms of our files.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/opendocument.lib.php b/libraries/opendocument.lib.php
index 85ad3f3e78..c1d698e9e8 100644
--- a/libraries/opendocument.lib.php
+++ b/libraries/opendocument.lib.php
@@ -3,7 +3,7 @@
 /**
  * Simple interface for creating OASIS OpenDocument files.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php
index 345c0964c2..73bf5cb757 100644
--- a/libraries/parse_analyze.lib.php
+++ b/libraries/parse_analyze.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index ea3a222f12..63cde28ceb 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -3,7 +3,7 @@
 /**
  * Generic plugin interface.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 4c42c5760e..0a09d28687 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 5e3d7ca083..d3f757280b 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php
index 3546fbbd11..1391150805 100644
--- a/libraries/relation_cleanup.lib.php
+++ b/libraries/relation_cleanup.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used for cleaning up phpMyAdmin tables
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index b0576800ab..a8bcacde61 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 if (! defined('PHPMYADMIN')) {
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 227dc5bcd9..c1098fce3f 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index 0e9d1e20af..88109fdaa8 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for event management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_export.lib.php b/libraries/rte/rte_export.lib.php
index a0fe0c879e..53944c6a45 100644
--- a/libraries/rte/rte_export.lib.php
+++ b/libraries/rte/rte_export.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common functions for the export functionality for Routines, Triggers and Events.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php
index 36ca06e966..2691d4b3b0 100644
--- a/libraries/rte/rte_footer.lib.php
+++ b/libraries/rte/rte_footer.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common functions for generating the footer for Routines, Triggers and Events.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 19e8e64b1e..f48c6ab051 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -3,7 +3,7 @@
 /**
  * Common functions for generating lists of Routines, Triggers and Events.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 796467ea5e..bdb43b8a20 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -3,7 +3,7 @@
 /**
  * Common code for Routines, Triggers and Events.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 60b163f19d..f6f110a6b2 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for routine management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index 7dc0fb8d15..d8bde4479f 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for trigger management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 2d2cff48d2..1f3110f305 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -3,7 +3,7 @@
 /**
  * This is in a separate script because it's called from a number of scripts
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index bf34de0554..89a54f9d70 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once "Export_Relation_Schema.class.php";
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index 983879f429..88a2829e80 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once "Export_Relation_Schema.class.php";
diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index d9ce1ec3db..7d650f766d 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index a0c1171da1..2adc0efc55 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'Export_Relation_Schema.class.php';
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index 292a78c092..569f753148 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'Export_Relation_Schema.class.php';
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index a155995106..399341247f 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index 959d7f168e..0b889e60a5 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'Export_Relation_Schema.class.php';
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index a755511ede..b8bb5f9efc 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -3,7 +3,7 @@
 /**
  * phpMyAdmin Language Loading File
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 4d7b8f834d..9bf1df11cc 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -3,7 +3,7 @@
 /**
  * Code for displaying server selection
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 5439011063..e9ae400db9 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 108f84e5ff..489f022b84 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 0bc7ae555c..3a076744db 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -3,7 +3,7 @@
 /**
  * Server synchronisation functions.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index a829172c91..b4a6b94626 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -6,7 +6,7 @@
  * @todo    add failover or warn if sessions are not configured properly
  * @todo    add an option to use mm-module for session handler
  * @see     http://www.php.net/session
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 3a98339511..056b241797 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -9,7 +9,7 @@
  * @usedby  tbl_structure.php
  * @usedby  tbl_tracking.php
  * @usedby  querywindow.php
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 93132b39d7..9829c3a1b5 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -14,7 +14,7 @@
  * It's easier to use only uppercase for proper sorting. In case of
  * doubt, use the test case to verify.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 6b1a315f5d..6ddcaa5bb7 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -24,7 +24,7 @@
  * page for it to work, I recommend '<link rel="stylesheet" type="text/css"
  * href="syntax.css.php" />' at the moment.)
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 654a9c89fd..57268c9825 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -15,7 +15,7 @@
  *
  * @access   public
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -43,7 +43,7 @@ if (!$GLOBALS['sqlvalidator_error']) {
     // Ok, we have SOAP Support, so let's use it!
 
 /**
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
     class PMA_SQLValidator
     {
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index 5309890d5c..4b958feb2d 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -27,7 +27,7 @@
  *
  * Also set a username and password if you have a private one
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index 9773820268..09e0780f7e 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -13,7 +13,7 @@
  * The SQL Parser code relies heavily on these functions.
  *
  * @todo a .lib filename should not have code in main(), split or rename file
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
index 0feb876e54..1e0dc9f927 100644
--- a/libraries/string_mb.lib.php
+++ b/libraries/string_mb.lib.php
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package phpMyAdmin-String-MB
+ * @package PhpMyAdmin-String-MB
  */
 
 /**
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
index 6fee5ca494..86832fa8ec 100644
--- a/libraries/string_native.lib.php
+++ b/libraries/string_native.lib.php
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package phpMyAdmin-String-Native
+ * @package PhpMyAdmin-String-Native
  */
 
 /**
diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php
index 271b0f79da..93b372e97a 100644
--- a/libraries/string_type_ctype.lib.php
+++ b/libraries/string_type_ctype.lib.php
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package phpMyAdmin-StringType-CType
+ * @package PhpMyAdmin-StringType-CType
  */
 
 /**
diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php
index 46a65440bd..603ff8f6ff 100644
--- a/libraries/string_type_native.lib.php
+++ b/libraries/string_type_native.lib.php
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @package phpMyAdmin-StringType-Native
+ * @package PhpMyAdmin-StringType-Native
  */
 
 /**
diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php
index e7ef90e804..281a013989 100644
--- a/libraries/svg_plot/pma_scatter_plot.php
+++ b/libraries/svg_plot/pma_scatter_plot.php
@@ -2,7 +2,7 @@
 /**
  * Generates the SVG needed for the plot
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'pma_svg_data_point.php';
diff --git a/libraries/svg_plot/pma_svg_data_element.php b/libraries/svg_plot/pma_svg_data_element.php
index 15a3ddc649..25e8fafd6c 100644
--- a/libraries/svg_plot/pma_svg_data_element.php
+++ b/libraries/svg_plot/pma_svg_data_element.php
@@ -2,7 +2,7 @@
 /**
  * Base class for the plot data type classes.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 abstract class PMA_SVG_Data_Element
 {
diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php
index cc07bffca5..6ba36ee8a1 100644
--- a/libraries/svg_plot/pma_svg_data_point.php
+++ b/libraries/svg_plot/pma_svg_data_point.php
@@ -2,7 +2,7 @@
 /**
  * Handles the visualization of Data Point objects.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'pma_svg_data_element.php';
diff --git a/libraries/sysinfo.lib.php b/libraries/sysinfo.lib.php
index e5f18b704a..c6408ff631 100644
--- a/libraries/sysinfo.lib.php
+++ b/libraries/sysinfo.lib.php
@@ -6,7 +6,7 @@
  *
  * This code is based on the OS Classes from the phpsysinfo project (http://phpsysinfo.sourceforge.net/)
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php
index a7ecf18cdf..4b8172f5d2 100644
--- a/libraries/tbl_common.php
+++ b/libraries/tbl_common.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index ac3a26f95c..4c126719ae 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -6,7 +6,7 @@
  * @todo should be handled by class Table
  * @todo this should be recoded as functions, to avoid messing with global variables
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 2cbf84e553..e7e7152435 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 12576f4193..c41146b2a8 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -4,7 +4,7 @@
  * Display form for changing/adding table fields/columns
  *
  * included by tbl_addfield.php, -_alter.php, -_create.php
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index b408e6c0b3..8e27290f36 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -18,7 +18,7 @@
  * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES
  *
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 2fa598b088..27f643a1c7 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for the table-search page and zoom-search page
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once 'url_generating.lib.php';
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
index 51da6ce993..7d16020e2c 100644
--- a/libraries/transformations.lib.php
+++ b/libraries/transformations.lib.php
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php
index 55fae19cc6..0418d76fc4 100644
--- a/libraries/transformations/application_octetstream__download.inc.php
+++ b/libraries/transformations/application_octetstream__download.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_application_octetstream__download_info()
diff --git a/libraries/transformations/application_octetstream__hex.inc.php b/libraries/transformations/application_octetstream__hex.inc.php
index 06eced41c3..c0cb6b2345 100644
--- a/libraries/transformations/application_octetstream__hex.inc.php
+++ b/libraries/transformations/application_octetstream__hex.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_application_octetstream__hex_info()
diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php
index 76ef2dee2b..87c7c903f5 100644
--- a/libraries/transformations/global.inc.php
+++ b/libraries/transformations/global.inc.php
@@ -19,7 +19,7 @@
  *
  * Please provide a comment for your function, what it does and what parameters are available.
  *
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 /**
diff --git a/libraries/transformations/image_jpeg__inline.inc.php b/libraries/transformations/image_jpeg__inline.inc.php
index 97e4bafd7a..4bbf465e14 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_image_jpeg__inline_info()
diff --git a/libraries/transformations/image_jpeg__link.inc.php b/libraries/transformations/image_jpeg__link.inc.php
index 82800c1527..39b38f6d5e 100644
--- a/libraries/transformations/image_jpeg__link.inc.php
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_image_jpeg__link_info()
diff --git a/libraries/transformations/image_png__inline.inc.php b/libraries/transformations/image_png__inline.inc.php
index 481af251ae..f96c9a0cee 100644
--- a/libraries/transformations/image_png__inline.inc.php
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_image_png__inline_info()
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
index d7b7ab1787..dcdcb8c3a4 100644
--- a/libraries/transformations/text_plain__dateformat.inc.php
+++ b/libraries/transformations/text_plain__dateformat.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__dateformat_info()
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index d60551c1a3..eb71ef2efa 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__external_info()
diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php
index 3b5e66b681..a8f27ca6dc 100644
--- a/libraries/transformations/text_plain__formatted.inc.php
+++ b/libraries/transformations/text_plain__formatted.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__formatted_info()
diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php
index 06fd97fb5e..c02ff35dd3 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__imagelink_info()
diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php
index 4daa565b45..c08d34e6f3 100644
--- a/libraries/transformations/text_plain__link.inc.php
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__link_info()
diff --git a/libraries/transformations/text_plain__longToIpv4.inc.php b/libraries/transformations/text_plain__longToIpv4.inc.php
index 4c95997cd8..762d52324b 100644
--- a/libraries/transformations/text_plain__longToIpv4.inc.php
+++ b/libraries/transformations/text_plain__longToIpv4.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__longToIpv4_info()
diff --git a/libraries/transformations/text_plain__sql.inc.php b/libraries/transformations/text_plain__sql.inc.php
index 2db5eccf87..d09a239086 100644
--- a/libraries/transformations/text_plain__sql.inc.php
+++ b/libraries/transformations/text_plain__sql.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__sql_info()
diff --git a/libraries/transformations/text_plain__substr.inc.php b/libraries/transformations/text_plain__substr.inc.php
index 0ca19e2d51..c220b0602d 100644
--- a/libraries/transformations/text_plain__substr.inc.php
+++ b/libraries/transformations/text_plain__substr.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Transformation
+ * @package PhpMyAdmin-Transformation
  */
 
 function PMA_transformation_text_plain__substr_info()
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index 388412520a..f36f8f8806 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -3,7 +3,7 @@
 /**
  * URL/hidden inputs generating.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 22b3725c0b..42deeb886c 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -3,7 +3,7 @@
 /**
  * Common header for user preferences pages
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 if (!defined('PHPMYADMIN')) {
     exit;
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 84ca5c4fd8..497b28ed11 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -3,7 +3,7 @@
 /**
  * Functions for displaying user preferences pages
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
index 41f7c233fc..ed2b410541 100644
--- a/libraries/vendor_config.php
+++ b/libraries/vendor_config.php
@@ -7,7 +7,7 @@
  * For changing this file you should know what you are doing. For this reason
  * options here are not part of normal configuration.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php
index f8b58782f4..7a0094f0b5 100644
--- a/libraries/zip.lib.php
+++ b/libraries/zip.lib.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
@@ -12,7 +12,7 @@
  * @see Official ZIP file format: http://www.pkware.com/support/zip-app-note
  *
  * @access  public
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class zipfile
 {
diff --git a/license.php b/license.php
index 2a5dc9765f..b9a9ec8fbf 100644
--- a/license.php
+++ b/license.php
@@ -6,7 +6,7 @@
  * Note: please do not fold this script into a general script
  * that would read any file using a GET parameter, it would open a hole
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/main.php b/main.php
index 30d958957f..f0fd68f517 100644
--- a/main.php
+++ b/main.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/navigation.php b/navigation.php
index dffa557e2f..a93aae6427 100644
--- a/navigation.php
+++ b/navigation.php
@@ -3,7 +3,7 @@
 /**
  * the navigation frame - displays server, db and table selection tree
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/phpinfo.php b/phpinfo.php
index 152c4b39a7..2d47abf465 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * phpinfo() wrapper to allow displaying only when configured to do so.
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/phpmyadmin.css.php b/phpmyadmin.css.php
index b3cfecc2b8..4fd7ce260c 100644
--- a/phpmyadmin.css.php
+++ b/phpmyadmin.css.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/pmd_display_field.php b/pmd_display_field.php
index f7665b89c8..34c4d8717e 100644
--- a/pmd_display_field.php
+++ b/pmd_display_field.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/pmd_general.php b/pmd_general.php
index 4a8c27a4a4..21fffc9769 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/pmd_pdf.php b/pmd_pdf.php
index 95a412b5b0..ced74f9b23 100644
--- a/pmd_pdf.php
+++ b/pmd_pdf.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 require_once './libraries/pmd_common.php';
diff --git a/pmd_relation_new.php b/pmd_relation_new.php
index c0a6ad8d7c..f0577ca4ea 100644
--- a/pmd_relation_new.php
+++ b/pmd_relation_new.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
index d61d9d2754..24ced45192 100644
--- a/pmd_relation_upd.php
+++ b/pmd_relation_upd.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/pmd_save_pos.php b/pmd_save_pos.php
index ac7d53366a..10a6e8a640 100644
--- a/pmd_save_pos.php
+++ b/pmd_save_pos.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin-Designer
+ * @package PhpMyAdmin-Designer
  */
 
 /**
diff --git a/prefs_forms.php b/prefs_forms.php
index 4aaea9c2bc..1f6fb79c93 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -3,7 +3,7 @@
 /**
  * User preferences page
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/prefs_manage.php b/prefs_manage.php
index 267eb43545..c21aa55539 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -3,7 +3,7 @@
 /**
  * User preferences management page
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/querywindow.php b/querywindow.php
index c18d2a6a81..2c28373552 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -4,7 +4,7 @@
  * this file is register_globals safe
  *
  * @todo    move JavaScript out of here into .js files
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/schema_edit.php b/schema_edit.php
index 85eeccc321..b0816480ba 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/schema_export.php b/schema_export.php
index d67bc85aff..1430e57378 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php
index e376ef849f..aff4d34e8a 100644
--- a/scripts/decode_bug.php
+++ b/scripts/decode_bug.php
@@ -8,7 +8,7 @@
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
  *
- * @package phpMyAdmin-debug
+ * @package PhpMyAdmin-debug
  */
 
 /**
diff --git a/scripts/openid.php b/scripts/openid.php
index 911f69d046..d57b83c75a 100644
--- a/scripts/openid.php
+++ b/scripts/openid.php
@@ -12,7 +12,7 @@
  * User first authenticates using OpenID and based on content of $AUTH_MAP
  * the login information is passed to phpMyAdmin in session data.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/scripts/signon-script.php b/scripts/signon-script.php
index 201d21762f..52777a0743 100644
--- a/scripts/signon-script.php
+++ b/scripts/signon-script.php
@@ -7,7 +7,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/scripts/signon.php b/scripts/signon.php
index d80c1cf9de..0dfd356d3d 100644
--- a/scripts/signon.php
+++ b/scripts/signon.php
@@ -7,7 +7,7 @@
  * phpMyAdmin, it is not intended to be perfect code and look, only
  * shows how you can integrate this functionality in your application.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  * @subpackage Example
  */
 
diff --git a/server_binlog.php b/server_binlog.php
index 8e7a316c6c..89a424a835 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -3,7 +3,7 @@
 /**
  * display the binary logs and the content of the selected
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_collations.php b/server_collations.php
index 0fc182cc5c..b229b5cc3a 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_databases.php b/server_databases.php
index e7519a5395..9b6d5b01a7 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_engines.php b/server_engines.php
index afd6d5071d..9dcfc12cf4 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -3,7 +3,7 @@
 /**
  * display list of server engines and additonal information about them
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_export.php b/server_export.php
index d6dd2cfc2c..e80f2cdcf1 100644
--- a/server_export.php
+++ b/server_export.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_import.php b/server_import.php
index e0eb68479e..ddc49e8936 100644
--- a/server_import.php
+++ b/server_import.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_plugins.php b/server_plugins.php
index 93a5f638f1..7aa0516937 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_privileges.php b/server_privileges.php
index dccc7af708..cc17d400b9 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_replication.php b/server_replication.php
index b070067ff0..db48a7995a 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_sql.php b/server_sql.php
index ddf90eded7..56aca7ac3d 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_status.php b/server_status.php
index 02e3a7f1e0..bfd641d127 100644
--- a/server_status.php
+++ b/server_status.php
@@ -4,7 +4,7 @@
  * displays status variables with descriptions and some hints an optmizing
  *  + reset status variables
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_synchronize.php b/server_synchronize.php
index 83acf6b137..c37a9e0c48 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -3,7 +3,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/server_variables.php b/server_variables.php
index 9c37864a2a..35a3568838 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/setup/config.php b/setup/config.php
index 89bcdc9909..f105d34a5a 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -3,7 +3,7 @@
 /**
  * Front controller for config view / download and clear
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 /**
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index e56898fa0c..353145c29f 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -3,7 +3,7 @@
 /**
  * Config file view and save screen
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php
index 5d34034f09..83cace37aa 100644
--- a/setup/frames/form.inc.php
+++ b/setup/frames/form.inc.php
@@ -3,7 +3,7 @@
 /**
  * Form edit view
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 3ad1cfcd29..bbd631b2fa 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -2,7 +2,7 @@
 /**
  * Overview (main page)
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 978a47becb..c0cb23f4ab 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -2,7 +2,7 @@
 /**
  * Menu items
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 8d04966588..d208c0d2c3 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -2,7 +2,7 @@
 /**
  * Server create and edit view
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php
index f3c6ed8e78..b4b49fe219 100644
--- a/setup/lib/ConfigGenerator.class.php
+++ b/setup/lib/ConfigGenerator.class.php
@@ -3,13 +3,13 @@
 /**
  * Config file generator
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 /**
  * Config file generation class
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 class ConfigGenerator
 {
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 2965decaa4..227d394b9b 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -3,7 +3,7 @@
 /**
  * Loads libraries/common.inc.php and preforms some additional actions
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 /**
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 10c368c0ef..95095872a5 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -3,7 +3,7 @@
 /**
  * Formset processing library
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 /**
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 334953f83f..3e60019bea 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -6,7 +6,7 @@
  * Security checks are the idea of Aung Khant <aungkhant[at]yehg.net>, http://yehg.net/lab
  * Version check taken from the old setup script by Michal Čihař <michal@cihar.com>
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 if (!defined('PHPMYADMIN')) {
diff --git a/setup/validate.php b/setup/validate.php
index 22bdccb60c..32cac073dd 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -3,7 +3,7 @@
 /**
  * Validation callback.
  *
- * @package phpMyAdmin-setup
+ * @package PhpMyAdmin-setup
  */
 
 /**
diff --git a/show_config_errors.php b/show_config_errors.php
index e163c426c5..d3f9dbee71 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -3,7 +3,7 @@
 /**
  * Simple wrapper just to enable error reporting and include config
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
diff --git a/sql.php b/sql.php
index aa99c195da..9100def7a8 100644
--- a/sql.php
+++ b/sql.php
@@ -3,7 +3,7 @@
 /**
  * @todo    we must handle the case if sql.php is called directly with a query
  *          that returns 0 rows - to prevent cyclic redirects or includes
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_addfield.php b/tbl_addfield.php
index c2a2e9687c..69252e6eb7 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_alter.php b/tbl_alter.php
index a2688662d1..aace3169db 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -6,7 +6,7 @@
  * linked from table_structure, uses libraries/tbl_properties.inc.php to display
  * form and handles this form data
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_change.php b/tbl_change.php
index 004c30a194..2dbbc5bde5 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -5,7 +5,7 @@
  *
  * register_globals_save (mark this file save for disabling register globals)
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_chart.php b/tbl_chart.php
index e396c536df..ac52bd1fad 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -3,7 +3,7 @@
 /**
  * handles creation of the chart
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_create.php b/tbl_create.php
index cdad8bafc3..9397b87453 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_export.php b/tbl_export.php
index 379d26c37a..312cfb8aba 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_get_field.php b/tbl_get_field.php
index b636c46022..5c7d0171c8 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Provides download to a given field defined in parameters.
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 31bcd81e4f..16cc379d11 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -2,7 +2,7 @@
 /**
  * handles creation of the GIS visualizations.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_import.php b/tbl_import.php
index ff99ca85b4..e5449b9c5b 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 1d678dbd63..f06a751b04 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -3,7 +3,7 @@
 /**
  * Displays index edit/creation form and handles it
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index e25cf69c76..00a8a3981d 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_operations.php b/tbl_operations.php
index 1f443156cd..a09528b4e1 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_printview.php b/tbl_printview.php
index b459d607fd..17c9b25ecf 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_relation.php b/tbl_relation.php
index fc3d868aed..a5f6f17a14 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -10,7 +10,7 @@
  * @todo check foreign fields to be from same type and size, all other makes no sense
  * @todo add an link to create an index required for constraints, or an option to do automatically
  * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_replace.php b/tbl_replace.php
index 79c21c3d12..38319b2386 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -8,7 +8,7 @@
  *
  * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by
  *       it needs the original query and the row number and than replace the LIMIT clause
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 298fe7ad53..537e4f25d4 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -3,7 +3,7 @@
 /**
  * handle row specifc actions like edit, delete, export
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 
diff --git a/tbl_select.php b/tbl_select.php
index 07626774b7..71038143aa 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -7,7 +7,7 @@
  * and include sql.php to execute it
  *
  * @todo display search form again if no results from previous search
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_sql.php b/tbl_sql.php
index 70f2177354..2e4cde6540 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_structure.php b/tbl_structure.php
index 0385b26745..754dea1514 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -3,7 +3,7 @@
 /**
  * Displays table structure infos like fields/columns, indexes, size, rows
  * and allows manipulation of indexes and columns/fields
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 5099859086..fecfa86396 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 // Run common work
diff --git a/tbl_triggers.php b/tbl_triggers.php
index f20eecbf12..9c87e676dd 100644
--- a/tbl_triggers.php
+++ b/tbl_triggers.php
@@ -3,7 +3,7 @@
 /**
  * Triggers management.
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 require_once './db_triggers.php';
diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
index 5d9baedfec..0f4839ed8c 100644
--- a/test/AllSeleniumTests.php
+++ b/test/AllSeleniumTests.php
@@ -3,7 +3,7 @@
 /**
  * runs all defined Selenium tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 
diff --git a/test/AllTests.php b/test/AllTests.php
index 338f83d580..c170a1c99c 100644
--- a/test/AllTests.php
+++ b/test/AllTests.php
@@ -3,7 +3,7 @@
 /**
  * runs all defined tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /**
diff --git a/test/Environment_test.php b/test/Environment_test.php
index 4cae38fbbd..5a155191a3 100644
--- a/test/Environment_test.php
+++ b/test/Environment_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for environment like OS, PHP, modules, ...
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /**
@@ -12,7 +12,7 @@
 require_once 'config.sample.inc.php';
 
 /**
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 class Environment_test extends PHPUnit_Framework_TestCase
 {
diff --git a/test/PMA_showHint_test.php b/test/PMA_showHint_test.php
index 83707591dd..8a3da9f4d9 100644
--- a/test/PMA_showHint_test.php
+++ b/test/PMA_showHint_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_showHint() function from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_showHint_test.php
  */
 
diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
index 9a92fe5614..1ef60b265a 100644
--- a/test/classes/Advisor_test.php
+++ b/test/classes/Advisor_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for Advisor class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index edcc6aa466..38d555f4ba 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -4,7 +4,7 @@
  * Test for PMA_Config class
  *
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group current
  */
 
diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php
index 63bf80ad10..5115650b08 100644
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/PMA_File_test.php
@@ -4,7 +4,7 @@
 /**
  * tests for PMA_File class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/PMA_List_Database_test.php
index 6eb3e7e5cc..24e7a11ac7 100644
--- a/test/classes/PMA_List_Database_test.php
+++ b/test/classes/PMA_List_Database_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_List_Database class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index db8e38559d..5968594483 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_Message class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PMA_PDF_test.php
index 1f7931c338..eec134ccdf 100644
--- a/test/classes/PMA_PDF_test.php
+++ b/test/classes/PMA_PDF_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_PDF class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index 361417b02c..02a2f1b14b 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_Theme_Manager class
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php
index ea4e3be042..10ba6b2679 100644
--- a/test/classes/gis/PMA_GIS_Factory_test.php
+++ b/test/classes/gis/PMA_GIS_Factory_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Factory
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once 'libraries/gis/pma_gis_geometry.php';
 require_once 'libraries/gis/pma_gis_linestring.php';
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index 8176a92433..6f61cf1ba5 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -2,7 +2,7 @@
 /**
  * Abstract parent class for all PMA_GIS_<Geom_type> test classes
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'libraries/gis/pma_gis_geometry.php';
diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php
index b5d47324f2..8d561af710 100644
--- a/test/classes/gis/PMA_GIS_Geometry_test.php
+++ b/test/classes/gis/PMA_GIS_Geometry_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Geometry
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'libraries/gis/pma_gis_geometry.php';
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php
index 76bfe05135..480e2d8f3d 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/PMA_GIS_Linestring_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Linestring
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php
index 636c028db6..bf7118e5b0 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Multilinestring
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php
index 57b7594938..9b1826a8a7 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/PMA_GIS_Multipoint_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Multipoint
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php
index 19a09dc16f..bea856e849 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Multipolygon
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php
index bca1e4c370..af85daf0b8 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/PMA_GIS_Point_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Point
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php
index 0686295ae6..9ce15c6a53 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/PMA_GIS_Polygon_test.php
@@ -2,7 +2,7 @@
 /**
  * Test for PMA_GIS_Polygon
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'PMA_GIS_Geom_test.php';
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index 04e9e1adad..8894c2a89f 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -2,7 +2,7 @@
 /**
  * Tests for PMA_GIS_modifyQuery method
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'libraries/sqlparser.lib.php';
diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php
index 8c7bc04e8b..e4e9e88d0e 100644
--- a/test/libraries/PMA_SQL_parser_data_test.php
+++ b/test/libraries/PMA_SQL_parser_data_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for correctness of SQL parser data
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_SQL_parser_test.php b/test/libraries/PMA_SQL_parser_test.php
index 155f439c11..e2eb362921 100644
--- a/test/libraries/PMA_SQL_parser_test.php
+++ b/test/libraries/PMA_SQL_parser_test.php
@@ -3,7 +3,7 @@
 /**
  * Tests for correctness of SQL parser
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_STR_sub_test.php b/test/libraries/PMA_STR_sub_test.php
index e10ff39c30..1febef995a 100644
--- a/test/libraries/PMA_STR_sub_test.php
+++ b/test/libraries/PMA_STR_sub_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_pow()
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 $match = array();
diff --git a/test/libraries/PMA_blowfish_test.php b/test/libraries/PMA_blowfish_test.php
index d860bd05cf..989822a91e 100644
--- a/test/libraries/PMA_blowfish_test.php
+++ b/test/libraries/PMA_blowfish_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for blowfish encryption.
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php
index 93afaef775..c1917170b3 100644
--- a/test/libraries/PMA_escapeJsString_test.php
+++ b/test/libraries/PMA_escapeJsString_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for javascript escaping.
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php
index cc2aacfccb..5e8c604892 100644
--- a/test/libraries/PMA_generateCommonUrl_test.php
+++ b/test/libraries/PMA_generateCommonUrl_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_generate_common_url()
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index 3f0cbf1d97..23bf6de0fc 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_sanitize()
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/PMA_transformation_getOptions_test.php b/test/libraries/PMA_transformation_getOptions_test.php
index 99d0a10031..03bc4bef33 100644
--- a/test/libraries/PMA_transformation_getOptions_test.php
+++ b/test/libraries/PMA_transformation_getOptions_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for PMA_sanitize()
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/common/PMA_ajaxResponse_test.php b/test/libraries/common/PMA_ajaxResponse_test.php
index 7f8d69d77f..8c6b72da4b 100644
--- a/test/libraries/common/PMA_ajaxResponse_test.php
+++ b/test/libraries/common/PMA_ajaxResponse_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_ajaxResponse from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_ajaxResponse_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_browseUploadFile_test.php b/test/libraries/common/PMA_browseUploadFile_test.php
index a51a62cfb4..4abc9cfbdc 100644
--- a/test/libraries/common/PMA_browseUploadFile_test.php
+++ b/test/libraries/common/PMA_browseUploadFile_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_browseUploadFile from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_browseUploadFile_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index 88c54f3f16..8068cefead 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_buildActionTitles from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_buildActionTitles_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php
index 2284078c4a..2e223522bb 100644
--- a/test/libraries/common/PMA_cache_test.php
+++ b/test/libraries/common/PMA_cache_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for caching data in session
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_cache_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index 3bf4ed8ff3..7e1bd4f835 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_checkParameters from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_checkParameters_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
index f13154bfe6..2804c88c2b 100644
--- a/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
+++ b/test/libraries/common/PMA_contains_nonprintable_ascii_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_contains_nonprintable_ascii from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_contains_nonprintable_ascii.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_convert_bit_default_value_test.php b/test/libraries/common/PMA_convert_bit_default_value_test.php
index 333ffac507..6dd7b25235 100644
--- a/test/libraries/common/PMA_convert_bit_default_value_test.php
+++ b/test/libraries/common/PMA_convert_bit_default_value_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_convert_bit_default_value from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_convert_bit_default_value_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_displayMaximumUploadSize_test.php b/test/libraries/common/PMA_displayMaximumUploadSize_test.php
index 57af20857d..9236c4435c 100644
--- a/test/libraries/common/PMA_displayMaximumUploadSize_test.php
+++ b/test/libraries/common/PMA_displayMaximumUploadSize_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_displayMaximumUploadSize from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_displayMaximumUploadSize_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_display_html_checkbox_test.php b/test/libraries/common/PMA_display_html_checkbox_test.php
index 4eca6368f6..36fbafbf1b 100644
--- a/test/libraries/common/PMA_display_html_checkbox_test.php
+++ b/test/libraries/common/PMA_display_html_checkbox_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_display_html_checkbox from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_display_html_checkbox_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_display_html_radio_test.php b/test/libraries/common/PMA_display_html_radio_test.php
index 6e7c014120..6c7b96bfa8 100644
--- a/test/libraries/common/PMA_display_html_radio_test.php
+++ b/test/libraries/common/PMA_display_html_radio_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_display_html_radio from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_display_html_radio_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
index c77a841fe7..de4d1a79ab 100644
--- a/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+++ b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for MySQL Wildcards escaping/unescaping
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_escapeMySqlWildcards_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_expandUserString_test.php b/test/libraries/common/PMA_expandUserString_test.php
index 39cc66409e..e8c13c851d 100644
--- a/test/libraries/common/PMA_expandUserString_test.php
+++ b/test/libraries/common/PMA_expandUserString_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_expandUserString from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group common.lib-tests
  */
 
diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php
index eeb79c4cd0..c46b6e57f5 100644
--- a/test/libraries/common/PMA_extractFieldSpec_test.php
+++ b/test/libraries/common/PMA_extractFieldSpec_test.php
@@ -4,7 +4,7 @@
 /**
  * Test for PMA_extractFieldSpec from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group common.lib-tests
  */
 
diff --git a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
index d80c79748f..43ba342465 100644
--- a/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
+++ b/test/libraries/common/PMA_extractValueFromFormattedSize_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_extractValueFromFormattedSize from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_extractValueFromFormattedSize_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php
index f9c30499d1..ccea2a2036 100644
--- a/test/libraries/common/PMA_foreignKeySupported_test.php
+++ b/test/libraries/common/PMA_foreignKeySupported_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for supporting foreign key
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_foreignKeySupported_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php
index 18ab8ba96d..2cdf25991e 100644
--- a/test/libraries/common/PMA_formatNumberByteDown_test.php
+++ b/test/libraries/common/PMA_formatNumberByteDown_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for format number and byte
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_formatNumberByteDown_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_formatSql_test.php b/test/libraries/common/PMA_formatSql_test.php
index e7a1c1faee..ca1c567c4e 100644
--- a/test/libraries/common/PMA_formatSql_test.php
+++ b/test/libraries/common/PMA_formatSql_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_formatSql from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_formatSql_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
index b759f5365d..d546fd8297 100644
--- a/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
+++ b/test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_generateHiddenMaxFileSize from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_generateHiddenMaxFileSize_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_generate_html_dropdown_test.php b/test/libraries/common/PMA_generate_html_dropdown_test.php
index 0035646496..0b45212f14 100644
--- a/test/libraries/common/PMA_generate_html_dropdown_test.php
+++ b/test/libraries/common/PMA_generate_html_dropdown_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_generate_html_dropdown_test from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_display_html_checkbox_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_generate_slider_effect_test.php b/test/libraries/common/PMA_generate_slider_effect_test.php
index 8012cef7b7..5736d3e55f 100644
--- a/test/libraries/common/PMA_generate_slider_effect_test.php
+++ b/test/libraries/common/PMA_generate_slider_effect_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_generate_slider_effect from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_generate_slider_effect_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index 303ec3892a..eaf2ee5d12 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_getDbLink_test from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_getDbLink_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php
index 5c0f3e23ac..486dc3131c 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_getIcon() from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_getIcon_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_getTitleForTarget_test.php b/test/libraries/common/PMA_getTitleForTarget_test.php
index 478520d274..77cdb6ff45 100644
--- a/test/libraries/common/PMA_getTitleForTarget_test.php
+++ b/test/libraries/common/PMA_getTitleForTarget_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_getTitleForTarget from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_getTitleForTarget_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php
index 4ed29093e3..b4ee1f7de0 100644
--- a/test/libraries/common/PMA_localisedDateTimespan_test.php
+++ b/test/libraries/common/PMA_localisedDateTimespan_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating localised date or timespan expression
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_localisedDateTimespan_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_pow_test.php b/test/libraries/common/PMA_pow_test.php
index ff55e16b81..75cb2550d1 100644
--- a/test/libraries/common/PMA_pow_test.php
+++ b/test/libraries/common/PMA_pow_test.php
@@ -3,7 +3,7 @@
 /**
  * Tests for PMA_pow() function from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_pow_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php
index 20d4f4ff1f..eea420d3b3 100644
--- a/test/libraries/common/PMA_printableBitValue_test.php
+++ b/test/libraries/common/PMA_printableBitValue_test.php
@@ -3,7 +3,7 @@
 /**
  * Test printableBitValue function
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_printableBitValue_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php
index 3f27a8e507..9f946f91f6 100644
--- a/test/libraries/common/PMA_quoting_slashing_test.php
+++ b/test/libraries/common/PMA_quoting_slashing_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for quoting, slashing/backslashing
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_quoting_slashing_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index bd5c723230..158fb86011 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_showDocu from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_showDocu.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index daf855fdb9..bf757e401a 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_showMessage from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_showMessage_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index fe24855ccb..6cc54eab7a 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_showPHPDocu from common.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_showPHPDocu_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php
index 3664b44070..ef18dbea88 100644
--- a/test/libraries/common/PMA_stringOperations_test.php
+++ b/test/libraries/common/PMA_stringOperations_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for several string operations
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_stringOperations_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_unsupportedDatatypes_test.php b/test/libraries/common/PMA_unsupportedDatatypes_test.php
index 57c8c87f27..9e86f0a10e 100644
--- a/test/libraries/common/PMA_unsupportedDatatypes_test.php
+++ b/test/libraries/common/PMA_unsupportedDatatypes_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_unsupportedDatatypes from common.lib
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_unsupportedDatatypes_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/common/PMA_whichCrlf_test.php b/test/libraries/common/PMA_whichCrlf_test.php
index 52d8323bbd..ce12717755 100644
--- a/test/libraries/common/PMA_whichCrlf_test.php
+++ b/test/libraries/common/PMA_whichCrlf_test.php
@@ -3,7 +3,7 @@
 /**
  * Test whichCrlf function
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_whichCrlf_test.php
  * @group common.lib-tests
  */
diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
index 8fc63fbaee..181022a62d 100644
--- a/test/libraries/core/PMA_array_test.php
+++ b/test/libraries/core/PMA_array_test.php
@@ -4,7 +4,7 @@
  * Test for PMA_array_read(), PMA_array_write(), PMA_array_remove(), PMA_array_merge_recursive(),
  * PMA_arrayWalkRecursive() from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php
index fe10ace949..baaaeaf9da 100644
--- a/test/libraries/core/PMA_checkPageValidity_test.php
+++ b/test/libraries/core/PMA_checkPageValidity_test.php
@@ -3,7 +3,7 @@
 /**
  * Tests for PMA_checkPageValidity() from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index 643c4d9005..b89c5440c2 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -6,7 +6,7 @@
  * PMA_fatalError() displays the given error message on phpMyAdmin error page in foreign language
  * and ends script execution and closes session
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index 2208bc63e2..eb32ad6386 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_getPHPDocLink, PMA_linkURL, PMA_includeJS  from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 3c89b772f1..507afe045f 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -4,7 +4,7 @@
  * Test for PMA_getTableCount_test from core.lib.php
  * PMA_getTableCount_test returns count of tables in given db
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_get_real_size_test.php b/test/libraries/core/PMA_get_real_size_test.php
index 894e22c9eb..b6096d7e8d 100644
--- a/test/libraries/core/PMA_get_real_size_test.php
+++ b/test/libraries/core/PMA_get_real_size_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_get_real_size()  from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_headerLocation_test_disabled.php b/test/libraries/core/PMA_headerLocation_test_disabled.php
index 089064bee7..3ef82c925c 100644
--- a/test/libraries/core/PMA_headerLocation_test_disabled.php
+++ b/test/libraries/core/PMA_headerLocation_test_disabled.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_sendHeaderLocation
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
@@ -24,7 +24,7 @@ require_once 'libraries/select_lang.lib.php';
  *
  * <code>rename_function('headers_sent', 'headers_sent'.str_replace(array('.', ' '),array('', ''),microtime()));</code>
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
diff --git a/test/libraries/core/PMA_ifSetOr_test.php b/test/libraries/core/PMA_ifSetOr_test.php
index 35ffa967af..d4579caf6f 100644
--- a/test/libraries/core/PMA_ifSetOr_test.php
+++ b/test/libraries/core/PMA_ifSetOr_test.php
@@ -3,7 +3,7 @@
 /**
  * Tests for PMA_ifSetOr() from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_isValid_test.php b/test/libraries/core/PMA_isValid_test.php
index 5bd33675d4..0bb788a03b 100644
--- a/test/libraries/core/PMA_isValid_test.php
+++ b/test/libraries/core/PMA_isValid_test.php
@@ -3,7 +3,7 @@
 /**
  * Tests for PMA_isValid() from libraries/core.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/core/PMA_securePath_test.php b/test/libraries/core/PMA_securePath_test.php
index 3b8575c1d2..3dbd6380ed 100644
--- a/test/libraries/core/PMA_securePath_test.php
+++ b/test/libraries/core/PMA_securePath_test.php
@@ -4,7 +4,7 @@
  * Tests for PMA_securePath() from libraries/core.lib.php
  * PMA_securePath changes .. to .
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'libraries/core.lib.php';
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index 522453dbc0..1e11c73f04 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -4,7 +4,7 @@
  * Test for PMA_warnMissingExtension() from libraries/core.lib.php
  * PMA_warnMissingExtension warns or fails on missing extension.
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php
index ff185ef878..0bc904b519 100644
--- a/test/libraries/js_escape_test.php
+++ b/test/libraries/js_escape_test.php
@@ -3,7 +3,7 @@
 /**
  * tests for JS variable formatting
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/php-gettext/Locales_test.php b/test/libraries/php-gettext/Locales_test.php
index d8a09811fe..b0a290d2a9 100644
--- a/test/libraries/php-gettext/Locales_test.php
+++ b/test/libraries/php-gettext/Locales_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for gettext locales.
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once('libraries/php-gettext/gettext.inc');
 
diff --git a/test/libraries/php-gettext/Parsing_test.php b/test/libraries/php-gettext/Parsing_test.php
index c4fc461059..d651d84c3a 100644
--- a/test/libraries/php-gettext/Parsing_test.php
+++ b/test/libraries/php-gettext/Parsing_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for gettext parsing.
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 //require_once('gettext.php');
 
diff --git a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
index 382ade5053..90beb7de95 100644
--- a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for fetching event data from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index 4480f9e10a..b63d422e4c 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating event editor
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/url_generating.lib.php';
diff --git a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
index 5c6603d4be..3949c65bde 100644
--- a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating CREATE EVENT query from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php
index fa80f8b490..890604e010 100644
--- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php
+++ b/test/libraries/rte/PMA_RTN_ParameterParser_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for parsing of Routine parameters
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
index 112315d4ce..f8e2804754 100644
--- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for fetching routine data from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 require_once 'libraries/common.lib.php';
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 2230ca9a1f..b0674f479b 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating routine editor
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once 'libraries/common.lib.php';
 require_once 'libraries/php-gettext/gettext.inc';
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index 03fc82acab..aeea93fa5a 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating routine execution dialog
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once 'libraries/common.lib.php';
 require_once 'libraries/sqlparser.lib.php';
diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
index 95473e399c..2d2717eb5d 100644
--- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating CREATE [PROCEDURE|FUNCTION] query from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
index af10eaa4b4..c9c1444e94 100644
--- a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for fetching trigger data from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
index 411a535428..7b3d0baaf5 100644
--- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating trigger editor
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 require_once 'libraries/php-gettext/gettext.inc';
 require_once 'libraries/url_generating.lib.php';
diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
index d6e18ad882..492314e1f3 100644
--- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for generating CREATE TRIGGER query from HTTP request
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /*
diff --git a/test/libraries/select_lang/PMA_langDetails_test.php b/test/libraries/select_lang/PMA_langDetails_test.php
index ca758edf7d..c60fd6f926 100644
--- a/test/libraries/select_lang/PMA_langDetails_test.php
+++ b/test/libraries/select_lang/PMA_langDetails_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_langDetails from select_lang.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_langDetails_test.php
  * @group select_lang.lib-tests
  */
diff --git a/test/libraries/select_lang/PMA_langList_test.php b/test/libraries/select_lang/PMA_langList_test.php
index 354668b9fd..98a17ff63a 100644
--- a/test/libraries/select_lang/PMA_langList_test.php
+++ b/test/libraries/select_lang/PMA_langList_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_langList from select_lang.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_langList_test.php
  * @group select_lang.lib-tests
  */
diff --git a/test/libraries/select_lang/PMA_langName_test.php b/test/libraries/select_lang/PMA_langName_test.php
index 892d114265..69ba314573 100644
--- a/test/libraries/select_lang/PMA_langName_test.php
+++ b/test/libraries/select_lang/PMA_langName_test.php
@@ -3,7 +3,7 @@
 /**
  * Test for PMA_langName from select_lang.lib.php
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @version $Id: PMA_langName_test.php
  * @group select_lang.lib-tests
  */
diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php
index bde93bf922..5e36564d69 100644
--- a/test/selenium/PmaSeleniumLoginTest.php
+++ b/test/selenium/PmaSeleniumLoginTest.php
@@ -3,7 +3,7 @@
 /**
  * Selenium TestCase for login related tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group Selenium
  */
 
diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php
index 0e3f4cf685..9ef5cc65b2 100644
--- a/test/selenium/PmaSeleniumPrivilegesTest.php
+++ b/test/selenium/PmaSeleniumPrivilegesTest.php
@@ -3,7 +3,7 @@
 /**
  * Selenium TestCase for privilege related tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group Selenium
  */
 
diff --git a/test/selenium/PmaSeleniumTestCase.php b/test/selenium/PmaSeleniumTestCase.php
index 1b33ff022a..669dc8dbb7 100644
--- a/test/selenium/PmaSeleniumTestCase.php
+++ b/test/selenium/PmaSeleniumTestCase.php
@@ -3,7 +3,7 @@
 /**
  * Selenium parent class for TestCases
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group Selenium
  */
 
diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
index 0cba510194..f0771a1724 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/PmaSeleniumXssTest.php
@@ -3,7 +3,7 @@
 /**
  * Selenium TestCase for XSS related tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  * @group Selenium
  */
 
diff --git a/test/theme.php b/test/theme.php
index cc491b5a34..7dc63e0e2f 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -3,7 +3,7 @@
 /**
  * theme test
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 chdir('..');
diff --git a/test/wui.php b/test/wui.php
index c3b459d0af..f6fd819817 100644
--- a/test/wui.php
+++ b/test/wui.php
@@ -3,7 +3,7 @@
 /**
  * runs all defined tests
  *
- * @package phpMyAdmin-test
+ * @package PhpMyAdmin-test
  */
 
 /**
diff --git a/themes.php b/themes.php
index 166333466c..e0347bd0c0 100644
--- a/themes.php
+++ b/themes.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index b8a140983a..31dd39aa2b 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php
index 49a0d23639..0804342f0b 100644
--- a/themes/original/css/theme_print.css.php
+++ b/themes/original/css/theme_print.css.php
@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage Original
  */
 ?>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index f59e2862be..635e81ba2a 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -3,7 +3,7 @@
 /**
  * main css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
index 5f7beba8f3..635c3c6ae3 100644
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php
index 4c58d24399..d2caeb5f88 100644
--- a/themes/original/layout.inc.php
+++ b/themes/original/layout.inc.php
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage Original
  */
 
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
index ce2771b7a4..c9f613266b 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/theme_left.css.php
@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage pmahomme
  */
 
diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php
index 35f28a4977..ad5484ae16 100644
--- a/themes/pmahomme/css/theme_print.css.php
+++ b/themes/pmahomme/css/theme_print.css.php
@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage pmahomme
  */
 ?>
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 1f7b509364..efc8fff148 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -3,7 +3,7 @@
 /**
  * main css file from theme Original
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage pmahomme
  */
 
diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php
index a39a0fb239..aa485d8ac1 100644
--- a/themes/pmahomme/info.inc.php
+++ b/themes/pmahomme/info.inc.php
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage pmahomme
  */
 
diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php
index ca7127286f..56aff20e84 100644
--- a/themes/pmahomme/layout.inc.php
+++ b/themes/pmahomme/layout.inc.php
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  * @subpackage pmahomme
  */
 
diff --git a/themes/sprites.css.php b/themes/sprites.css.php
index aa545a3845..5156531dbe 100644
--- a/themes/sprites.css.php
+++ b/themes/sprites.css.php
@@ -3,7 +3,7 @@
 /**
  * This file generates the CSS code for the sprites of a theme
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  */
 
 // unplanned execution path
diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php
index c8f9ae89f4..cb1211af0a 100644
--- a/themes/svg_gradient.php
+++ b/themes/svg_gradient.php
@@ -2,7 +2,7 @@
 /**
  * Theme based generator for SVG gradient.
  *
- * @package phpMyAdmin-theme
+ * @package PhpMyAdmin-theme
  */
 header('Content-Type: image/svg+xml');
 header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
diff --git a/transformation_overview.php b/transformation_overview.php
index 35d41c0943..7e99163ba8 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 5d94c375b0..0b87b43c25 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/user_password.php b/user_password.php
index d5859b811d..c4fdaabaa8 100644
--- a/user_password.php
+++ b/user_password.php
@@ -4,7 +4,7 @@
  * displays and handles the form where the user can change his password
  * linked from main.php
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/view_create.php b/view_create.php
index 3571c82496..3e36efbf19 100644
--- a/view_create.php
+++ b/view_create.php
@@ -5,7 +5,7 @@
  *
  * @todo js error when view name is empty (strFormEmpty)
  * @todo (also validate if js is disabled, after form submission?)
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/view_operations.php b/view_operations.php
index 4a315d0493..66599ef30c 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**
diff --git a/webapp.php b/webapp.php
index 63ca1bf173..8affd5c76a 100644
--- a/webapp.php
+++ b/webapp.php
@@ -3,7 +3,7 @@
  * generate an WebApp file for Prism / WebRunner
  *
  * @see http://wiki.mozilla.org/Prism
- * @package phpMyAdmin
+ * @package PhpMyAdmin
  */
 
 /**