diff --git a/import.php b/import.php
index 03a5a422bd..3a01d0f9ac 100644
--- a/import.php
+++ b/import.php
@@ -582,12 +582,12 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
         $message->addParam($executed_queries);
 
         if ($import_notice) {
-            $message->addMessageHtml($import_notice);
+            $message->addHtml($import_notice);
         }
         if (! empty($local_import_file)) {
-            $message->addMessageString('(' . $local_import_file . ')');
+            $message->addText('(' . $local_import_file . ')');
         } else {
-            $message->addMessageString('(' . $_FILES['import_file']['name'] . ')');
+            $message->addText('(' . $_FILES['import_file']['name'] . ')');
         }
     }
 }
@@ -610,7 +610,7 @@ if ($timeout_passed) {
     $message->addParamHtml('</a>');
 
     if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
-        $message->addMessageString(
+        $message->addText(
             __(
                 'However on last run no data has been parsed,'
                 . ' this usually means phpMyAdmin won\'t be able to'
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index 7441f14e37..ac4394ab25 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -4723,7 +4723,7 @@ class DisplayResults
             $message->addParam($last_shown_rec);
         }
 
-        $message->addMessageString('(');
+        $message->addText('(');
 
         if ($message_view_warning === false) {
 
@@ -4739,11 +4739,11 @@ class DisplayResults
             }
 
             if (!empty($after_count)) {
-                $message_total->addMessageHtml($after_count);
+                $message_total->addHtml($after_count);
             }
             $message->addMessage($message_total, '');
 
-            $message->addMessageString(', ', '');
+            $message->addText(', ', '');
         }
 
         $message_qt = Message::notice(__('Query took %01.4f seconds.') . ')');
@@ -4751,7 +4751,7 @@ class DisplayResults
 
         $message->addMessage($message_qt, '');
         if (! is_null($sorted_column_message)) {
-            $message->addMessageHtml($sorted_column_message, '');
+            $message->addHtml($sorted_column_message, '');
         }
 
         return $message;
diff --git a/libraries/Message.php b/libraries/Message.php
index fdabfb2e66..1c7630dc1e 100644
--- a/libraries/Message.php
+++ b/libraries/Message.php
@@ -482,7 +482,7 @@ class Message
     public function addMessagesString($messages, $separator = ' ')
     {
         foreach ($messages as $message) {
-            $this->addMessageString($message, $separator);
+            $this->addText($message, $separator);
         }
     }
 
@@ -526,7 +526,7 @@ class Message
      *
      * @return void
      */
-    public function addMessageString($message, $separator = ' ')
+    public function addText($message, $separator = ' ')
     {
         if (!is_string($message)) {
             trigger_error('Invalid parameter passed to addMessage');
@@ -542,7 +542,7 @@ class Message
      *
      * @return void
      */
-    public function addMessageHtml($message, $separator = ' ')
+    public function addHtml($message, $separator = ' ')
     {
         if (!is_string($message)) {
             trigger_error('Invalid parameter passed to addMessage');
diff --git a/libraries/Util.php b/libraries/Util.php
index f0ec552913..f6b5cf21e2 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -1115,7 +1115,7 @@ class Util
 
         if ($message instanceof Message) {
             if (isset($GLOBALS['special_message'])) {
-                $message->addMessageString($GLOBALS['special_message']);
+                $message->addText($GLOBALS['special_message']);
                 unset($GLOBALS['special_message']);
             }
             $retval .= $message->getDisplay();
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 14256032d7..cab8530f7f 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -382,7 +382,7 @@ function PMA_deleteColumnsFromList($field_select, $isTable=true)
 
     if (!$GLOBALS['dbi']->tryQuery($query, $GLOBALS['controllink'])) {
         $message = Message::error(__('Could not remove columns!'));
-        $message->addMessageHtml('<br />' . htmlspecialchars($cols) . '<br />');
+        $message->addHtml('<br />' . htmlspecialchars($cols) . '<br />');
         $message->addMessage(
             Message::rawError(
                 $GLOBALS['dbi']->getError($GLOBALS['controllink'])
@@ -450,7 +450,7 @@ function PMA_makeConsistentWithList($db, $selected_tables)
                     $GLOBALS['dbi']->getError($GLOBALS['userlink'])
                 );
             } else {
-                $message->addMessageString(
+                $message->addText(
                     $GLOBALS['dbi']->getError($GLOBALS['userlink']),
                     '<br />'
                 );
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 1660821993..44f16159cf 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -555,11 +555,11 @@ function PMA_getHtmlForExportOptionsOutputFormat($export_type)
     $html .= '<label for="filename_template" class="desc">';
     $html .= __('File name template:');
     $trans = new Message;
-    $trans->addMessageString(__('@SERVER@ will become the server name'));
+    $trans->addText(__('@SERVER@ will become the server name'));
     if ($export_type == 'database' || $export_type == 'table') {
-        $trans->addMessageString(__(', @DATABASE@ will become the database name'));
+        $trans->addText(__(', @DATABASE@ will become the database name'));
         if ($export_type == 'table') {
-            $trans->addMessageString(__(', @TABLE@ will become the table name'));
+            $trans->addText(__(', @TABLE@ will become the table name'));
         }
     }
 
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index ddac6e143d..dd91b2cade 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -172,11 +172,11 @@ function PMA_EVN_handleEditor()
                 )
                 . '</b>'
             );
-            $message->addMessageHtml('<ul>');
+            $message->addHtml('<ul>');
             foreach ($errors as $string) {
-                $message->addMessageHtml('<li>' . $string . '</li>');
+                $message->addHtml('<li>' . $string . '</li>');
             }
-            $message->addMessageHtml('</ul>');
+            $message->addHtml('</ul>');
         }
 
         $output = PMA\libraries\Util::getMessage($message, $sql_query);
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index bee7627d85..6c6e5c949f 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -274,11 +274,11 @@ function PMA_RTN_handleRequestCreateOrEdit($errors, $db)
                 . ' processing your request:'
             )
         );
-        $message->addMessageHtml('<ul>');
+        $message->addHtml('<ul>');
         foreach ($errors as $string) {
-            $message->addMessageHtml('<li>' . $string . '</li>');
+            $message->addHtml('<li>' . $string . '</li>');
         }
-        $message->addMessageHtml('</ul>');
+        $message->addHtml('</ul>');
     }
 
     $output = PMA\libraries\Util::getMessage($message, $sql_query);
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index ffd5805fd4..5df16d49fa 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -148,11 +148,11 @@ function PMA_TRI_handleEditor()
                 )
                 . '</b>'
             );
-            $message->addMessageHtml('<ul>');
+            $message->addHtml('<ul>');
             foreach ($errors as $string) {
-                $message->addMessageHtml('<li>' . $string . '</li>');
+                $message->addHtml('<li>' . $string . '</li>');
             }
-            $message->addMessageHtml('</ul>');
+            $message->addHtml('</ul>');
         }
 
         $output = PMA\libraries\Util::getMessage($message, $sql_query);
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index c40d726672..cedd25a821 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -894,7 +894,7 @@ function PMA_getDefaultSqlQueryForBrowse($db, $table)
             __('Using bookmark "%s" as default browse query.')
         );
         $GLOBALS['using_bookmark_message']->addParam($table);
