diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index e742e112a2..d47092a5d0 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -130,7 +130,7 @@ default:
 echo '<h2>' . __('Overview') . '</h2>';
 
 // message handling
-messages_end();
+PMA_messagesEnd();
 messages_show_html();
 
 echo '<a href="#" id="show_hidden_messages" style="display:none">';
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 19e5a225db..c182b07402 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -55,7 +55,7 @@ function PMA_messagesSet($type, $id, $title, $message)
  *
  * @return void
  */
-function messages_end()
+function PMA_messagesEnd()
 {
     foreach ($_SESSION['messages'] as &$messages) {
         $remove_ids = array();
@@ -71,7 +71,7 @@ function messages_end()
 }
 
 /**
- * Prints message list, must be called after messages_end()
+ * Prints message list, must be called after PMA_messagesEnd()
  *
  * @return void
  */
@@ -202,7 +202,7 @@ function check_config_rw(&$is_readable, &$is_writable, &$file_exists)
  * Performs various compatibility, security and consistency checks on current config
  *
  * Outputs results to message list, must be called between PMA_messagesBegin()
- * and messages_end()
+ * and PMA_messagesEnd()
  *
  * @return void
  */
diff --git a/test/libraries/PMA_Index_test.php b/test/libraries/PMA_Index_test.php
index f5a1f26b9b..38b998a6c4 100644
--- a/test/libraries/PMA_Index_test.php
+++ b/test/libraries/PMA_Index_test.php
@@ -26,7 +26,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_messagesBegin()
+    public function testPMAmessagesBegin()
     {
         $_SESSION['messages'] = array(
             array(
@@ -73,7 +73,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_messagesSet()
+    public function testPMAmessagesSet()
     {
         PMA_messagesSet('type', '123', 'testTitle', 'msg');
 
@@ -89,11 +89,11 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for messages_end
+     * Test for PMA_messagesEnd
      *
      * @return void
      */
-    public function testMessagesEnd()
+    public function testPMAmessagesEnd()
     {
         $_SESSION['messages'] = array(
             array(
@@ -102,7 +102,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
             )
         );
 
-        messages_end();
+        PMA_messagesEnd();
 
         $this->assertEquals(
             array(