diff --git a/jerry-core/ecma/base/ecma-gc.c b/jerry-core/ecma/base/ecma-gc.c
index 09d7294e42..827c0b5a18 100644
--- a/jerry-core/ecma/base/ecma-gc.c
+++ b/jerry-core/ecma/base/ecma-gc.c
@@ -31,7 +31,7 @@
 #include "vm-defines.h"
 #include "vm-stack.h"
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 #include "ecma-typedarray-object.h"
 #endif
 
@@ -487,7 +487,7 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
           }
           break;
         }
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
         case LIT_MAGIC_STRING_ARRAY_BUFFER_UL:
         {
           ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length;
@@ -495,7 +495,7 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
           ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
           return;
         }
-#endif /* CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
         default:
         {
           JERRY_UNREACHABLE ();
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
index cb919189e7..e534d1b697 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
@@ -24,7 +24,7 @@
 #include "jrt.h"
 #include "jrt-libc-includes.h"
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -138,4 +138,4 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
  * @}
  */
 
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
index 9a2916cd94..961431a027 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
@@ -22,7 +22,7 @@
 #include "ecma-try-catch-macro.h"
 #include "jrt.h"
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 
 #define ECMA_BUILTINS_INTERNAL
 #include "ecma-builtins-internal.h"
@@ -100,4 +100,4 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
  * @}
  */
 
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
index 9598f899cd..5deffb714d 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
@@ -147,11 +147,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 #endif /* !CONFIG_DISABLE_JSON_BUILTIN */
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL,
               ECMA_BUILTIN_ID_ARRAYBUFFER,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 
 #ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL,
@@ -192,7 +192,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
               ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY,
               ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
 
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 /* Routine properties:
  *  (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
 
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
index 4064c58bab..85114bfb56 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
@@ -298,7 +298,7 @@ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER,
          true,
          type_error_thrower)
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 
 /* The ArrayBuffer.prototype object (ES2015 24.1.4) */
 BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE,
@@ -315,7 +315,7 @@ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER,
          true,
          true,
          arraybuffer)
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 
 #ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
 
diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.c b/jerry-core/ecma/operations/ecma-arraybuffer-object.c
index 548c2c3c65..fd72bf03e6 100644
--- a/jerry-core/ecma/operations/ecma-arraybuffer-object.c
+++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.c
@@ -23,7 +23,7 @@
 #include "ecma-helpers.h"
 #include "jmem.h"
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 
 /** \addtogroup ecma ECMA
  * @{
@@ -186,4 +186,4 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
  * @}
  * @}
  */
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
diff --git a/jerry-core/ecma/operations/ecma-arraybuffer-object.h b/jerry-core/ecma/operations/ecma-arraybuffer-object.h
index 66495f8fd2..ab5330b431 100644
--- a/jerry-core/ecma/operations/ecma-arraybuffer-object.h
+++ b/jerry-core/ecma/operations/ecma-arraybuffer-object.h
@@ -16,7 +16,7 @@
 #ifndef ECMA_ARRAYBUFFER_OBJECT_H
 #define ECMA_ARRAYBUFFER_OBJECT_H
 
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 #include "ecma-globals.h"
 
 /** \addtogroup ecma ECMA
@@ -48,5 +48,5 @@ ecma_is_arraybuffer (ecma_value_t val);
  * @}
  */
 
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 #endif /* !ECMA_ARRAYBUFFER_OBJECT_H */
diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c
index d80ac5e5bf..dfbd071bcf 100644
--- a/jerry-core/ecma/operations/ecma-objects.c
+++ b/jerry-core/ecma/operations/ecma-objects.c
@@ -1682,9 +1682,9 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */
 {
 #ifndef JERRY_NDEBUG
   return (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_GLOBAL)
-#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
-#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
+#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
 #ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE)
           || ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE)
diff --git a/jerry-core/profiles/es5.1.profile b/jerry-core/profiles/es5.1.profile
index 453e56be76..2b8b2d4654 100644
--- a/jerry-core/profiles/es5.1.profile
+++ b/jerry-core/profiles/es5.1.profile
@@ -1,3 +1,3 @@
-CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 CONFIG_DISABLE_ES2015_BUILTIN
 CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
diff --git a/jerry-core/profiles/minimal.profile b/jerry-core/profiles/minimal.profile
index 75e8970f42..6f6410efcd 100644
--- a/jerry-core/profiles/minimal.profile
+++ b/jerry-core/profiles/minimal.profile
@@ -1,4 +1,4 @@
-CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
+CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
 CONFIG_DISABLE_ANNEXB_BUILTIN
 CONFIG_DISABLE_ARRAY_BUILTIN
 CONFIG_DISABLE_BOOLEAN_BUILTIN
diff --git a/targets/curie_bsp/setup.py b/targets/curie_bsp/setup.py
index d22ce67d19..cc5a7b4927 100755
--- a/targets/curie_bsp/setup.py
+++ b/targets/curie_bsp/setup.py
@@ -97,7 +97,7 @@ def build_jerry_data(jerry_path):
         '-DCONFIG_DISABLE_DATE_BUILTIN',
         '-DCONFIG_DISABLE_REGEXP_BUILTIN',
         '-DCONFIG_DISABLE_ANNEXB_BUILTIN',
-        '-DCONFIG_DISABLE_ARRAYBUFFER_BUILTIN',
+        '-DCONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN',
         '-DCONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN',
         '-DCONFIG_ECMA_LCACHE_DISABLE',
         '-DCONFIG_ECMA_PROPERTY_HASHMAP_DISABLE',