diff --git a/sdk/xtdk/amd64/ketypes.h b/sdk/xtdk/amd64/ketypes.h
index ee5bcc3..ecbb5f0 100644
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -361,7 +361,7 @@ typedef struct _KSWITCH_FRAME
     ULONG64 P4Home;
     ULONG64 P5Home;
     ULONG MxCsr;
-    KIRQL ApcBypass;
+    KRUNLEVEL ApcBypass;
     UCHAR Reserved[3];
     ULONG64 Rbp;
     ULONG64 Return;
@@ -376,7 +376,7 @@ typedef struct _KTRAP_FRAME
     ULONG64 P4Home;
     ULONG64 P5;
     KPROCESSOR_MODE PreviousMode;
-    KIRQL PreviousIrql;
+    KRUNLEVEL PreviousRunLevel;
     UCHAR FaultIndicator;
     UCHAR ExceptionActive;
     ULONG MxCsr;
@@ -539,7 +539,7 @@ typedef struct _KPROCESSOR_BLOCK
         };
     };
     PKIDTENTRY IdtBase;
-    KIRQL Irql;
+    KRUNLEVEL RunLevel;
     KPROCESSOR_CONTROL_BLOCK Prcb;
     ULONG ContextSwitches;
 } KPROCESSOR_BLOCK, *PKPROCESSOR_BLOCK;
diff --git a/sdk/xtdk/i686/ketypes.h b/sdk/xtdk/i686/ketypes.h
index 7069eb5..7cbe267 100644
--- a/sdk/xtdk/i686/ketypes.h
+++ b/sdk/xtdk/i686/ketypes.h
@@ -470,7 +470,7 @@ typedef struct _KPROCESSOR_BLOCK
     THREAD_INFORMATION_BLOCK ThreadInformationBlock;
     PKPROCESSOR_BLOCK Self;
     PKPROCESSOR_CONTROL_BLOCK CurrentPrcb;
-    KIRQL Irql;
+    KRUNLEVEL RunLevel;
     PKIDTENTRY IdtBase;
     PKGDTENTRY GdtBase;
     PKTSS TssBase;
diff --git a/sdk/xtdk/ketypes.h b/sdk/xtdk/ketypes.h
index e5485ce..b39299b 100644
--- a/sdk/xtdk/ketypes.h
+++ b/sdk/xtdk/ketypes.h
@@ -280,7 +280,7 @@ typedef struct _KSPIN_LOCK_QUEUE
 typedef struct _KLOCK_QUEUE_HANDLE
 {
     KSPIN_LOCK_QUEUE LockQueue;
-    KIRQL OldIrql;
+    KRUNLEVEL OldRunLevel;
 } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
 
 /* Queue object structure definition */
@@ -431,7 +431,7 @@ typedef struct _KTHREAD
     };
     KWAIT_BLOCK WaitBlock[KTHREAD_WAIT_BLOCK + 1];
     UCHAR NpxState;
-    KIRQL WaitIrql;
+    KRUNLEVEL WaitRunLevel;
     LIST_ENTRY QueueListEntry;
     PKTRAP_FRAME TrapFrame;
     PVOID CallbackStack;
diff --git a/sdk/xtdk/xtbase.h b/sdk/xtdk/xtbase.h
index b7f7caf..7ec36e7 100644
--- a/sdk/xtdk/xtbase.h
+++ b/sdk/xtdk/xtbase.h
@@ -17,15 +17,15 @@
 /* Kernel affinity */
 typedef ULONG_PTR KAFFINITY, *PKAFFINITY;
 
-/* Interrupt Request Level (IRQL) */
-typedef UCHAR KIRQL, *PKIRQL;
-
 /* Kernel priority */
 typedef LONG KPRIORITY, *PKPRIORITY;
 
 /* Processor modes */
 typedef CHAR KPROCESSOR_MODE, *PKPROCESSOR_MODE;
 
+/* Interrupt Request Run Level (IRQL) */
+typedef UCHAR KRUNLEVEL, *PKRUNLEVEL;
+
 /* Spin locks synchronization mechanism */
 typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK;
 
diff --git a/xtoskrnl/ar/amd64/procsup.c b/xtoskrnl/ar/amd64/procsup.c
index 5c165ec..417368e 100644
--- a/xtoskrnl/ar/amd64/procsup.c
+++ b/xtoskrnl/ar/amd64/procsup.c
@@ -56,7 +56,7 @@ ArInitializeProcessor(VOID)
     ArLoadTaskRegister((UINT)KGDT_SYS_TSS);
 
     /* Enter passive IRQ level */
-    ProcessorBlock->Irql = PASSIVE_LEVEL;
+    ProcessorBlock->RunLevel = PASSIVE_LEVEL;
     ArWriteControlRegister(8, PASSIVE_LEVEL);
 
     /* Initialize segment registers */
diff --git a/xtoskrnl/ar/i686/procsup.c b/xtoskrnl/ar/i686/procsup.c
index 77d258e..99856cd 100644
--- a/xtoskrnl/ar/i686/procsup.c
+++ b/xtoskrnl/ar/i686/procsup.c
@@ -56,7 +56,7 @@ ArInitializeProcessor(VOID)
     ArLoadTaskRegister((UINT)KGDT_SYS_TSS);
 
     /* Enter passive IRQ level */
-    ProcessorBlock->Irql = PASSIVE_LEVEL;
+    ProcessorBlock->RunLevel = PASSIVE_LEVEL;
 
     /* Initialize segment registers */
     ArpInitializeSegments();
diff --git a/xtoskrnl/ke/amd64/krnlinit.c b/xtoskrnl/ke/amd64/krnlinit.c
index 429fe26..e09923b 100644
--- a/xtoskrnl/ke/amd64/krnlinit.c
+++ b/xtoskrnl/ke/amd64/krnlinit.c
@@ -51,7 +51,7 @@ KepInitializeKernel(VOID)
     CurrentThread->Priority = THREAD_HIGH_PRIORITY;
     CurrentThread->State = Running;
     CurrentThread->Affinity = (ULONG_PTR)1 << Prcb->Number;
-    CurrentThread->WaitIrql = DISPATCH_LEVEL;
+    CurrentThread->WaitRunLevel = DISPATCH_LEVEL;
     CurrentProcess->ActiveProcessors |= (ULONG_PTR)1 << Prcb->Number;
 }
 
diff --git a/xtoskrnl/ke/i686/krnlinit.c b/xtoskrnl/ke/i686/krnlinit.c
index 604079c..faefae0 100644
--- a/xtoskrnl/ke/i686/krnlinit.c
+++ b/xtoskrnl/ke/i686/krnlinit.c
@@ -51,7 +51,7 @@ KepInitializeKernel(VOID)
     CurrentThread->Priority = THREAD_HIGH_PRIORITY;
     CurrentThread->State = Running;
     CurrentThread->Affinity = (ULONG_PTR)1 << Prcb->Number;
-    CurrentThread->WaitIrql = DISPATCH_LEVEL;
+    CurrentThread->WaitRunLevel = DISPATCH_LEVEL;
     CurrentProcess->ActiveProcessors |= (ULONG_PTR)1 << Prcb->Number;
 }