diff --git a/cmake/syscheck.cmake b/cmake/syscheck.cmake
index 1ff4a12..70225ad 100644
--- a/cmake/syscheck.cmake
+++ b/cmake/syscheck.cmake
@@ -7,7 +7,8 @@ if (WITH_ZEPHYR)
   if (NOT WITH_ZEPHYR_LIB)
     include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
   endif()
-  if (CONFIG_CPU_CORTEX_M)
-    set (MACHINE "cortexm" CACHE STRING "")
-  endif (CONFIG_CPU_CORTEX_M)
+  if (CONFIG_ARM)
+    set (MACHINE "arm" CACHE STRING "")
+  endif(CONFIG_ARM)
+
 endif (WITH_ZEPHYR)
diff --git a/lib/system/zephyr/cortexm/CMakeLists.txt b/lib/system/zephyr/arm/CMakeLists.txt
similarity index 100%
rename from lib/system/zephyr/cortexm/CMakeLists.txt
rename to lib/system/zephyr/arm/CMakeLists.txt
diff --git a/lib/system/zephyr/cortexm/sys.c b/lib/system/zephyr/arm/sys.c
similarity index 100%
rename from lib/system/zephyr/cortexm/sys.c
rename to lib/system/zephyr/arm/sys.c
diff --git a/lib/system/zephyr/cortexm/sys.h b/lib/system/zephyr/arm/sys.h
similarity index 100%
rename from lib/system/zephyr/cortexm/sys.h
rename to lib/system/zephyr/arm/sys.h