diff --git a/lib/system/freertos/CMakeLists.txt b/lib/system/freertos/CMakeLists.txt
index c4f56a46..f0a93e6b 100644
--- a/lib/system/freertos/CMakeLists.txt
+++ b/lib/system/freertos/CMakeLists.txt
@@ -21,10 +21,10 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE})
   add_subdirectory(${PROJECT_MACHINE})
 endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_MACHINE})
 
-if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_r5" OR
+if ("${PROJECT_MACHINE}" STREQUAL "xlnx_a53" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_a72" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_a78" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_r5" OR
     "${PROJECT_MACHINE}" STREQUAL "zynq7")
 add_subdirectory(xlnx)
 endif()
diff --git a/lib/system/generic/CMakeLists.txt b/lib/system/generic/CMakeLists.txt
index 9427635b..1b0a06e0 100644
--- a/lib/system/generic/CMakeLists.txt
+++ b/lib/system/generic/CMakeLists.txt
@@ -17,10 +17,10 @@ collect (PROJECT_LIB_SOURCES irq.c)
 collect (PROJECT_LIB_SOURCES shmem.c)
 collect (PROJECT_LIB_SOURCES time.c)
 
-if ("${PROJECT_MACHINE}" STREQUAL "zynqmp_a53" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_a72" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_a78" OR
-    "${PROJECT_MACHINE}" STREQUAL "zynqmp_r5"  OR
+if ("${PROJECT_MACHINE}" STREQUAL "xlnx_a53" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_a72" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_a78" OR
+    "${PROJECT_MACHINE}" STREQUAL "xlnx_r5"  OR
     "${PROJECT_MACHINE}" STREQUAL "microblaze_generic"  OR
     "${PROJECT_MACHINE}" STREQUAL "zynq7")
   add_subdirectory(xlnx)