diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index 40555463d4..a0e7d96212 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -20,7 +20,7 @@ require_once './setup/lib/ConfigGenerator.class.php';
 $config_readable = false;
 $config_writable = false;
 $config_exists = false;
-check_config_rw($config_readable, $config_writable, $config_exists);
+PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
 echo '<h2>' . __('Configuration file') . '</h2>';
 
 PMA_displayFormTop('config.php');
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index e7772dbbe0..2cdac5ae99 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -45,7 +45,7 @@ perform_config_checks();
 $config_readable = false;
 $config_writable = false;
 $config_exists = false;
-check_config_rw($config_readable, $config_writable, $config_exists);
+PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
 if (!$config_writable || !$config_readable) {
     PMA_messagesSet(
         'error', 'config_rw', __('Cannot load or save configuration'),
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index f3c95c6437..af1813b3ac 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -182,7 +182,7 @@ function PMA_versionCheck()
  *
  * @return void
  */
-function check_config_rw(&$is_readable, &$is_writable, &$file_exists)
+function PMA_checkConfigRw(&$is_readable, &$is_writable, &$file_exists)
 {
     $file_path = ConfigFile::getInstance()->getFilePath();
     $file_dir = dirname($file_path);
diff --git a/test/libraries/PMA_Index_test.php b/test/libraries/PMA_Index_test.php
index bdf7634fe2..225ac80ecc 100644
--- a/test/libraries/PMA_Index_test.php
+++ b/test/libraries/PMA_Index_test.php
@@ -306,11 +306,11 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for check_config_rw
+     * Test for PMA_checkConfigRw
      *
      * @return void
      */
-    public function testCheckConfigRW()
+    public function testPMACheckConfigRw()
     {
         if (! PMA_HAS_RUNKIT) {
             $this->markTestSkipped('Cannot redefine constant');
@@ -331,7 +331,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
         $is_writable = false;
         $file_exists = false;
 
-        check_config_rw($is_readable, $is_writable, $file_exists);
+        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
 
         $this->assertTrue(
             $is_readable
@@ -350,7 +350,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
             'test/test_data/test.file'
         );
 
-        check_config_rw($is_readable, $is_writable, $file_exists);
+        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
 
         $this->assertTrue(
             $is_readable