diff --git a/Include/Apple/AArch64/AppleCpuType.h b/Include/Apple/AArch64/AppleCpuType.h
index 0a2c9d80..7b690890 100644
--- a/Include/Apple/AArch64/AppleCpuType.h
+++ b/Include/Apple/AArch64/AppleCpuType.h
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef APPLE_CPU_TYPE_H
 #define APPLE_CPU_TYPE_H
 
-#define CURRENT_CPU_TYPE     CpuTypeArm64
-#define CURRENT_CPU_SUBTYPE  CpuSubtypeArm64All
+#define CURRENT_CPU_TYPE     MachCpuTypeArm64
+#define CURRENT_CPU_SUBTYPE  MachCpuSubtypeArm64All
 
 #define APPLE_REMOVABLE_MEDIA_FILE_NAME  APPLE_REMOVABLE_MEDIA_FILE_NAME_AARCH64
 
diff --git a/Include/Apple/Arm/AppleCpuType.h b/Include/Apple/Arm/AppleCpuType.h
index 49ffa865..b6ad0470 100644
--- a/Include/Apple/Arm/AppleCpuType.h
+++ b/Include/Apple/Arm/AppleCpuType.h
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef APPLE_CPU_TYPE_H
 #define APPLE_CPU_TYPE_H
 
-#define CURRENT_CPU_TYPE     CpuTypeArm
-#define CURRENT_CPU_SUBTYPE  CpuSubtypeArmAll
+#define CURRENT_CPU_TYPE     MachCpuTypeArm
+#define CURRENT_CPU_SUBTYPE  MachCpuSubtypeArmAll
 
 #define APPLE_REMOVABLE_MEDIA_FILE_NAME  APPLE_REMOVABLE_MEDIA_FILE_NAME_ARM
 
diff --git a/Include/Apple/Ia32/AppleCpuType.h b/Include/Apple/Ia32/AppleCpuType.h
index 4784dabb..19cdbff9 100644
--- a/Include/Apple/Ia32/AppleCpuType.h
+++ b/Include/Apple/Ia32/AppleCpuType.h
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef APPLE_CPU_TYPE_H
 #define APPLE_CPU_TYPE_H
 
-#define CURRENT_CPU_TYPE     CpuTypeI386
-#define CURRENT_CPU_SUBTYPE  CpuSubtypeX86All
+#define CURRENT_CPU_TYPE     MachCpuTypeI386
+#define CURRENT_CPU_SUBTYPE  MachCpuSubtypeX86All
 
 #define APPLE_REMOVABLE_MEDIA_FILE_NAME  APPLE_REMOVABLE_MEDIA_FILE_NAME_IA32