diff --git a/src/libecmaobjects/ecma-globals.h b/src/libecmaobjects/ecma-globals.h
index 8a7ad3521..2676197ca 100644
--- a/src/libecmaobjects/ecma-globals.h
+++ b/src/libecmaobjects/ecma-globals.h
@@ -646,7 +646,32 @@ typedef enum
   ECMA_MAGIC_STRING_FUNCTION, /**< "function" */
   ECMA_MAGIC_STRING_LENGTH, /**< "length" */
   ECMA_MAGIC_STRING_NAN, /**< "NaN" */
-  ECMA_MAGIC_STRING_INFINITY, /**< "Infinity" */
+  ECMA_MAGIC_STRING_INFINITY_UL, /**< "Infinity" */
+  ECMA_MAGIC_STRING_OBJECT_UL, /**< "Object" */
+  ECMA_MAGIC_STRING_FUNCTION_UL, /**< "Function" */
+  ECMA_MAGIC_STRING_ARRAY_UL, /**< "Array" */
+  ECMA_MAGIC_STRING_STRING_UL, /**< "String" */
+  ECMA_MAGIC_STRING_BOOLEAN_UL, /**< "Boolean" */
+  ECMA_MAGIC_STRING_NUMBER_UL, /**< "Number" */
+  ECMA_MAGIC_STRING_DATE_UL, /**< "Date" */
+  ECMA_MAGIC_STRING_REG_EXP_UL, /**< "RegExp" */
+  ECMA_MAGIC_STRING_ERROR_UL, /**< "Error" */
+  ECMA_MAGIC_STRING_EVAL_ERROR_UL, /**< "EvalError" */
+  ECMA_MAGIC_STRING_RANGE_ERROR_UL, /**< "RangeError" */
+  ECMA_MAGIC_STRING_REFERENCE_ERROR_UL, /**< "ReferenceError" */
+  ECMA_MAGIC_STRING_SYNTAX_ERROR_UL, /**< "SyntaxError" */
+  ECMA_MAGIC_STRING_TYPE_ERROR_UL, /**< "TypeError" */
+  ECMA_MAGIC_STRING_URI_ERROR_UL, /**< "URIError" */
+  ECMA_MAGIC_STRING_MATH_UL, /**< "Math" */
+  ECMA_MAGIC_STRING_JSON_U, /**< "JSON" */
+  ECMA_MAGIC_STRING_PARSE_INT, /**< "parseInt" */
+  ECMA_MAGIC_STRING_PARSE_FLOAT, /**< "parseFloat" */
+  ECMA_MAGIC_STRING_IS_NAN, /**< "isNaN" */
+  ECMA_MAGIC_STRING_IS_FINITE, /**< "isFinite" */
+  ECMA_MAGIC_STRING_DECODE_URI, /**< "decodeURI" */
+  ECMA_MAGIC_STRING_DECODE_URI_COMPONENT, /**< "decodeURIComponent" */
+  ECMA_MAGIC_STRING_ENCODE_URI, /**< "encodeURI" */
+  ECMA_MAGIC_STRING_ENCODE_URI_COMPONENT, /**< "encodeURIComponent" */
   ECMA_MAGIC_STRING__COUNT /**< number of magic strings */
 } ecma_magic_string_id_t;
 
