diff --git a/db_datadict.php b/db_datadict.php
index bda817acbb..9dc4c8569c 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -116,7 +116,7 @@ foreach ($tables as $table) {
     /**
      * Gets columns properties
      */
-    $columns = PMA_DBI_get_columns($db, $table);
+    $columns = PMA_DBI_getColumns($db, $table);
     $fields_cnt  = count($columns);
 
     if (PMA_MYSQL_INT_VERSION < 50025) {
diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php
index 4b0df13705..e7b818d00d 100644
--- a/libraries/DBQbe.class.php
+++ b/libraries/DBQbe.class.php
@@ -270,7 +270,7 @@ class PMA_DbQbe
         }
         // The tables list gets from MySQL
         while (list($table) = PMA_DBI_fetch_row($all_tables)) {
-            $columns = PMA_DBI_get_columns($this->_db, $table);
+            $columns = PMA_DBI_getColumns($this->_db, $table);
 
             if (empty($this->_criteriaTables[$table])
                 && ! empty($_REQUEST['TableList'])
diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php
index 2590745fbb..68241dcc78 100644
--- a/libraries/DbSearch.class.php
+++ b/libraries/DbSearch.class.php
@@ -193,7 +193,7 @@ class PMA_DbSearch
     {
         $where_clause = '';
         // Columns to select
-        $allColumns = PMA_DBI_get_columns($GLOBALS['db'], $table);
+        $allColumns = PMA_DBI_getColumns($GLOBALS['db'], $table);
         $likeClauses = array();
         // Based on search type, decide like/regex & '%'/''
         $like_or_regex   = (($this->_criteriaSearchType == 4) ? 'REGEXP' : 'LIKE');
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
index ccc808eaab..2f43ebe29f 100644
--- a/libraries/TableSearch.class.php
+++ b/libraries/TableSearch.class.php
@@ -123,7 +123,7 @@ class PMA_TableSearch
     private function _loadTableInfo()
     {
         // Gets the list and number of columns
-        $columns = PMA_DBI_get_columns($this->_db, $this->_table, null, true);
+        $columns = PMA_DBI_getColumns($this->_db, $this->_table, null, true);
         // Get details about the geometry fucntions
         $geom_types = PMA_Util::getGISDatatypes();
 
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 4e67c08a21..981615498b 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -275,7 +275,7 @@ class PMA_Tracker
 
         // Get data definition snapshot of table
 
-        $columns = PMA_DBI_get_columns($dbname, $tablename, null, true);
+        $columns = PMA_DBI_getColumns($dbname, $tablename, null, true);
         // int indices to reduce size
         $columns = array_values($columns);
         // remove Privileges to reduce size
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 21c144acc7..e699a0ebda 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -3316,7 +3316,7 @@ class PMA_Util
 
         /* Fetch columns list if required */
         if (strpos($string, '@COLUMNS@') !== false) {
-            $columns_list = PMA_DBI_get_columns($GLOBALS['db'], $GLOBALS['table']);
+            $columns_list = PMA_DBI_getColumns($GLOBALS['db'], $GLOBALS['table']);
 
             // sometimes the table no longer exists at this point
             if (! is_null($columns_list)) {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 0576a5d6a9..94fd09ae95 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1210,7 +1210,7 @@ function PMA_DBI_getColumnsFull($database = null, $table = null,
 /**
  * Returns SQL query for fetching columns for a table
  *
- * The 'Key' column is not calculated properly, use PMA_DBI_get_columns() to get
+ * The 'Key' column is not calculated properly, use PMA_DBI_getColumns() to get
  * correct values.
  *
  * @param string  $database name of database
@@ -1218,7 +1218,7 @@ function PMA_DBI_getColumnsFull($database = null, $table = null,
  * @param string  $column   name of column, null to show all columns
  * @param boolean $full     whether to return full info or only column names
  *
- * @see PMA_DBI_get_columns()
+ * @see PMA_DBI_getColumns()
  *
  * @return string
  */
@@ -1290,7 +1290,7 @@ function PMA_DBI_getColumnsSql($database, $table, $column = null, $full = false)
  * @return false|array   array indexed by column names or,
  *                        if $column is given, flat array description
  */
-function PMA_DBI_get_columns($database, $table, $column = null, $full = false,
+function PMA_DBI_getColumns($database, $table, $column = null, $full = false,
     $link = null
 ) {
     $sql = PMA_DBI_getColumnsSql($database, $table, $column, $full);
diff --git a/libraries/plugins/export/ExportHtmlword.class.php b/libraries/plugins/export/ExportHtmlword.class.php
index f6e5acbf78..43f9cb0443 100644
--- a/libraries/plugins/export/ExportHtmlword.class.php
+++ b/libraries/plugins/export/ExportHtmlword.class.php
@@ -297,7 +297,7 @@ class ExportHtmlword extends ExportPlugin
             }
         }
 
-        $columns = PMA_DBI_get_columns($db, $view);
+        $columns = PMA_DBI_getColumns($db, $view);
         foreach ($columns as $column) {
             $schema_insert .= $this->formatOneColumnDefinition(
                 $column,
@@ -418,7 +418,7 @@ class ExportHtmlword extends ExportPlugin
         }
         $schema_insert .= '</tr>';
 
-        $columns = PMA_DBI_get_columns($db, $table);
+        $columns = PMA_DBI_getColumns($db, $table);
         /**
          * Get the unique keys in the table
          */
diff --git a/libraries/plugins/export/ExportLatex.class.php b/libraries/plugins/export/ExportLatex.class.php
index 1e13178820..bbde5387cd 100644
--- a/libraries/plugins/export/ExportLatex.class.php
+++ b/libraries/plugins/export/ExportLatex.class.php
@@ -563,7 +563,7 @@ class ExportLatex extends ExportPlugin
             return false;
         }
 
-        $fields = PMA_DBI_get_columns($db, $table);
+        $fields = PMA_DBI_getColumns($db, $table);
         foreach ($fields as $row) {
             $extracted_columnspec
                 = PMA_Util::extractColumnSpec(
diff --git a/libraries/plugins/export/ExportMediawiki.class.php b/libraries/plugins/export/ExportMediawiki.class.php
index 89afe7100e..148e22ba47 100644
--- a/libraries/plugins/export/ExportMediawiki.class.php
+++ b/libraries/plugins/export/ExportMediawiki.class.php
@@ -202,7 +202,7 @@ class ExportMediawiki extends ExportPlugin
     ) {
         switch($export_mode) {
         case 'create_table':
-            $columns = PMA_DBI_get_columns($db, $table);
+            $columns = PMA_DBI_getColumns($db, $table);
             $columns = array_values($columns);
             $row_cnt = count($columns);
 
diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php
index ea3282c238..8b58bf5b94 100644
--- a/libraries/plugins/export/ExportOdt.class.php
+++ b/libraries/plugins/export/ExportOdt.class.php
@@ -368,7 +368,7 @@ class ExportOdt extends ExportPlugin
             . '</table:table-cell>'
             . '</table:table-row>';
 
-        $columns = PMA_DBI_get_columns($db, $view);
+        $columns = PMA_DBI_getColumns($db, $view);
         foreach ($columns as $column) {
             $GLOBALS['odt_buffer'] .= $this->formatOneColumnDefinition($column);
             $GLOBALS['odt_buffer'] .= '</table:table-row>';
@@ -483,7 +483,7 @@ class ExportOdt extends ExportPlugin
         }
         $GLOBALS['odt_buffer'] .= '</table:table-row>';
 
-        $columns = PMA_DBI_get_columns($db, $table);
+        $columns = PMA_DBI_getColumns($db, $table);
         foreach ($columns as $column) {
             $field_name = $column['Field'];
             $GLOBALS['odt_buffer'] .= $this->formatOneColumnDefinition($column);
diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php
index 3aa609c345..e9e61b7d8e 100644
--- a/libraries/plugins/export/ExportTexytext.class.php
+++ b/libraries/plugins/export/ExportTexytext.class.php
@@ -272,7 +272,7 @@ class ExportTexytext extends ExportPlugin
             . '|' . __('Default')
             . "\n|------\n";
 
-        $columns = PMA_DBI_get_columns($db, $view);
+        $columns = PMA_DBI_getColumns($db, $view);
         foreach ($columns as $column) {
             $text_output .= $this->formatOneColumnDefinition($column, $unique_keys);
             $text_output .= "\n";
@@ -383,7 +383,7 @@ class ExportTexytext extends ExportPlugin
         }
         $text_output .= "\n|------\n";
 
-        $columns = PMA_DBI_get_columns($db, $table);
+        $columns = PMA_DBI_getColumns($db, $table);
         foreach ($columns as $column) {
             $text_output .= $this->formatOneColumnDefinition($column, $unique_keys);
             $field_name = $column['Field'];
diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php
index 6d065a4697..0f5648fe3b 100644
--- a/libraries/plugins/import/ImportCsv.class.php
+++ b/libraries/plugins/import/ImportCsv.class.php
@@ -177,7 +177,7 @@ class ImportCsv extends AbstractImportCsv
             }
             $sql_template .= ' INTO ' . PMA_Util::backquote($table);
 
-            $tmp_fields = PMA_DBI_get_columns($db, $table);
+            $tmp_fields = PMA_DBI_getColumns($db, $table);
 
             if (empty($csv_columns)) {
                 $fields = $tmp_fields;
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 2e9f6f8845..0c9a05beb3 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -654,7 +654,7 @@ function PMA_getComments($db, $table = '')
 
     if ($table != '') {
         // MySQL native column comments
-        $columns = PMA_DBI_get_columns($db, $table, null, true);
+        $columns = PMA_DBI_getColumns($db, $table, null, true);
         if ($columns) {
             foreach ($columns as $column) {
                 if (! empty($column['Comment'])) {
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 180d17707e..d85f199ad5 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -223,7 +223,7 @@ function PMA_replication_print_slaves_table($hidden = false)
 
 function PMA_replication_get_username_hostname_length()
 {
-    $fields_info = PMA_DBI_get_columns('mysql', 'user');
+    $fields_info = PMA_DBI_getColumns('mysql', 'user');
     $username_length = 16;
     $hostname_length = 41;
     foreach ($fields_info as $val) {
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index bd73280c08..f8e4c766f3 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -1189,7 +1189,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
                 'L', 0, $pdf->PMA_links['doc'][$table]['-']
             );
             // $pdf->Ln(1);
-            $fields = PMA_DBI_get_columns($GLOBALS['db'], $table);
+            $fields = PMA_DBI_getColumns($GLOBALS['db'], $table);
             foreach ($fields as $row) {
                 $pdf->SetX(20);
                 $field_name = $row['Field'];
@@ -1307,7 +1307,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
             /**
              * Gets fields properties
              */
-            $columns = PMA_DBI_get_columns($db, $table);
+            $columns = PMA_DBI_getColumns($db, $table);
             // Check if we can use Relations
             if (!empty($cfgRelation['relation'])) {
                 // Find which tables are related with the current one and write it in
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 1a5f03c750..5394e9c4fa 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -573,7 +573,7 @@ class PMA_User_Schema
                 . '</u>';
 
             if (isset($with_field_names)) {
-                $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']);
+                $fields = PMA_DBI_getColumns($db, $temp_sh_page['table_name']);
                 // if the table has been dropped from outside phpMyAdmin,
                 // we can no longer obtain its columns list
                 if ($fields) {
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index e238183960..07412e72c6 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1238,7 +1238,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
  */
 function PMA_getUsernameAndHostnameLength()
 {
-    $fields_info = PMA_DBI_get_columns('mysql', 'user', null, true);
+    $fields_info = PMA_DBI_getColumns('mysql', 'user', null, true);
     $username_length = 16;
     $hostname_length = 41;
     foreach ($fields_info as $val) {
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 7f5387412c..24b3ed22fb 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -214,7 +214,7 @@ function PMA_sqlQueryFormInsert(
         // Get the list and number of fields
         // we do a try_query here, because we could be in the query window,
         // trying to synchonize and the table has not yet been created
-        $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], null, true);
+        $fields_list = PMA_DBI_getColumns($db, $GLOBALS['table'], null, true);
 
         $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
             . '?' . PMA_generate_common_url($db) . '"';
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index de20b6769d..5a34e581f7 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -2231,7 +2231,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
      * @todo optimize in case of multiple fields to modify
      */
     for ($i = 0; $i < $selected_cnt; $i++) {
-        $fields_meta[] = PMA_DBI_get_columns($db, $table, $selected[$i], true);
+        $fields_meta[] = PMA_DBI_getColumns($db, $table, $selected[$i], true);
     }
     $num_fields  = count($fields_meta);
     // set these globals because tbl_columns_definition_form.inc.php 
@@ -2248,7 +2248,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action)
     // could be executed to replace the info given by SHOW FULL COLUMNS FROM.
     /**
      * @todo put this code into a require()
-     * or maybe make it part of PMA_DBI_get_columns();
+     * or maybe make it part of PMA_DBI_getColumns();
      */
 
     // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since
diff --git a/tbl_change.php b/tbl_change.php
index 608893e4cc..fbec0bae22 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -144,7 +144,7 @@ unset($show_create_table);
  * Get the list of the fields of the current table
  */
 PMA_DBI_select_db($db);
-$table_fields = array_values(PMA_DBI_get_columns($db, $table));
+$table_fields = array_values(PMA_DBI_getColumns($db, $table));
 
 $paramTableDbArray = array($table, $db);
 
diff --git a/tbl_create.php b/tbl_create.php
index 9fb3ea2403..bd77b6786c 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -26,7 +26,7 @@ if (strlen($db) == 0) {
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-if (PMA_DBI_get_columns($db, $table)) {
+if (PMA_DBI_getColumns($db, $table)) {
     // table exists already
     PMA_Util::mysqlDie(
         sprintf(__('Table %s already exists!'), htmlspecialchars($table)),
diff --git a/tbl_get_field.php b/tbl_get_field.php
index a537a82d41..0f4b58d2b2 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -26,7 +26,7 @@ if (!PMA_DBI_select_db($db)) {
 }
 
 /* Check if table exists */
-if (!PMA_DBI_get_columns($db, $table)) {
+if (!PMA_DBI_getColumns($db, $table)) {
     PMA_Util::mysqlDie(__('Invalid table name'));
 }
 
diff --git a/tbl_operations.php b/tbl_operations.php
index f487ea97f0..22f054db31 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -225,7 +225,7 @@ $url_params['goto']
 /**
  * Get columns names
  */
-$columns = PMA_DBI_get_columns($GLOBALS['db'], $GLOBALS['table']);
+$columns = PMA_DBI_getColumns($GLOBALS['db'], $GLOBALS['table']);
 
 /**
  * Displays the page
diff --git a/tbl_printview.php b/tbl_printview.php
index c1685fe0b2..ebf34282af 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -92,7 +92,7 @@ foreach ($the_tables as $key => $table) {
     /**
      * Gets fields properties
      */
-    $columns = PMA_DBI_get_columns($db, $table);
+    $columns = PMA_DBI_getColumns($db, $table);
 
 
     // We need this to correctly learn if a TIMESTAMP is NOT NULL, since
diff --git a/tbl_relation.php b/tbl_relation.php
index 772108f3ca..21ec7284ea 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -363,7 +363,7 @@ if ($cfgRelation['relwork']
 
 // Now find out the columns of our $table
 // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
-$columns = PMA_DBI_get_columns($db, $table);
+$columns = PMA_DBI_getColumns($db, $table);
 
 if (count($columns) > 0) {
 
diff --git a/tbl_structure.php b/tbl_structure.php
index 60b4b93b23..bc79265fe2 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -182,7 +182,7 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) {
 unset($index, $columns, $column_name, $dummy);
 
 // 3. Get fields
-$fields = (array) PMA_DBI_get_columns($db, $table, null, true);
+$fields = (array) PMA_DBI_getColumns($db, $table, null, true);
 
 // Get more complete field information
 // For now, this is done just for MySQL 4.1.2+ new TIMESTAMP options