diff --git a/docs/02.API-REFERENCE.md b/docs/02.API-REFERENCE.md
index e8ceb71f3..af5a4d0e0 100644
--- a/docs/02.API-REFERENCE.md
+++ b/docs/02.API-REFERENCE.md
@@ -774,7 +774,7 @@ typedef void (*jerry_object_native_free_callback_t) (void *native_p, struct jerr
 **Summary**
 
 Free callback for external strings. See
-[jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+[jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
 for more information.
 
 **Prototype**
@@ -793,7 +793,7 @@ typedef void (*jerry_external_string_free_callback_t) (jerry_char_t *string_p,
 
 **See also**
 
-- [jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+- [jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
 - [jerry_create_external_string](#jerry_create_external_string)
 - [jerry_create_external_string_sz](#jerry_create_external_string_sz)
 
@@ -4223,7 +4223,7 @@ jerry_substring_to_utf8_char_buffer (const jerry_value_t value,
 - [jerry_is_valid_utf8_string](#jerry_is_valid_utf8_string)
 
 
-# jerry_string_set_external_string_free_callback
+# jerry_string_set_external_free_callback
 
 **Summary**
 
@@ -4240,7 +4240,7 @@ first external string is created.
 **Prototype**
 
 ```c
-void jerry_string_set_external_string_free_callback (jerry_external_string_free_callback_t callback_p);
+void jerry_string_set_external_free_callback (jerry_external_string_free_callback_t callback_p);
 ```
 
 - `callback_p` - callback which is called when an external string is freed.
@@ -4268,7 +4268,7 @@ main (void)
 {
   jerry_init (JERRY_INIT_EMPTY);
 
-  jerry_string_set_external_string_free_callback (external_string_free_callback);
+  jerry_string_set_external_free_callback (external_string_free_callback);
 
   const char *string_p = "This is a long external string, should not be duplicated!";
   jerry_value_t external_string = jerry_create_external_string ((jerry_char_t *) string_p, NULL);
@@ -7386,7 +7386,7 @@ should not be modified until the free callback is called. This function can be u
 the duplication of large strings.
 
 *Note*:
- - The free callback can be set by [jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+ - The free callback can be set by [jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
  - Returned value must be freed with [jerry_release_value](#jerry_release_value)
    when it is no longer needed.
 
@@ -7423,7 +7423,7 @@ jerry_create_external_string (const jerry_char_t *str_p, void *user_p);
 
 - [jerry_is_valid_cesu8_string](#jerry_is_valid_cesu8_string)
 - [jerry_create_external_string_sz](#jerry_create_external_string_sz)
-- [jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+- [jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
 
 
 ## jerry_create_external_string_sz
@@ -7435,7 +7435,7 @@ should not be modified until the free callback is called. This function can be u
 the duplication of large strings.
 
 *Note*:
- - The free callback can be set by [jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+ - The free callback can be set by [jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
  - Returned value must be freed with [jerry_release_value](#jerry_release_value)
    when it is no longer needed.
 
@@ -7477,7 +7477,7 @@ jerry_create_external_string_sz (const jerry_char_t *str_p,
 
 - [jerry_is_valid_cesu8_string](#jerry_is_valid_cesu8_string)
 - [jerry_create_external_string](#jerry_create_external_string)
-- [jerry_string_set_external_string_free_callback](#jerry_string_set_external_string_free_callback)
+- [jerry_string_set_external_free_callback](#jerry_string_set_external_free_callback)
 
 
 ## jerry_create_symbol
diff --git a/jerry-core/api/jerry.c b/jerry-core/api/jerry.c
index 38ed97caa..79e9af856 100644
--- a/jerry-core/api/jerry.c
+++ b/jerry-core/api/jerry.c
@@ -3111,11 +3111,10 @@ jerry_substring_to_utf8_char_buffer (const jerry_value_t value, /**< input strin
  * Sets the global callback which is called when an external string is freed.
  */
 void
-jerry_string_set_external_string_free_callback (jerry_external_string_free_callback_t callback_p) /**< free
-                                                                                                   *   callback */
+jerry_string_set_external_free_callback (jerry_external_string_free_callback_t callback_p) /**< free callback */
 {
   JERRY_CONTEXT (external_string_free_callback_p) = callback_p;
-} /* jerry_string_set_external_string_free_callback */
+} /* jerry_string_set_external_free_callback */
 
 /**
  * Checks whether the object or it's prototype objects have the given property.
diff --git a/jerry-core/include/jerryscript-core.h b/jerry-core/include/jerryscript-core.h
index e5376d75c..3c09d877e 100644
--- a/jerry-core/include/jerryscript-core.h
+++ b/jerry-core/include/jerryscript-core.h
@@ -135,7 +135,7 @@ jerry_size_t jerry_substring_to_utf8_char_buffer (const jerry_value_t value,
                                                   jerry_length_t end_pos,
                                                   jerry_char_t *buffer_p,
                                                   jerry_size_t buffer_size);
-void jerry_string_set_external_string_free_callback (jerry_external_string_free_callback_t callback_p);
+void jerry_string_set_external_free_callback (jerry_external_string_free_callback_t callback_p);
 
 /**
  * Functions for array object values.
diff --git a/tests/unit-core/test-external-string.c b/tests/unit-core/test-external-string.c
index 7fa37171c..81574a16b 100644
--- a/tests/unit-core/test-external-string.c
+++ b/tests/unit-core/test-external-string.c
@@ -65,44 +65,44 @@ main (void)
   jerry_init (JERRY_INIT_EMPTY);
 
   /* Test external callback calls. */
-  jerry_string_set_external_string_free_callback (external_string_free_callback_1);
+  jerry_string_set_external_free_callback (external_string_free_callback_1);
   jerry_value_t external_string = jerry_create_external_string ((jerry_char_t *) external_1, NULL);
   TEST_ASSERT (free_count == 0);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 1);
 
-  jerry_string_set_external_string_free_callback (NULL);
+  jerry_string_set_external_free_callback (NULL);
   external_string = jerry_create_external_string ((jerry_char_t *) external_1, NULL);
   TEST_ASSERT (free_count == 1);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 1);
 
-  jerry_string_set_external_string_free_callback (external_string_free_callback_2);
+  jerry_string_set_external_free_callback (external_string_free_callback_2);
   external_string = jerry_create_external_string ((jerry_char_t *) external_2, (void *) &free_count);
   TEST_ASSERT (free_count == 2);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 2);
 
-  jerry_string_set_external_string_free_callback (NULL);
+  jerry_string_set_external_free_callback (NULL);
   external_string = jerry_create_external_string ((jerry_char_t *) external_2, (void *) &free_count);
   TEST_ASSERT (free_count == 2);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 2);
 
-  jerry_string_set_external_string_free_callback (external_string_free_callback_3);
+  jerry_string_set_external_free_callback (external_string_free_callback_3);
   external_string = jerry_create_external_string ((jerry_char_t *) external_3, (void *) external_3);
   TEST_ASSERT (free_count == 3);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 3);
 
-  jerry_string_set_external_string_free_callback (NULL);
+  jerry_string_set_external_free_callback (NULL);
   external_string = jerry_create_external_string ((jerry_char_t *) external_3, (void *) external_3);
   TEST_ASSERT (free_count == 3);
   jerry_release_value (external_string);
   TEST_ASSERT (free_count == 3);
 
   /* Test string comparison. */
-  jerry_string_set_external_string_free_callback (external_string_free_callback_1);
+  jerry_string_set_external_free_callback (external_string_free_callback_1);
   external_string = jerry_create_external_string ((jerry_char_t *) external_1, NULL);
   jerry_value_t other_string = jerry_create_string ((jerry_char_t *) external_1);
 
@@ -122,7 +122,7 @@ main (void)
   jerry_release_value (other_string);
 
   /* Test getting string. */
-  jerry_string_set_external_string_free_callback (external_string_free_callback_1);
+  jerry_string_set_external_free_callback (external_string_free_callback_1);
   external_string = jerry_create_external_string ((jerry_char_t *) external_1, NULL);
   size_t length = strlen (external_1);
 
@@ -139,7 +139,7 @@ main (void)
   TEST_ASSERT (free_count == 5);
 
   /* Test property access. */
-  jerry_string_set_external_string_free_callback (NULL);
+  jerry_string_set_external_free_callback (NULL);
   external_string = jerry_create_external_string ((jerry_char_t *) external_4, NULL);
   other_string = jerry_create_string ((jerry_char_t *) external_4);