diff --git a/src/libecmaobjects/ecma-helpers-conversion.c b/src/libecmaobjects/ecma-helpers-conversion.c
index 16a6cbebd..874c14be7 100644
--- a/src/libecmaobjects/ecma-helpers-conversion.c
+++ b/src/libecmaobjects/ecma-helpers-conversion.c
@@ -149,7 +149,7 @@ ecma_zt_string_to_number (const ecma_char_t *str_p) /**< zero-terminated string
     return ecma_number_make_nan ();
   }
 
-  const ecma_char_t *infinity_zt_str_p = ecma_get_magic_string_zt (ECMA_MAGIC_STRING_INFINITY);
+  const ecma_char_t *infinity_zt_str_p = ecma_get_magic_string_zt (ECMA_MAGIC_STRING_INFINITY_UL);
 
   for (const ecma_char_t *iter_p = begin_p, *iter_infinity_p = infinity_zt_str_p;
        ;
@@ -489,7 +489,7 @@ ecma_number_to_zt_string (ecma_number_t num, /**< ecma-number */
     else if (ecma_number_is_infinity (num))
     {
       // 4.
-      ecma_copy_zt_string_to_buffer (ecma_get_magic_string_zt (ECMA_MAGIC_STRING_INFINITY),
+      ecma_copy_zt_string_to_buffer (ecma_get_magic_string_zt (ECMA_MAGIC_STRING_INFINITY_UL),
                                      buffer_p,
                                      buffer_size);
     }
diff --git a/src/libecmaobjects/ecma-helpers-string.c b/src/libecmaobjects/ecma-helpers-string.c
index 97ece3b6d..b568df0c0 100644
--- a/src/libecmaobjects/ecma-helpers-string.c
+++ b/src/libecmaobjects/ecma-helpers-string.c
@@ -1238,7 +1238,32 @@ ecma_get_magic_string_zt (ecma_magic_string_id_t id) /**< magic string id */
     case ECMA_MAGIC_STRING_FUNCTION: return (ecma_char_t*) "function";
     case ECMA_MAGIC_STRING_LENGTH: return (ecma_char_t*) "length";
     case ECMA_MAGIC_STRING_NAN: return (ecma_char_t*) "NaN";
-    case ECMA_MAGIC_STRING_INFINITY: return (ecma_char_t*) "Infinity";
+    case ECMA_MAGIC_STRING_INFINITY_UL: return (ecma_char_t*) "Infinity";
+    case ECMA_MAGIC_STRING_OBJECT_UL: return (ecma_char_t*) "Object";
+    case ECMA_MAGIC_STRING_FUNCTION_UL: return (ecma_char_t*) "Function";
+    case ECMA_MAGIC_STRING_ARRAY_UL: return (ecma_char_t*) "Array";
+    case ECMA_MAGIC_STRING_STRING_UL: return (ecma_char_t*) "String";
+    case ECMA_MAGIC_STRING_BOOLEAN_UL: return (ecma_char_t*) "Boolean";
+    case ECMA_MAGIC_STRING_NUMBER_UL: return (ecma_char_t*) "Number";
+    case ECMA_MAGIC_STRING_DATE_UL: return (ecma_char_t*) "Date";
+    case ECMA_MAGIC_STRING_REG_EXP_UL: return (ecma_char_t*) "RegExp";
+    case ECMA_MAGIC_STRING_ERROR_UL: return (ecma_char_t*) "Error";
+    case ECMA_MAGIC_STRING_EVAL_ERROR_UL: return (ecma_char_t*) "EvalError";
+    case ECMA_MAGIC_STRING_RANGE_ERROR_UL: return (ecma_char_t*) "RangeError";
+    case ECMA_MAGIC_STRING_REFERENCE_ERROR_UL: return (ecma_char_t*) "ReferenceError";
+    case ECMA_MAGIC_STRING_SYNTAX_ERROR_UL: return (ecma_char_t*) "SyntaxError";
+    case ECMA_MAGIC_STRING_TYPE_ERROR_UL: return (ecma_char_t*) "TypeError";
+    case ECMA_MAGIC_STRING_URI_ERROR_UL: return (ecma_char_t*) "URIError";
+    case ECMA_MAGIC_STRING_MATH_UL: return (ecma_char_t*) "Math";
+    case ECMA_MAGIC_STRING_JSON_U: return (ecma_char_t*) "JSON";
+    case ECMA_MAGIC_STRING_PARSE_INT: return (ecma_char_t*) "parseInt";
+    case ECMA_MAGIC_STRING_PARSE_FLOAT: return (ecma_char_t*) "parseFloat";
+    case ECMA_MAGIC_STRING_IS_NAN: return (ecma_char_t*) "isNaN";
+    case ECMA_MAGIC_STRING_IS_FINITE: return (ecma_char_t*) "isFinite";
+    case ECMA_MAGIC_STRING_DECODE_URI: return (ecma_char_t*) "decodeURI";
+    case ECMA_MAGIC_STRING_DECODE_URI_COMPONENT: return (ecma_char_t*) "decodeURIComponent";
+    case ECMA_MAGIC_STRING_ENCODE_URI: return (ecma_char_t*) "encodeURI";
+    case ECMA_MAGIC_STRING_ENCODE_URI_COMPONENT: return (ecma_char_t*) "encodeURIComponent";
     case ECMA_MAGIC_STRING__COUNT: break;
   }