diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 190f3f4d7c..9eed857556 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -677,7 +677,7 @@ class PMA_Table
                      \'' . implode('\', \'', $new_value_parts) . '\')';
 
                 PMA_queryAsControlUser($new_table_query);
-                $last_id = PMA_DBI_insert_id();
+                $last_id = PMA_DBI_insertId();
             } // end while
 
             PMA_DBI_freeResult($table_copy_rs);
diff --git a/libraries/dbi/drizzle.dbi.lib.php b/libraries/dbi/drizzle.dbi.lib.php
index 0fc8874387..21f9d0495d 100644
--- a/libraries/dbi/drizzle.dbi.lib.php
+++ b/libraries/dbi/drizzle.dbi.lib.php
@@ -404,7 +404,7 @@ function PMA_DBI_numRows($result)
  *
  * @return string|int
  */
-function PMA_DBI_insert_id($link = null)
+function PMA_DBI_insertId($link = null)
 {
     if (empty($link)) {
         if (isset($GLOBALS['userlink'])) {
@@ -421,7 +421,7 @@ function PMA_DBI_insert_id($link = null)
     // the tracking mechanism, but this works:
     return PMA_DBI_fetchValue('SELECT LAST_INSERT_ID();', 0, 0, $link);
     // Curiously, this problem does not happen with the mysql extension but
-    // there is another problem with BIGINT primary keys so PMA_DBI_insert_id()
+    // there is another problem with BIGINT primary keys so PMA_DBI_insertId()
     // in the mysql extension also uses this logic.
 }
 
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 33c09bfdb7..e3ecb294df 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -424,7 +424,7 @@ function PMA_DBI_numRows($result)
  *
  * @return string|int
  */
-function PMA_DBI_insert_id($link = null)
+function PMA_DBI_insertId($link = null)
 {
     if (empty($link)) {
         if (isset($GLOBALS['userlink'])) {
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0fc6c5e4fb..c0b98912d2 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -509,7 +509,7 @@ function PMA_DBI_numRows($result)
  *
  * @return string|int
  */
-function PMA_DBI_insert_id($link = null)
+function PMA_DBI_insertId($link = null)
 {
     if (empty($link)) {
         if (isset($GLOBALS['userlink'])) {
@@ -523,7 +523,7 @@ function PMA_DBI_insert_id($link = null)
     // the tracking mechanism, but this works:
     return PMA_DBI_fetchValue('SELECT LAST_INSERT_ID();', 0, 0, $link);
     // Curiously, this problem does not happen with the mysql extension but
-    // there is another problem with BIGINT primary keys so PMA_DBI_insert_id()
+    // there is another problem with BIGINT primary keys so PMA_DBI_insertId()
     // in the mysql extension also uses this logic.
 }
 
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 645061613d..e196b03fb9 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -1926,7 +1926,7 @@ function PMA_executeSqlQuery($url_params, $query)
             }
             unset($tmp);
 
-            $insert_id = PMA_DBI_insert_id();
+            $insert_id = PMA_DBI_insertId();
             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
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 967fe875ba..1bb6cbe41a 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -1408,7 +1408,7 @@ function PMA_REL_createPage($newpage, $cfgRelation, $db)
         . PMA_Util::sqlAddSlashes($newpage) . '\')';
     PMA_queryAsControlUser($ins_query, false);
 
-    return PMA_DBI_insert_id(
+    return PMA_DBI_insertId(
         isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''
     );
 }
diff --git a/sql.php b/sql.php
index b0e56ef45d..6edf3e0359 100644
--- a/sql.php
+++ b/sql.php
@@ -905,7 +905,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
         } else {
             $message = PMA_Message::getMessageForInsertedRows($num_rows);
         }
-        $insert_id = PMA_DBI_insert_id();
+        $insert_id = PMA_DBI_insertId();
         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