diff --git a/xtoskrnl/hl/amd64/runlevel.cc b/xtoskrnl/hl/amd64/runlevel.cc
index 349a83d..8408c39 100644
--- a/xtoskrnl/hl/amd64/runlevel.cc
+++ b/xtoskrnl/hl/amd64/runlevel.cc
@@ -20,7 +20,7 @@ XTFASTCALL
 KRUNLEVEL
 HL::RunLevel::GetRunLevel(VOID)
 {
-    return (KRUNLEVEL)ArReadControlRegister(8);
+    return (KRUNLEVEL)AR::CpuFunc::ReadControlRegister(8);
 }
 
 /**
@@ -37,7 +37,7 @@ XTFASTCALL
 VOID
 HL::RunLevel::SetRunLevel(IN KRUNLEVEL RunLevel)
 {
-    ArWriteControlRegister(8, RunLevel);
+    AR::CpuFunc::WriteControlRegister(8, RunLevel);
 }
 
 /**
diff --git a/xtoskrnl/hl/x86/pic.cc b/xtoskrnl/hl/x86/pic.cc
index 1bc4f49..2d31e2b 100644
--- a/xtoskrnl/hl/x86/pic.cc
+++ b/xtoskrnl/hl/x86/pic.cc
@@ -34,7 +34,7 @@ HL::Pic::CheckX2ApicSupport(VOID)
     CpuRegisters.Edx = 0;
 
     /* Get CPUID */
-    ArCpuId(&CpuRegisters);
+    AR::CpuFunc::CpuId(&CpuRegisters);
 
     /* Check x2APIC status from the CPUID results */
     if(!(CpuRegisters.Ecx & CPUID_FEATURES_ECX_X2APIC))