diff --git a/SConstruct b/SConstruct
index f800d9d..db6e3e0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -211,7 +211,7 @@
 elif 'v8' in env['arch']:
     if 'sve2' in env['arch']:
         env.Append(CXXFLAGS = ['-march=armv8.2-a+sve2+fp16+dotprod'])
-        env.Append(CPPDEFINES = ['SVE2'])
+        env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_SVE2'])
     elif 'sve' in env['arch']:
         env.Append(CXXFLAGS = ['-march=armv8.2-a+sve+fp16+dotprod'])
     elif 'armv8r64' in env['arch']:
@@ -221,10 +221,10 @@
     else:
         env.Append(CXXFLAGS = ['-march=armv8-a'])
 
-    if 'v8.6-a' in env['arch']:
-        env.Append(CPPDEFINES = ['MMLA_INT8', 'V8P6', 'V8P6_BF', 'ARM_COMPUTE_FORCE_BF16'])
+    if 'v8.6-a' in env['arch'] or env['fat_binary']:
+        env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_I8MM', 'ARM_COMPUTE_ENABLE_BF16'])
         if "disable_mmla_fp" not in env['custom_options']:
-            env.Append(CPPDEFINES = ['MMLA_FP32'])
+            env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_SVEF32MM'])
 elif 'x86' in env['arch']:
     if env['estate'] == '32':
         env.Append(CCFLAGS = ['-m32'])
@@ -257,9 +257,9 @@
             prefix = "aarch64-tizen-linux-gnu-"
 
 if 'sve' in env['arch']:
-    env.Append(CXXFLAGS = ['-DENABLE_SVE'])
+    env.Append(CXXFLAGS = ['-DENABLE_SVE', '-DARM_COMPUTE_ENABLE_SVE'])
 else:
-    env.Append(CXXFLAGS = ['-DENABLE_NEON'])
+    env.Append(CXXFLAGS = ['-DENABLE_NEON', '-DARM_COMPUTE_ENABLE_NEON'])
 
 if env['build'] == 'native':
     prefix = ""
@@ -308,8 +308,8 @@
     if env['arch'] != 'armv8.2-a':
         print("Currently fat binary is only supported with armv8.2-a")
         Exit(1)
-    env.Append(CXXFLAGS = ['-DENABLE_SVE'])
-    env.Append(CXXFLAGS = ['-DENABLE_NEON'])
+    env.Append(CXXFLAGS = ['-DENABLE_SVE', '-DARM_COMPUTE_ENABLE_SVE'])
+    env.Append(CXXFLAGS = ['-DENABLE_NEON', '-DARM_COMPUTE_ENABLE_NEON'])
 
 if env['data_type_support']:
     if any(i in env['data_type_support'] for i in ['all', 'fp16']):