-        $GLOBALS['using_bookmark_message']->addMessageHtml(
+        $GLOBALS['using_bookmark_message']->addHtml(
             PMA\libraries\Util::showDocu('faq', 'faq6-22')
         );
         $sql_query = $bookmark->getQuery();
@@ -1336,7 +1336,7 @@ function PMA_getMessageForNoRowsReturned($message_to_show,
         if ($insert_id != 0) {
             // insert_id is id of FIRST record inserted in one insert,
             // so if we inserted multiple rows, we had to increment this
-            $message->addMessageString('[br]');
+            $message->addText('[br]');
             // need to use a temporary because the Message class
             // currently supports adding parameters only to the first
             // message
@@ -1379,7 +1379,7 @@ function PMA_getMessageForNoRowsReturned($message_to_show,
 
     // In case of ROLLBACK, notify the user.
     if (isset($_REQUEST['rollback_query'])) {
-        $message->addMessageString(__('[ROLLBACK occurred.]'));
+        $message->addText(__('[ROLLBACK occurred.]'));
     }
 
     return $message;
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 3406b5c408..e11453e20d 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -246,12 +246,12 @@ class MessageTest extends PMATestCase
      */
     public function testAddString()
     {
-        $this->object->addMessageString('test', '*');
+        $this->object->addText('test', '*');
         $this->assertEquals(
             array('*', PMA\libraries\Message::notice('test')),
             $this->object->getAddedMessages()
         );
-        $this->object->addMessageString('test', '');
+        $this->object->addText('test', '');
         $this->assertEquals(
             array(
                 '*',
@@ -269,12 +269,12 @@ class MessageTest extends PMATestCase
      */
     public function testAddMessage()
     {
-        $this->object->addMessageString('test<>', '');
+        $this->object->addText('test<>', '');
         $this->assertEquals(
             array(PMA\libraries\Message::notice('test&lt;&gt;')),
             $this->object->getAddedMessages()
         );
-        $this->object->addMessageHtml('<b>test</b>');
+        $this->object->addHtml('<b>test</b>');
         $this->assertEquals(
             array(
                 PMA\libraries\Message::notice('test&lt;&gt;'),