diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
index 41001a879e..4e99d050c1 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
@@ -29,11 +29,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_CONSTRUCTOR,
               ECMA_BUILTIN_ID_MAP,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 
-/* ECMA-262 v6, 23.1.3 */
-STRING_VALUE (LIT_MAGIC_STRING_NAME,
-              LIT_MAGIC_STRING_MAP_UL,
-              ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-
 /* Routine properties:
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
 ROUTINE (LIT_MAGIC_STRING_CLEAR, ecma_builtin_map_prototype_object_clear, 0, 0)
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
index 7869fff407..b2daf5791d 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-map.inc.h
@@ -29,6 +29,11 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH,
               0,
               ECMA_PROPERTY_FIXED)
 
+/* ECMA-262 v6, 23.1 */
+STRING_VALUE (LIT_MAGIC_STRING_NAME,
+              LIT_MAGIC_STRING_MAP_UL,
+              ECMA_PROPERTY_FLAG_CONFIGURABLE)
+
 /* Object properties:
  *  (property name, object pointer getter) */
 
diff --git a/tests/jerry/es2015/map.js b/tests/jerry/es2015/map.js
index 05ac0b8348..3618045e67 100644
--- a/tests/jerry/es2015/map.js
+++ b/tests/jerry/es2015/map.js
@@ -72,3 +72,11 @@ assert(m.size == 3);
 assert(m.get(1) === 8);
 assert(m.get(2) === 8);
 assert(m.get(3) === 8);
+
+var mapNameDesc = Object.getOwnPropertyDescriptor (Map, 'name');
+assert(mapNameDesc.value === "Map");
+assert(mapNameDesc.writable === false);
+assert(mapNameDesc.enumerable === false);
+assert(mapNameDesc.configurable === true);
+
+assert(Map.prototype.name === undefined);