diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index fc88641ab873..1b5a5d0ae1ef 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -19,7 +19,6 @@
  */
 function PMA_getPlugin($plugin_type, $plugin_format, $plugins_dir, $plugin_param = false)
 {
-    // todo replace strtoupper with CamelCaps (ex: HtmlWord)
     $class_name = strtoupper($plugin_type[0])
         . strtolower(substr($plugin_type, 1))
         . strtoupper($plugin_format[0])
diff --git a/libraries/plugins/import/ImportSQL.class.php b/libraries/plugins/import/ImportSql.class.php
similarity index 99%
rename from libraries/plugins/import/ImportSQL.class.php
rename to libraries/plugins/import/ImportSql.class.php
index eb1b510af72a..fcf90cfefcd1 100644
--- a/libraries/plugins/import/ImportSQL.class.php
+++ b/libraries/plugins/import/ImportSql.class.php
@@ -18,7 +18,7 @@
  *
  * @package PhpMyAdmin-Import
  */
-class ImportSQL extends ImportPlugin
+class ImportSql extends ImportPlugin
 {
     /**
      * Constructor
diff --git a/libraries/plugins/import/ImportXML.class.php b/libraries/plugins/import/ImportXml.class.php
similarity index 99%
rename from libraries/plugins/import/ImportXML.class.php
rename to libraries/plugins/import/ImportXml.class.php
index 677ef8ef1d8e..2fc34ccaf020 100644
--- a/libraries/plugins/import/ImportXML.class.php
+++ b/libraries/plugins/import/ImportXml.class.php
@@ -28,7 +28,7 @@
  * @todo add descriptions
  * @package PhpMyAdmin-Import
  */
-class ImportXML extends ImportPlugin
+class ImportXml extends ImportPlugin
 {
     /**
      * Database name