diff --git a/sdk/xtdk/i686/artypes.h b/sdk/xtdk/i686/artypes.h
index 65f7e6f..6386cdb 100644
--- a/sdk/xtdk/i686/artypes.h
+++ b/sdk/xtdk/i686/artypes.h
@@ -92,7 +92,7 @@ typedef enum _CPU_VENDOR
 } CPU_VENDOR, *PCPU_VENDOR;
 
 /* CPUID extended features (0x80000001) enumeration list */
-typedef enum _CPUID_EXTENDED_FEATURES
+typedef enum _CPUID_FEATURES_EXTENDED
 {
     CPUID_FEATURES_ECX_LAHF_SAHF              = 1 << 0,
     CPUID_FEATURES_ECX_CMP_LEGACY             = 1 << 1,
@@ -130,10 +130,10 @@ typedef enum _CPUID_EXTENDED_FEATURES
     CPUID_FEATURES_EDX_LONG_MODE              = 1 << 29,
     CPUID_FEATURES_EDX_3DNOW_EXT              = 1 << 30,
     CPUID_FEATURES_EDX_3DNOW                  = 1 << 31
-} CPUID_EXTENDED_FEATURES, *PCPUID_EXTENDED_FEATURES;
+} CPUID_FEATURES_EXTENDED, *PCPUID_FEATURES_EXTENDED;
 
 /* CPUID STD1 features (0x00000001) enumeration list */
-typedef enum _CPUID_STANDARD1_FEATURES
+typedef enum _CPUID_FEATURES_STANDARD1
 {
     CPUID_FEATURES_ECX_SSE3                   = 1 << 0,
     CPUID_FEATURES_ECX_PCLMUL                 = 1 << 1,
@@ -196,10 +196,10 @@ typedef enum _CPUID_STANDARD1_FEATURES
     CPUID_FEATURES_EDX_TM                     = 1 << 29,
     CPUID_FEATURES_EDX_IA64                   = 1 << 30,
     CPUID_FEATURES_EDX_PBE                    = 1 << 31
-} CPUID_STANDARD1_FEATURES, *PCPUID_STANDARD1_FEATURES;
+} CPUID_FEATURES_STANDARD1, *PCPUID_FEATURES_STANDARD1;
 
 /* CPUID STD7 features (0x00000007, subleaf 0) enumeration list */
-typedef enum _CPUID_STANDARD7_LEAF0_FEATURES
+typedef enum _CPUID_FEATURES_STANDARD7_LEAF0
 {
     CPUID_FEATURES_EBX_FSGSBASE               = 1 << 0,
     CPUID_FEATURES_EBX_TSC_ADJUST             = 1 << 1,
@@ -283,10 +283,10 @@ typedef enum _CPUID_STANDARD7_LEAF0_FEATURES
     CPUID_FEATURES_EDX_ARCH_CAPABILITIES_MSR  = 1 << 29,
     CPUID_FEATURES_EDX_CORE_CAPABILITIES_MSR  = 1 << 30,
     CPUID_FEATURES_EDX_SCA_SSBD               = 1 << 31
-} CPUID_STANDARD7_LEAF0_FEATURES, *PCPUID_STANDARD7_LEAF0_FEATURES;
+} CPUID_FEATURES_STANDARD7_LEAF0, *PCPUID_FEATURES_STANDARD7_LEAF0;
 
 /* CPUID STD7 features (0x00000007, subleaf 1) enumeration list */
-typedef enum _CPUID_STANDARD7_LEAF1_FEATURES
+typedef enum _CPUID_FEATURES_STANDARD7_LEAF1
 {
     CPUID_FEATURES_EAX_SHA512                 = 1 << 0,
     CPUID_FEATURES_EAX_SM3                    = 1 << 1,
@@ -327,7 +327,7 @@ typedef enum _CPUID_STANDARD7_LEAF1_FEATURES
     CPUID_FEATURES_EDX_AVX10                  = 1 << 19,
     CPUID_FEATURES_EDX_APX                    = 1 << 21,
     CPUID_FEATURES_EDX_MWAIT_AND_LEAF5        = 1 << 23
-} CPUID_STANDARD7_LEAF1_FEATURES, *PCPUID_STANDARD7_LEAF1_FEATURES;
+} CPUID_FEATURES_STANDARD7_LEAF1, *PCPUID_FEATURES_STANDARD7_LEAF1;
 
 /* CPUID requests */
 typedef enum _CPUID_REQUESTS