diff --git a/db_structure.php b/db_structure.php
index 309454a83d..c425e8af19 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -319,8 +319,8 @@ $response->addHTML('</div><hr />');
 /* DATABASE WORK */
 /* Printable view of a table */
 $response->addHTML(
-    PMA_getTablePrintViewLink($url_query)
-    . PMA_getDataDictionaryLink($url_query)
+    PMA_getHtmlForTablePrintViewLink($url_query)
+    . PMA_getHtmlForDataDictionaryLink($url_query)
 );
 
 if (empty($db_is_information_schema)) {
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index a000091f17..837ec0e532 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -128,9 +128,9 @@ function PMA_getTableDropQueryAndMessage($table_is_view, $current_table)
             $current_table['TABLE_NAME']
         );
     $drop_message = sprintf(
-        ($table_is_view || $current_table['ENGINE'] == null)
+        (($table_is_view || $current_table['ENGINE'] == null)
             ? __('View %s has been dropped')
-            : __('Table %s has been dropped'),
+            : __('Table %s has been dropped')),
         str_replace(
             ' ',
             '&nbsp;',
@@ -355,7 +355,7 @@ function PMA_getHtmlForCheckTablesHavingOverheadlink($overhead_check) {
  * 
  * @return string $html_output
  */
-function PMA_getTablePrintViewLink($url_query)
+function PMA_getHtmlForTablePrintViewLink($url_query)
 {
     return '<p>'
         . '<a href="db_printview.php?' . $url_query . '">'
@@ -373,7 +373,7 @@ function PMA_getTablePrintViewLink($url_query)
  * 
  * @return string $html_output
  */
-function PMA_getDataDictionaryLink($url_query)
+function PMA_getHtmlForDataDictionaryLink($url_query)
 {
     return '<a href="db_datadict.php?' . $url_query . '">'
         . PMA_CommonFunctions::getInstance()->getIcon(
@@ -1122,7 +1122,7 @@ function PMA_getValuesForAriaTable($db_is_information_schema, $current_table,
             list($formatted_overhead, $overhead_unit)
                 = $common_functions->formatByteDown(
                     $current_table['Data_free'], 3,
-                    ($current_table['Data_free'] > 0) ? 1 : 0
+                    (($current_table['Data_free'] > 0) ? 1 : 0)
                 );
             $overhead_size += $current_table['Data_free'];
         }
@@ -1163,7 +1163,7 @@ function PMA_getValuesForPbmsTable($current_table, $is_show_stats, $sum_size)
         $tblsize =  $current_table['Data_length'] + $current_table['Index_length'];
         $sum_size += $tblsize;
         list($formatted_size, $unit) = $common_functions->formatByteDown(
-            $tblsize, 3, ($tblsize > 0) ? 1 : 0
+            $tblsize, 3, (($tblsize > 0) ? 1 : 0)
         );
     }