diff --git a/export.php b/export.php
index 37efc02c62..c0e66f0fae 100644
--- a/export.php
+++ b/export.php
@@ -365,7 +365,7 @@ if (!$save_on_server) {
         @ini_set('url_rewriter.tags', '');
         $filename = PMA_sanitize_filename($filename);
 
-        PMA_download_header($filename, $mime_type);
+        PMA_downloadHeader($filename, $mime_type);
     } else {
         // HTML
         if ($export_type == 'database') {
diff --git a/import_status.php b/import_status.php
index 33af5355c1..c3d9a56f4b 100644
--- a/import_status.php
+++ b/import_status.php
@@ -97,7 +97,7 @@ foreach ($get_params as $one_get_param) {
 }
 
 // AJAX requests can't be cached!
-PMA_no_cache_header();
+PMA_noCacheHeader();
 
 // $GLOBALS["message"] is used for asking for an import message
 if (isset($GLOBALS["message"]) && $GLOBALS["message"]) {
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 846e503649..cad6eff80b 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -560,7 +560,7 @@ class PMA_Config
         unset($cfg['Servers']);
 
         $this->default = $cfg;
-        $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $cfg);
 
         $this->error_config_default_file = false;
 
@@ -630,7 +630,7 @@ class PMA_Config
             );
         }
 
-        $this->settings = PMA_array_merge_recursive($this->settings, $cfg);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $cfg);
         $this->checkPmaAbsoluteUri();
         $this->checkFontsize();
 
@@ -716,8 +716,8 @@ class PMA_Config
         // backup some settings
         $org_fontsize = $this->settings['fontsize'];
         // load config array
-        $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
-        $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
+        $this->settings = PMA_arrayMergeRecursive($this->settings, $config_data);
+        $GLOBALS['cfg'] = PMA_arrayMergeRecursive($GLOBALS['cfg'], $config_data);
         if (defined('PMA_MINIMUM_COMMON')) {
             return;
         }
@@ -829,19 +829,19 @@ class PMA_Config
         if ($prefs_type) {
             include_once './libraries/user_preferences.lib.php';
             if ($default_value === null) {
-                $default_value = PMA_array_read($cfg_path, $this->default);
+                $default_value = PMA_arrayRead($cfg_path, $this->default);
             }
             PMA_persist_option($cfg_path, $new_cfg_value, $default_value);
         }
         if ($prefs_type != 'db' && $cookie_name) {
             // fall back to cookies
             if ($default_value === null) {
-                $default_value = PMA_array_read($cfg_path, $this->settings);
+                $default_value = PMA_arrayRead($cfg_path, $this->settings);
             }
             $this->setCookie($cookie_name, $new_cfg_value, $default_value);
         }
