diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index eb706098fc..e006fa01e3 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2992,7 +2992,7 @@ function PMA_getFunctionsForField($field, $insert_mode)
         && $field['Key'] == 'PRI'
         && ($field['Type'] == 'char(36)' || $field['Type'] == 'varchar(36)')
     ) {
-         $default_function = $cfg['DefaultFunctions']['pk_char36'];
+         $default_function = $cfg['DefaultFunctions']['FUNC_UUID'];
     }
     // this is set only when appropriate and is always true
     if (isset($field['display_binary_as_hex'])) {
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 214b9f28cf..6d54aa6693 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2794,8 +2794,8 @@ if ($cfg['ShowFunctionFields']) {
         'FUNC_CHAR' => '',
         'FUNC_DATE' => '',
         'FUNC_NUMBER' => '',
+        'FUNC_UUID' => 'UUID',
         'first_timestamp' => 'NOW',
-        'pk_char36' => 'UUID',
     );
 }