diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 35d32d7da3..d1ec487863 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -1823,7 +1823,7 @@ class PMA_Table
         foreach ($columns as $column) {
             $temp = explode('.', $column);
             $column_name = $temp[2];
-            if (PMA_SQP_isKeyWord($column_name)) {
+            if (SqlParser\Context::isKeyword($column_name, true)) {
                 $return[] = $column_name;
             }
         }
diff --git a/tbl_structure.php b/tbl_structure.php
index 197495fc13..9d5178c048 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -51,11 +51,11 @@ if (isset($_REQUEST['reserved_word_check'])) {
         $columns_names = $_REQUEST['field_name'];
         $reserved_keywords_names = array();
         foreach ($columns_names as $column) {
-            if (PMA_SQP_isKeyWord(trim($column))) {
+            if (SqlParser\Context::isKeyword(trim($column), true)) {
                 $reserved_keywords_names[] = trim($column);
             }
         }
-        if (PMA_SQP_isKeyWord(trim($table))) {
+        if (SqlParser\Context::isKeyword(trim($table), true)) {
             $reserved_keywords_names[] = trim($table);
         }
         if (count($reserved_keywords_names) == 0) {