-        PMA_array_write($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
-        PMA_array_write($cfg_path, $this->settings, $new_cfg_value);
+        PMA_arrayWrite($cfg_path, $GLOBALS['cfg'], $new_cfg_value);
+        PMA_arrayWrite($cfg_path, $this->settings, $new_cfg_value);
     }
 
     /**
@@ -1268,10 +1268,10 @@ class PMA_Config
         if ($postsize = ini_get('post_max_size')) {
             $this->set(
                 'max_upload_size',
-                min(PMA_get_real_size($filesize), PMA_get_real_size($postsize))
+                min(PMA_getRealSize($filesize), PMA_getRealSize($postsize))
             );
         } else {
-            $this->set('max_upload_size', PMA_get_real_size($filesize));
+            $this->set('max_upload_size', PMA_getRealSize($filesize));
         }
     }
 
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index 7893c20b73..99ea2035a9 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -96,7 +96,7 @@ class PMA_PDF extends TCPDF
     function Download($filename)
     {
         $pdfData = $this->getPDFData();
-        PMA_download_header($filename, 'application/pdf', strlen($pdfData));
+        PMA_downloadHeader($filename, 'application/pdf', strlen($pdfData));
         echo $pdfData;
     }
 }
diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index ea19fbd5b0..82ba052df8 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -91,7 +91,7 @@ class ConfigFile
         // apply default values overrides
         if (count($cfg_db['_overrides'])) {
             foreach ($cfg_db['_overrides'] as $path => $value) {
-                PMA_array_write($path, $cfg, $value);
+                PMA_arrayWrite($path, $cfg, $value);
             }
         }
 
@@ -231,7 +231,7 @@ class ConfigFile
             // we need original config values not overwritten by user
             // preferences to allow for overwriting options set in
             // config.inc.php with default values
-            $instance_default_value = PMA_array_read(
+            $instance_default_value = PMA_arrayRead(
                 $canonical_path,
                 $this->_orgCfgObject->settings
             );
@@ -240,11 +240,11 @@ class ConfigFile
                 || (empty($value) && empty($default_value) && (defined('PMA_SETUP')
                 || empty($current_global)))
             ) {
-                PMA_array_remove($path, $_SESSION[$this->_id]);
+                PMA_arrayRemove($path, $_SESSION[$this->_id]);
                 return;
             }
         }
-        PMA_array_write($path, $_SESSION[$this->_id], $value);
+        PMA_arrayWrite($path, $_SESSION[$this->_id], $value);
     }
 
     /**
@@ -320,7 +320,7 @@ class ConfigFile
      */
     public function get($path, $default = null)
     {
-        return PMA_array_read($path, $_SESSION[$this->_id], $default);
+        return PMA_arrayRead($path, $_SESSION[$this->_id], $default);
     }
 
     /**
@@ -335,7 +335,7 @@ class ConfigFile
      */
     public function getDefault($canonical_path, $default = null)
     {
-        return PMA_array_read($canonical_path, $this->_cfg, $default);
+        return PMA_arrayRead($canonical_path, $this->_cfg, $default);
     }
 
     /**
@@ -349,7 +349,7 @@ class ConfigFile
      */
     public function getValue($path, $default = null)
     {
-        $v = PMA_array_read($path, $_SESSION[$this->_id], null);
+        $v = PMA_arrayRead($path, $_SESSION[$this->_id], null);
         if ($v !== null) {
             return $v;
         }
@@ -379,7 +379,7 @@ class ConfigFile
      */
     public function getDbEntry($path, $default = null)
     {
-        return PMA_array_read($path, $this->_cfgDb, $default);
+        return PMA_arrayRead($path, $this->_cfgDb, $default);
     }
 
     /**
@@ -511,8 +511,8 @@ class ConfigFile
     {
         $c = $_SESSION[$this->_id];
         foreach ($this->_cfgUpdateReadMapping as $map_to => $map_from) {
-            PMA_array_write($map_to, $c, PMA_array_read($map_from, $c));
-            PMA_array_remove($map_from, $c);
+            PMA_arrayWrite($map_to, $c, PMA_arrayRead($map_from, $c));
+            PMA_arrayRemove($map_from, $c);
         }
         return $c;
     }
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index b9a9a52f85..73878c0dfe 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -42,7 +42,7 @@ function PMA_config_get_validators()
                     }
                     for ($i = 1; $i < count($uv); $i++) {
                         if (substr($uv[$i], 0, 6) == 'value:') {
-                            $uv[$i] = PMA_array_read(
+                            $uv[$i] = PMA_arrayRead(
                                 substr($uv[$i], 6), $org_cfg->settings
                             );
                         }
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 44cfc309e4..ffcde8c867 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -324,7 +324,7 @@ function PMA_getTableCount($db)
  *
  * @return integer $size
  */
-function PMA_get_real_size($size = 0)
+function PMA_getRealSize($size = 0)
 {
     if (! $size) {
         return 0;
@@ -347,13 +347,13 @@ function PMA_get_real_size($size = 0)
     }
 
     return $size;
-} // end function PMA_get_real_size()
+} // end function PMA_getRealSize()
 
 /**
  * merges array recursive like array_merge_recursive() but keyed-values are
  * always overwritten.
  *
- * array PMA_array_merge_recursive(array $array1[, array $array2[, array ...]])
+ * array PMA_arrayMergeRecursive(array $array1[, array $array2[, array ...]])
  *
  * @param array   array to merge
  * @param array   array to merge
@@ -364,7 +364,7 @@ function PMA_get_real_size($size = 0)
  * @see     http://php.net/array_merge
  * @see     http://php.net/array_merge_recursive
  */
