diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 845ba25af..eeb67f55a 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -72,12 +72,12 @@ project (JerryCore C ASM)
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_MATH_BUILTIN
        CONFIG_ECMA_COMPACT_PROFILE_DISABLE_JSON_BUILTIN)
 
-  # Memory management stress-test mode
-   set(DEFINES_MEM_STRESS_TEST
-       MEM_GC_BEFORE_EACH_ALLOC)
+ # Memory management stress-test mode
+  set(DEFINES_MEM_STRESS_TEST
+      JMEM_GC_BEFORE_EACH_ALLOC)
 
  # Memory statistics
-  set(DEFINES_MEMORY_STATISTICS MEM_STATS)
+  set(DEFINES_MEMORY_STATISTICS JMEM_STATS)
 
  # Valgrind
   set(DEFINES_JERRY_VALGRIND JERRY_VALGRIND)
diff --git a/tools/run-mem-stats-test.sh b/tools/run-mem-stats-test.sh
index 95566168a..487051073 100755
--- a/tools/run-mem-stats-test.sh
+++ b/tools/run-mem-stats-test.sh
@@ -43,7 +43,7 @@ function is_mem_stats_build
   [ -x "$1" ] || fail_msg "Engine '$1' is not executable"
 
   tmpfile=`mktemp`
-  "$1" --mem-stats $tmpfile 2>&1 | grep -- "Ignoring memory statistics option because of '!MEM_STATS' build configuration." 2>&1 > /dev/null
+  "$1" --mem-stats $tmpfile 2>&1 | grep -- "Ignoring memory statistics option because of '!JMEM_STATS' build configuration." 2>&1 > /dev/null
   code=$?
   rm $tmpfile
 
diff --git a/tools/run-perf-test.sh b/tools/run-perf-test.sh
index 49515a5db..8de192b56 100755
--- a/tools/run-perf-test.sh
+++ b/tools/run-perf-test.sh
@@ -32,7 +32,7 @@ function is_mem_stats_build() {
   [ -x "$1" ] || fail_msg "Engine '$1' is not executable"
 
   tmpfile=`mktemp`
-  "$1" --mem-stats $tmpfile 2>&1 | grep -- "Ignoring memory statistics option because of '!MEM_STATS' build configuration." 2>&1 > /dev/null
+  "$1" --mem-stats $tmpfile 2>&1 | grep -- "Ignoring memory statistics option because of '!JMEM_STATS' build configuration." 2>&1 > /dev/null
   code=$?
   rm $tmpfile