diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index f8e917343b..b721d3dce0 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -40,7 +40,7 @@ $plugins = array(
 
 // select available plugin
 foreach ($plugins as $plugin) {
-    $check = "PMA_import_" . $plugin . "Check";
+    $check = "PMA_Import_" . $plugin . "Check";
 
     if ($check()) {
         $upload_class = "Upload" . ucwords($plugin);
@@ -56,7 +56,7 @@ foreach ($plugins as $plugin) {
   * @return boolean true if APC extension is available and if rfc1867 is enabled,
   *                      false if it is not
   */
-function PMA_import_apcCheck()
+function PMA_Import_apcCheck()
 {
     if (! extension_loaded('apc')
         || ! function_exists('apc_fetch')
@@ -73,7 +73,7 @@ function PMA_import_apcCheck()
   * @return boolean true if UploadProgress extension is available,
   *                 false if it is not
   */
-function PMA_import_progressCheck()
+function PMA_Import_progressCheck()
 {
     if (! function_exists("uploadprogress_get_info")
         || ! function_exists('getallheaders')
@@ -89,7 +89,7 @@ function PMA_import_progressCheck()
   * @return boolean true if PHP 5.4 session upload-progress is available,
   *                 false if it is not
   */
-function PMA_import_sessionCheck()
+function PMA_Import_sessionCheck()
 {
     if (PMA_PHP_INT_VERSION < 50400
         || ! ini_get('session.upload_progress.enabled')
@@ -105,7 +105,7 @@ function PMA_import_sessionCheck()
   *
   * @return boolean true
   */
-function PMA_import_nopluginCheck()
+function PMA_Import_nopluginCheck()
 {
     return true;
 }
diff --git a/libraries/plugins/export/PMA_ExportPdf.class.php b/libraries/plugins/export/PMA_ExportPdf.class.php
index c0f620a824..c3e14a232a 100644
--- a/libraries/plugins/export/PMA_ExportPdf.class.php
+++ b/libraries/plugins/export/PMA_ExportPdf.class.php
@@ -397,7 +397,9 @@ class PMA_ExportPdf extends PMA_PDF
 
         // Pass 2
 
-        $this->results = $GLOBALS['dbi']->query($query, null, PMA_DatabaseInterface::QUERY_UNBUFFERED);
+        $this->results = $GLOBALS['dbi']->query(
+            $query, null, PMA_DatabaseInterface::QUERY_UNBUFFERED
+        );
         $this->setY($this->tMargin);
         $this->AddPage();
         $this->SetFont(PMA_PDF_FONT, '', 9);
diff --git a/libraries/plugins/import/upload/UploadApc.class.php b/libraries/plugins/import/upload/UploadApc.class.php
index 881832fda1..3ddb7a7f84 100644
--- a/libraries/plugins/import/upload/UploadApc.class.php
+++ b/libraries/plugins/import/upload/UploadApc.class.php
@@ -57,7 +57,7 @@ class UploadApc implements UploadInterface
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
-        if (! PMA_import_apcCheck() || $ret['finished']) {
+        if (! PMA_Import_apcCheck() || $ret['finished']) {
             return $ret;
         }
         $status = apc_fetch('upload_' . $id);
diff --git a/libraries/plugins/import/upload/UploadProgress.class.php b/libraries/plugins/import/upload/UploadProgress.class.php
index 1a507763d2..d7647b326a 100644
--- a/libraries/plugins/import/upload/UploadProgress.class.php
+++ b/libraries/plugins/import/upload/UploadProgress.class.php
@@ -58,7 +58,7 @@ class UploadProgress implements UploadInterface
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
-        if (! PMA_import_progressCheck() || $ret['finished']) {
+        if (! PMA_Import_progressCheck() || $ret['finished']) {
             return $ret;
         }
 
diff --git a/libraries/plugins/import/upload/UploadSession.class.php b/libraries/plugins/import/upload/UploadSession.class.php
index 36404133ee..d9bdd53105 100644
--- a/libraries/plugins/import/upload/UploadSession.class.php
+++ b/libraries/plugins/import/upload/UploadSession.class.php
@@ -58,7 +58,7 @@ class UploadSession implements UploadInterface
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
-        if (! PMA_import_sessionCheck() || $ret['finished']) {
+        if (! PMA_Import_sessionCheck() || $ret['finished']) {
             return $ret;
         }