-function PMA_array_merge_recursive()
+function PMA_arrayMergeRecursive()
 {
     switch(func_num_args()) {
     case 0 :
@@ -381,7 +381,7 @@ function PMA_array_merge_recursive()
         }
         foreach ($args[1] as $key2 => $value2) {
             if (isset($args[0][$key2]) && !is_int($key2)) {
-                $args[0][$key2] = PMA_array_merge_recursive(
+                $args[0][$key2] = PMA_arrayMergeRecursive(
                     $args[0][$key2], $value2
                 );
             } else {
@@ -401,9 +401,9 @@ function PMA_array_merge_recursive()
         break;
     default :
         $args = func_get_args();
-        $args[1] = PMA_array_merge_recursive($args[0], $args[1]);
+        $args[1] = PMA_arrayMergeRecursive($args[0], $args[1]);
         array_shift($args);
-        return call_user_func_array('PMA_array_merge_recursive', $args);
+        return call_user_func_array('PMA_arrayMergeRecursive', $args);
         break;
     }
 }
@@ -572,7 +572,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
  *
  * @return void
  */
-function PMA_no_cache_header()
+function PMA_noCacheHeader()
 {
     // rfc2616 - Section 14.21
     header('Expires: ' . date(DATE_RFC1123));
@@ -612,10 +612,10 @@ function PMA_no_cache_header()
  *
  * @return void
  */
-function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true)
+function PMA_downloadHeader($filename, $mimetype, $length = 0, $no_cache = true)
 {
     if ($no_cache) {
-        PMA_no_cache_header();
+        PMA_noCacheHeader();
     }
     /* Replace all possibly dangerous chars in filename */
     $filename = str_replace(array(';', '"', "\n", "\r"), '-', $filename);
@@ -642,7 +642,7 @@ function PMA_download_header($filename, $mimetype, $length = 0, $no_cache = true
  *
  * @return mixed    array element or $default
  */
-function PMA_array_read($path, $array, $default = null)
+function PMA_arrayRead($path, $array, $default = null)
 {
     $keys = explode('/', $path);
     $value =& $array;
@@ -664,7 +664,7 @@ function PMA_array_read($path, $array, $default = null)
  *
  * @return void
  */
-function PMA_array_write($path, &$array, $value)
+function PMA_arrayWrite($path, &$array, $value)
 {
     $keys = explode('/', $path);
     $last_key = array_pop($keys);
@@ -686,7 +686,7 @@ function PMA_array_write($path, &$array, $value)
  *
  * @return void
  */
-function PMA_array_remove($path, &$array)
+function PMA_arrayRemove($path, &$array)
 {
     $keys = explode('/', $path);
     $keys_last = array_pop($keys);
diff --git a/libraries/gis/pma_gis_visualization.php b/libraries/gis/pma_gis_visualization.php
index 7efad9e6ee..f24efe9129 100644
--- a/libraries/gis/pma_gis_visualization.php
+++ b/libraries/gis/pma_gis_visualization.php
@@ -155,7 +155,7 @@ class PMA_GIS_Visualization
 
         ob_clean();
 
-        PMA_download_header($file_name, $type);
+        PMA_downloadHeader($file_name, $type);
     }
 
     /**
diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
index 0f265d43c8..a375d398c8 100644
--- a/libraries/header_http.inc.php
+++ b/libraries/header_http.inc.php
@@ -25,7 +25,7 @@ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
     header("X-Content-Security-Policy: allow 'self'; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:; script-src 'self' http://www.phpmyadmin.net");
     header("X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script");
 }
-PMA_no_cache_header();
+PMA_noCacheHeader();
 if (!defined('IS_TRANSFORMATION_WRAPPER')) {
     // Define the charset to be used
     header('Content-Type: text/html; charset=utf-8');
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index 5e5d9c6694..4ba8c68fbb 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -176,7 +176,7 @@ class PMA_DIA extends XMLWriter
             ob_end_clean();
         }
         $output = $this->flush();
-        PMA_download_header(
+        PMA_downloadHeader(
             $fileName . '.dia', 'application/x-dia-diagram', strlen($output)
         );
         print $output;
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index a8760328ff..25c52286d7 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -357,7 +357,7 @@ class PMA_EPS
             //ob_end_clean();
         //}
         $output = $this->stringCommands;
-        PMA_download_header($fileName . '.eps', 'image/x-eps', strlen($output));
+        PMA_downloadHeader($fileName . '.eps', 'image/x-eps', strlen($output));
         print $output;
     }
 }
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index 533eaf50bd..39d2e1b296 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -182,7 +182,7 @@ class PMA_SVG extends XMLWriter
     {
         //ob_get_clean();
         $output = $this->flush();
-        PMA_download_header($fileName . '.svg', 'image/svg+xml', strlen($output));
+        PMA_downloadHeader($fileName . '.svg', 'image/svg+xml', strlen($output));
         print $output;
     }
 
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index e4f1a0246e..4905da370d 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -162,7 +162,7 @@ class PMA_VISIO extends XMLWriter
             //ob_end_clean();
         //}
         $output = $this->flush();
-        PMA_download_header($fileName . '.vdx', 'application/visio', strlen($output));
+        PMA_downloadHeader($fileName . '.vdx', 'application/visio', strlen($output));
         print $output;
     }
 }
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 8ab0a160c1..083e7016cd 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -159,7 +159,7 @@ function PMA_apply_userprefs(array $config_data)
         if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
             continue;
         }
-        PMA_array_write($path, $cfg, $value);
+        PMA_arrayWrite($path, $cfg, $value);
     }
     return $cfg;
 }
diff --git a/prefs_manage.php b/prefs_manage.php
index 33e6080395..cdbeeeed07 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -24,7 +24,7 @@ $error = '';
 if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') == 'text_file') {
     // export to JSON file
     $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.json';
-    PMA_download_header($filename, 'application/json');
+    PMA_downloadHeader($filename, 'application/json');
     $settings = PMA_load_userprefs();
     echo json_encode($settings['config_data']);
     return;
diff --git a/setup/config.php b/setup/config.php
index 34904af14c..e923211132 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -38,7 +38,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     //
     // Output generated config file
     //
-    PMA_download_header('config.inc.php', 'text/plain');
+    PMA_downloadHeader('config.inc.php', 'text/plain');
     echo ConfigGenerator::getConfigFile();
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_save'], '')) {
diff --git a/tbl_get_field.php b/tbl_get_field.php
index c6d982b89b..236f137e77 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -39,7 +39,7 @@ if ($result === false) {
 /* Avoid corrupting data */
 @ini_set('url_rewriter.tags', '');
 
-PMA_download_header(
+PMA_downloadHeader(
     $table . '-' .  $transform_key . '.bin',
     PMA_detectMIME($result),
     strlen($result)
diff --git a/tbl_tracking.php b/tbl_tracking.php
index b8b92f48c4..eb9d760bd8 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -135,7 +135,7 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldumpfil
         $dump .= $entry['statement'];
     }
     $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql';
-    PMA_download_header($filename, 'text/x-sql', strlen($dump));
+    PMA_downloadHeader($filename, 'text/x-sql', strlen($dump));
 
     echo $dump;
     exit();
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 93fcfd7130..c3673203ac 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -354,7 +354,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
 
         $this->assertEquals($loadedConf, $this->object->default);
 
-        $expectedSettings = PMA_array_merge_recursive(
+        $expectedSettings = PMA_arrayMergeRecursive(
             $this->object->settings,
             $loadedConf
         );
diff --git a/test/libraries/core/PMA_array_test.php b/test/libraries/core/PMA_array_test.php
index 181022a62d..fab08453ba 100644
--- a/test/libraries/core/PMA_array_test.php
+++ b/test/libraries/core/PMA_array_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_array_read(), PMA_array_write(), PMA_array_remove(), PMA_array_merge_recursive(),
+ * Test for PMA_arrayRead(), PMA_arrayWrite(), PMA_arrayRemove(), PMA_arrayMergeRecursive(),
  * PMA_arrayWalkRecursive() from libraries/core.lib.php
  *
  * @package PhpMyAdmin-test
@@ -14,7 +14,7 @@ require_once 'libraries/core.lib.php';
 
 class PMA_array_test extends PHPUnit_Framework_TestCase
 {
-    function testPMA_array_read()
+    function testPMA_arrayRead()
     {
         $arr = array(
             "int" => 1,
@@ -23,36 +23,36 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
             "sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
         );
 
-        $this->assertEquals(PMA_array_read('int', $arr), $arr['int']);
+        $this->assertEquals(PMA_arrayRead('int', $arr), $arr['int']);
 
-        $this->assertEquals(PMA_array_read('str', $arr), $arr['str']);
+        $this->assertEquals(PMA_arrayRead('str', $arr), $arr['str']);
 
-        $this->assertEquals(PMA_array_read('arr/0', $arr), $arr['arr'][0]);
+        $this->assertEquals(PMA_arrayRead('arr/0', $arr), $arr['arr'][0]);
 
-        $this->assertEquals(PMA_array_read('arr/1', $arr), $arr['arr'][1]);
+        $this->assertEquals(PMA_arrayRead('arr/1', $arr), $arr['arr'][1]);
 
-        $this->assertEquals(PMA_array_read('arr/2', $arr), $arr['arr'][2]);
+        $this->assertEquals(PMA_arrayRead('arr/2', $arr), $arr['arr'][2]);
 
-        $this->assertEquals(PMA_array_read('sarr/arr1/0', $arr), $arr['sarr']['arr1'][0]);
+        $this->assertEquals(PMA_arrayRead('sarr/arr1/0', $arr), $arr['sarr']['arr1'][0]);
 
-        $this->assertEquals(PMA_array_read('sarr/arr1/1', $arr), $arr['sarr']['arr1'][1]);
+        $this->assertEquals(PMA_arrayRead('sarr/arr1/1', $arr), $arr['sarr']['arr1'][1]);
 
-        $this->assertEquals(PMA_array_read('sarr/arr1/2', $arr), $arr['sarr']['arr1'][2]);
+        $this->assertEquals(PMA_arrayRead('sarr/arr1/2', $arr), $arr['sarr']['arr1'][2]);
 
-        $this->assertEquals(PMA_array_read('sarr/0/0', $arr), $arr['sarr'][0][0]);
+        $this->assertEquals(PMA_arrayRead('sarr/0/0', $arr), $arr['sarr'][0][0]);
 
-        $this->assertEquals(PMA_array_read('sarr/0/1', $arr), $arr['sarr'][0][1]);
+        $this->assertEquals(PMA_arrayRead('sarr/0/1', $arr), $arr['sarr'][0][1]);
 
-        $this->assertEquals(PMA_array_read('sarr/0/1/2', $arr), $arr['sarr'][0][1][2]);
+        $this->assertEquals(PMA_arrayRead('sarr/0/1/2', $arr), $arr['sarr'][0][1][2]);
 
-        $this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr), null);
+        $this->assertEquals(PMA_arrayRead('sarr/not_exiting/1', $arr), null);
 
-        $this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr, 0), 0);
+        $this->assertEquals(PMA_arrayRead('sarr/not_exiting/1', $arr, 0), 0);
 
-        $this->assertEquals(PMA_array_read('sarr/not_exiting/1', $arr, 'defailt_val'), 'defailt_val');
+        $this->assertEquals(PMA_arrayRead('sarr/not_exiting/1', $arr, 'defailt_val'), 'defailt_val');
     }
 
-    function testPMA_array_write()
+    function testPMA_arrayWrite()
     {
         $arr = array(
             "int" => 1,
@@ -61,44 +61,44 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
             "sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
         );
 
-        PMA_array_write('int', $arr, 5);
+        PMA_arrayWrite('int', $arr, 5);
         $this->assertEquals($arr['int'], 5);
 
-        PMA_array_write('str', $arr, '_str');
+        PMA_arrayWrite('str', $arr, '_str');
         $this->assertEquals($arr['str'], '_str');
 
-        PMA_array_write('arr/0', $arr, 'val_arr_0');
+        PMA_arrayWrite('arr/0', $arr, 'val_arr_0');
         $this->assertEquals($arr['arr'][0], 'val_arr_0');
 
-        PMA_array_write('arr/1', $arr, 'val_arr_1');
+        PMA_arrayWrite('arr/1', $arr, 'val_arr_1');
         $this->assertEquals($arr['arr'][1], 'val_arr_1');
 
-        PMA_array_write('arr/2', $arr, 'val_arr_2');
+        PMA_arrayWrite('arr/2', $arr, 'val_arr_2');
         $this->assertEquals($arr['arr'][2], 'val_arr_2');
 
-        PMA_array_write('sarr/arr1/0', $arr, 'val_sarr_arr_0');
+        PMA_arrayWrite('sarr/arr1/0', $arr, 'val_sarr_arr_0');
         $this->assertEquals($arr['sarr']['arr1'][0], 'val_sarr_arr_0');
 
-        PMA_array_write('sarr/arr1/1', $arr, 'val_sarr_arr_1');
+        PMA_arrayWrite('sarr/arr1/1', $arr, 'val_sarr_arr_1');
         $this->assertEquals($arr['sarr']['arr1'][1], 'val_sarr_arr_1');
 
-        PMA_array_write('sarr/arr1/2', $arr, 'val_sarr_arr_2');
+        PMA_arrayWrite('sarr/arr1/2', $arr, 'val_sarr_arr_2');
         $this->assertEquals($arr['sarr']['arr1'][2], 'val_sarr_arr_2');
 
-        PMA_array_write('sarr/0/0', $arr, 5);
+        PMA_arrayWrite('sarr/0/0', $arr, 5);
         $this->assertEquals($arr['sarr'][0][0], 5);
 
-        PMA_array_write('sarr/0/1/0', $arr, 'e');
+        PMA_arrayWrite('sarr/0/1/0', $arr, 'e');
         $this->assertEquals($arr['sarr'][0][1][0], 'e');
 
-        PMA_array_write('sarr/not_existing/1', $arr, 'some_val');
+        PMA_arrayWrite('sarr/not_existing/1', $arr, 'some_val');
         $this->assertEquals($arr['sarr']['not_existing'][1], 'some_val');
 
-        PMA_array_write('sarr/0/2', $arr, null);
+        PMA_arrayWrite('sarr/0/2', $arr, null);
         $this->assertNull($arr['sarr'][0][2]);
     }
 
-    function testPMA_array_remove()
+    function testPMA_arrayRemove()
     {
         $arr = array(
             "int" => 1,
@@ -107,73 +107,73 @@ class PMA_array_test extends PHPUnit_Framework_TestCase
             "sarr" => array('arr1' => array(1, 2, 3), array(3, array('a', 'b', 'c'), 4))
         );
 
-        PMA_array_remove('int', $arr);
+        PMA_arrayRemove('int', $arr);
         $this->assertArrayNotHasKey('int', $arr);
 
-        PMA_array_remove('str', $arr);
+        PMA_arrayRemove('str', $arr);
         $this->assertArrayNotHasKey('str', $arr);
 
-        PMA_array_remove('arr/0', $arr);
+        PMA_arrayRemove('arr/0', $arr);
         $this->assertArrayNotHasKey(0, $arr['arr']);
 
-        PMA_array_remove('arr/1', $arr);
+        PMA_arrayRemove('arr/1', $arr);
         $this->assertArrayNotHasKey(1, $arr['arr']);
 
-        PMA_array_remove('arr/2', $arr);
+        PMA_arrayRemove('arr/2', $arr);
         $this->assertArrayNotHasKey('arr', $arr);
 
         $tmp_arr = $arr;
-        PMA_array_remove('sarr/not_existing/1', $arr);
+        PMA_arrayRemove('sarr/not_existing/1', $arr);
         $this->assertEquals($tmp_arr, $arr);
 
-        PMA_array_remove('sarr/arr1/0', $arr);
+        PMA_arrayRemove('sarr/arr1/0', $arr);
         $this->assertArrayNotHasKey(0, $arr['sarr']['arr1']);
 
-        PMA_array_remove('sarr/arr1/1', $arr);
+        PMA_arrayRemove('sarr/arr1/1', $arr);
         $this->assertArrayNotHasKey(1, $arr['sarr']['arr1']);
 
-        PMA_array_remove('sarr/arr1/2', $arr);
+        PMA_arrayRemove('sarr/arr1/2', $arr);
         $this->assertArrayNotHasKey('arr1', $arr['sarr']);
 
-        PMA_array_remove('sarr/0/0', $arr);
+        PMA_arrayRemove('sarr/0/0', $arr);
         $this->assertArrayNotHasKey(0, $arr['sarr'][0]);
 
-        PMA_array_remove('sarr/0/1/0', $arr);
+        PMA_arrayRemove('sarr/0/1/0', $arr);
         $this->assertArrayNotHasKey(0, $arr['sarr'][0][1]);
 
-        PMA_array_remove('sarr/0/1/1', $arr);
+        PMA_arrayRemove('sarr/0/1/1', $arr);
         $this->assertArrayNotHasKey(1, $arr['sarr'][0][1]);
 
-        PMA_array_remove('sarr/0/1/2', $arr);
+        PMA_arrayRemove('sarr/0/1/2', $arr);
         $this->assertArrayNotHasKey(1, $arr['sarr'][0]);
 
-        PMA_array_remove('sarr/0/2', $arr);
+        PMA_arrayRemove('sarr/0/2', $arr);
 
         $this->assertEmpty($arr);
     }
 
-    function testPMA_array_merge_recursive()
+    function testPMA_arrayMergeRecursive()
     {
         $arr1 = array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3');
         $arr2 = array('key1' => 4, 'key2' => 5, 'key3' => 6);
         $arr3 = array('key4' => 7, 'key5' => 'str8', 'key6' => 9);
         $arr4 = array(1, 2, 3);
 
-        $this->assertFalse(PMA_array_merge_recursive());
+        $this->assertFalse(PMA_arrayMergeRecursive());
 
-        $this->assertEquals(PMA_array_merge_recursive($arr1), $arr1);
+        $this->assertEquals(PMA_arrayMergeRecursive($arr1), $arr1);
 
-        $this->assertEquals(PMA_array_merge_recursive($arr1, 'str'), 'str');
+        $this->assertEquals(PMA_arrayMergeRecursive($arr1, 'str'), 'str');
 
-        $this->assertEquals(PMA_array_merge_recursive('str1', $arr2), $arr2);
+        $this->assertEquals(PMA_arrayMergeRecursive('str1', $arr2), $arr2);
 
-        $this->assertEquals(PMA_array_merge_recursive($arr1, $arr2), array('key1' => 4, 'key2' => 5, 'key3' => 6));
+        $this->assertEquals(PMA_arrayMergeRecursive($arr1, $arr2), array('key1' => 4, 'key2' => 5, 'key3' => 6));
 
-        $this->assertEquals(PMA_array_merge_recursive($arr1, $arr3), array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3', 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
+        $this->assertEquals(PMA_arrayMergeRecursive($arr1, $arr3), array('key1' => 1, 'key2' => 2.3, 'key3' => 'str3', 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
 
-        $this->assertEquals(PMA_array_merge_recursive($arr2, $arr4), array(1, 2, 3));
+        $this->assertEquals(PMA_arrayMergeRecursive($arr2, $arr4), array(1, 2, 3));
 
-        $this->assertEquals(PMA_array_merge_recursive($arr1, $arr2, $arr3), array('key1' => 4, 'key2' => 5, 'key3' => 6, 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
+        $this->assertEquals(PMA_arrayMergeRecursive($arr1, $arr2, $arr3), array('key1' => 4, 'key2' => 5, 'key3' => 6, 'key4' => 7, 'key5' => 'str8', 'key6' => 9));
     }
 
 
diff --git a/test/libraries/core/PMA_get_real_size_test.php b/test/libraries/core/PMA_get_real_size_test.php
index b6096d7e8d..3eadbb0e39 100644
--- a/test/libraries/core/PMA_get_real_size_test.php
+++ b/test/libraries/core/PMA_get_real_size_test.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Test for PMA_get_real_size()  from libraries/core.lib.php
+ * Test for PMA_getRealSize()  from libraries/core.lib.php
  *
  * @package PhpMyAdmin-test
  */
@@ -11,36 +11,36 @@
  */
 require_once 'libraries/core.lib.php';
 
-class PMA_get_real_size_test extends PHPUnit_Framework_TestCase
+class PMA_getRealSize_test extends PHPUnit_Framework_TestCase
 {
     public function testNull()
     {
-        $this->assertEquals(0, PMA_get_real_size('0'));
+        $this->assertEquals(0, PMA_getRealSize('0'));
     }
 
     public function testKilobyte()
     {
-        $this->assertEquals(1024, PMA_get_real_size('1kb'));
+        $this->assertEquals(1024, PMA_getRealSize('1kb'));
     }
 
     public function testKilobyte2()
     {
-        $this->assertEquals(1024 * 1024, PMA_get_real_size('1024k'));
+        $this->assertEquals(1024 * 1024, PMA_getRealSize('1024k'));
     }
 
     public function testMegabyte()
     {
-        $this->assertEquals(8 * 1024 * 1024, PMA_get_real_size('8m'));
+        $this->assertEquals(8 * 1024 * 1024, PMA_getRealSize('8m'));
     }
 
     public function testGigabyte()
     {
-        $this->assertEquals(12 * 1024 * 1024 * 1024, PMA_get_real_size('12gb'));
+        $this->assertEquals(12 * 1024 * 1024 * 1024, PMA_getRealSize('12gb'));
     }
 
     public function testUnspecified()
     {
-        $this->assertEquals(1024, PMA_get_real_size('1024'));
+        $this->assertEquals(1024, PMA_getRealSize('1024'));
     }
 }
 ?>
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 1d873ace6f..722ef2b2d6 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -99,7 +99,7 @@ if (isset($ct) && !empty($ct)) {
     . (isset($mime_options['charset']) ? $mime_options['charset'] : '');
 }
 
-PMA_download_header($cn, $mime_type);
+PMA_downloadHeader($cn, $mime_type);
 
 if (! isset($resize)) {
     echo $row[$transform_key];
diff --git a/webapp.php b/webapp.php
index 0f7c19028b..89bdc58bbb 100644
--- a/webapp.php
+++ b/webapp.php
@@ -45,7 +45,7 @@ foreach ($parameters as $key => $value) {
     $ini_file .= $key . '=' . $value . "\n";
 }
 
-PMA_download_header($name, 'application/webapp', 0, false);
+PMA_downloadHeader($name, 'application/webapp', 0, false);
 
 $zip = new zipfile;
 $zip->setDoWrite();