kernel: breaking: Change namespace from NeOS to Kernel.

sched: Fix redundancy in NeKernel's user scheduler macros, refactored
the other files using the redundant macros too.

part one of a series of commit for NeKernel.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

25 files changed, 167 insertions, 167 deletions

diff --git a/dev/kernel/HALKit/AMD64/CPUID.h b/dev/kernel/HALKit/AMD64/CPUID.h
index 6ea84106..c9a887bc 100644
--- a/dev/kernel/HALKit/AMD64/CPUID.h
+++ b/dev/kernel/HALKit/AMD64/CPUID.h
@@ -15,7 +15,7 @@
 
 #include <NewKit/Defines.h>
 
-namespace NeOS
+namespace Kernel
 {
 
 	enum
@@ -84,4 +84,4 @@ namespace NeOS
 	};
 
 	typedef Int64 CPUID;
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
index f327dc3f..0b933a6a 100644
--- a/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
+++ b/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
@@ -10,7 +10,7 @@
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/MemoryMgr.h>
 
-namespace NeOS
+namespace Kernel
 {
 	namespace Detail
 	{
@@ -119,4 +119,4 @@ namespace NeOS
 					 "jmp reset_wait ; "
 					 ".att_syntax; ");
 	}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalAPICController.cc b/dev/kernel/HALKit/AMD64/HalAPICController.cc
index a4de5091..1d1fd46b 100644
--- a/dev/kernel/HALKit/AMD64/HalAPICController.cc
+++ b/dev/kernel/HALKit/AMD64/HalAPICController.cc
@@ -10,7 +10,7 @@
 #define cIOAPICRegVal (4)
 #define cIOAPICRegReg (0)
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	APICController::APICController(VoidPtr base)
 		: fApic(base)
@@ -41,4 +41,4 @@ namespace NeOS::HAL
 		io_apic[cIOAPICRegReg] = (reg & 0xFF);
 		io_apic[cIOAPICRegVal] = value;
 	}
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
index 5880cc7c..3d0cee00 100644
--- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
@@ -34,7 +34,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	struct PROCESS_APIC_MADT;
 	struct PROCESS_CONTROL_BLOCK;
@@ -118,10 +118,10 @@ namespace NeOS::HAL
 
 	Void hal_send_start_ipi(UInt32 target, UInt32 apic_id)
 	{
-		NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24);
-		NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000);
+		Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24);
+		Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000);
 
-		while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000)
+		while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000)
 		{
 			;
 		}
@@ -136,10 +136,10 @@ namespace NeOS::HAL
 	/***********************************************************************************/
 	Void hal_send_sipi(UInt32 target, UInt32 apic_id, UInt8 vector)
 	{
-		NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24);
-		NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector);
+		Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24);
+		Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector);
 
-		while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000)
+		while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000)
 		{
 			NE_UNUSED(0);
 		}
@@ -239,7 +239,7 @@ namespace NeOS::HAL
 
 					hal_send_start_ipi(kApicBaseAddress, kAPICLocales[kSMPCount]);
 
-					HardwareTimer timer(NeOS::rtl_ms(10));
+					HardwareTimer timer(Kernel::rtl_ms(10));
 					timer.Wait();
 
 					/// TODO: HAL helper to create an address.
@@ -266,6 +266,6 @@ namespace NeOS::HAL
 			/// TODO: Notify Boot AP that it must start.
 		}
 	}
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index cc8a06ea..b1fa95a4 100644
--- a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
@@ -13,11 +13,11 @@ STATIC BOOL kIsScheduling = NO;
 
 /// @brief Handle GPF fault.
 /// @param rsp
-EXTERN_C void idt_handle_gpf(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
 	kIsScheduling = NO;
@@ -30,18 +30,18 @@ EXTERN_C void idt_handle_gpf(NeOS::UIntPtr rsp)
 
 	kout << "Kernel: SIGKILL status.\r";
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kKilled;
+	process.Leak().Status = Kernel::ProcessStatusKind::kKilled;
 
 	process.Leak().Crash();
 }
 
 /// @brief Handle page fault.
 /// @param rsp
-EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
 	kIsScheduling = NO;
@@ -53,20 +53,20 @@ EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp)
 	process.Leak().ProcessSignal.SignalID		= SIGKILL;
 	process.Leak().ProcessSignal.PreviousStatus = process.Leak().Status;
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kKilled;
+	process.Leak().Status = Kernel::ProcessStatusKind::kKilled;
 
 	process.Leak().Crash();
 }
 
-namespace NeOS::Detail
+namespace Kernel::Detail
 {
 	constexpr static Int32 kTimeoutCount = 100000UL;
 }
 
 /// @brief Handle scheduler interrupt.
-EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp)
 {
-	static NeOS::Int64 try_count_before_brute = NeOS::Detail::kTimeoutCount;
+	static Kernel::Int64 try_count_before_brute = Kernel::Detail::kTimeoutCount;
 
 	while (kIsScheduling)
 	{
@@ -76,21 +76,21 @@ EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp)
 			break;
 	}
 
-	try_count_before_brute = NeOS::Detail::kTimeoutCount;
+	try_count_before_brute = Kernel::Detail::kTimeoutCount;
 	kIsScheduling		   = YES;
 
-	NeOS::UserProcessHelper::StartScheduling();
+	Kernel::UserProcessHelper::StartScheduling();
 
 	kIsScheduling = NO;
 }
 
 /// @brief Handle math fault.
 /// @param rsp
-EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
 	kIsScheduling = NO;
@@ -103,18 +103,18 @@ EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp)
 
 	kout << "Kernel: SIGKILL status.\r";
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kKilled;
+	process.Leak().Status = Kernel::ProcessStatusKind::kKilled;
 
 	process.Leak().Crash();
 }
 
 /// @brief Handle any generic fault.
 /// @param rsp
-EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 	{
 		kout << "Getting here.\r";
 		return;
@@ -130,16 +130,16 @@ EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp)
 
 	kout << "Kernel: SIGKILL status.\r";
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kKilled;
+	process.Leak().Status = Kernel::ProcessStatusKind::kKilled;
 
 	process.Leak().Crash();
 }
 
-EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip)
+EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 	{
 		kout << "Kernel: SIGTRAP\r";
 
@@ -149,7 +149,7 @@ EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip)
 
 	kIsScheduling = NO;
 
-	kout << "Kernel: Process RIP: " << NeOS::hex_number(rip) << kendl;
+	kout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << kendl;
 	kout << "Kernel: SIGTRAP\r";
 
 	process.Leak().ProcessSignal.SignalArg = rip;
@@ -159,16 +159,16 @@ EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip)
 
 	kout << "Kernel: SIGTRAP status.\r";
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kFrozen;
+	process.Leak().Status = Kernel::ProcessStatusKind::kFrozen;
 }
 
 /// @brief Handle #UD fault.
 /// @param rsp
-EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp)
+EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp)
 {
-	auto process = NeOS::UserProcessScheduler::The().CurrentProcess();
+	auto process = Kernel::UserProcessScheduler::The().CurrentProcess();
 
-	if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning)
+	if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning)
 		return;
 
 	kIsScheduling = NO;
@@ -181,7 +181,7 @@ EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp)
 
 	kout << "Kernel: SIGKILL status.\r";
 
-	process.Leak().Status = NeOS::ProcessStatusKind::kKilled;
+	process.Leak().Status = Kernel::ProcessStatusKind::kKilled;
 
 	process.Leak().Crash();
 }
@@ -189,7 +189,7 @@ EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp)
 /// @brief Enter syscall from assembly.
 /// @param stack the stack pushed from assembly routine.
 /// @return nothing.
-EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS::UIntPtr rdx_syscall_struct)
+EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, Kernel::UIntPtr rdx_syscall_struct)
 {
 	if (rcx_syscall_index < kSyscalls.Count())
 	{
@@ -199,7 +199,7 @@ EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS:
 		{
 			if (kSyscalls[rcx_syscall_index].fProc)
 			{
-				(kSyscalls[rcx_syscall_index].fProc)((NeOS::VoidPtr)rdx_syscall_struct);
+				(kSyscalls[rcx_syscall_index].fProc)((Kernel::VoidPtr)rdx_syscall_struct);
 			}
 			else
 			{
@@ -218,7 +218,7 @@ EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS:
 /// @brief Enter Kernel call from assembly (DDK only).
 /// @param stack the stack pushed from assembly routine.
 /// @return nothing.
-EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS::UIntPtr rdx_kerncall_struct)
+EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, Kernel::UIntPtr rdx_kerncall_struct)
 {
 	if (rcx_kerncall_index < kKerncalls.Count())
 	{
@@ -228,7 +228,7 @@ EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS
 		{
 			if (kKerncalls[rcx_kerncall_index].fProc)
 			{
-				(kKerncalls[rcx_kerncall_index].fProc)((NeOS::VoidPtr)rdx_kerncall_struct);
+				(kKerncalls[rcx_kerncall_index].fProc)((Kernel::VoidPtr)rdx_kerncall_struct);
 			}
 			else
 			{
diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
index 2bc89a5e..1aab95aa 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
@@ -11,7 +11,7 @@
 #include <modules/CoreGfx/FBMgr.h>
 #include <modules/CoreGfx/TextMgr.h>
 
-namespace NeOS
+namespace Kernel
 {
 	enum CommStatus : UInt16
 	{
@@ -183,8 +183,8 @@ namespace NeOS
 
 	TerminalDevice TerminalDevice::The() noexcept
 	{
-		TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read);
+		TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read);
 		return out;
 	}
 
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalDebugPort.cc b/dev/kernel/HALKit/AMD64/HalDebugPort.cc
index 7eada646..4cdd8e37 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugPort.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugPort.cc
@@ -12,7 +12,7 @@
 
 // after that we have start of additional data.
 
-namespace NeOS
+namespace Kernel
 {
 	void rt_debug_listen(DebuggerPortHeader* theHook) noexcept
 	{
@@ -39,4 +39,4 @@ namespace NeOS
 			HAL::rt_wait_400ns();
 		}
 	}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
index 154b11af..a83ed2e5 100644
--- a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
+++ b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
@@ -9,11 +9,11 @@
 
 #define kPITDefaultTicks (1000U)
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	namespace Detail
 	{
-		STATIC ::NeOS::Detail::AMD64::InterruptDescriptorAMD64
+		STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64
 			kInterruptVectorTable[kKernelIdtSize] = {};
 
 		STATIC void hal_set_irq_mask(UInt8 irql);
@@ -88,7 +88,7 @@ namespace NeOS::HAL
 
 		const Int16 kPITTickForScheduler = kPITDefaultTicks;
 
-		volatile ::NeOS::UIntPtr** ptr_ivt = (volatile ::NeOS::UIntPtr**)idt.Base;
+		volatile ::Kernel::UIntPtr** ptr_ivt = (volatile ::Kernel::UIntPtr**)idt.Base;
 
 		for (SizeT idt_indx = 0; idt_indx < kKernelIdtSize; ++idt_indx)
 		{
@@ -104,7 +104,7 @@ namespace NeOS::HAL
 		}
 
 		idt.Base  = (UIntPtr)&Detail::kInterruptVectorTable[0];
-		idt.Limit = sizeof(::NeOS::Detail::AMD64::InterruptDescriptorAMD64) *
+		idt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) *
 					(kKernelIdtSize);
 
 		hal_load_idt(idt);
@@ -123,4 +123,4 @@ namespace NeOS::HAL
 	{
 		IDTLoader::Load(idt.Leak());
 	}
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index 543e267b..fadb37e4 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -14,33 +14,33 @@
 #include <CFKit/Property.h>
 #include <modules/CoreGfx/TextMgr.h>
 
-EXTERN_C NeOS::VoidPtr kInterruptVectorTable[];
-EXTERN_C NeOS::VoidPtr mp_user_switch_proc;
-EXTERN_C NeOS::Char mp_user_switch_proc_stack_begin[];
+EXTERN_C Kernel::VoidPtr kInterruptVectorTable[];
+EXTERN_C Kernel::VoidPtr mp_user_switch_proc;
+EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[];
 
-STATIC NeOS::Void hal_init_scheduler_team()
+STATIC Kernel::Void hal_init_scheduler_team()
 {
-	for (NeOS::SizeT i = 0U; i < NeOS::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i)
+	for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i)
 	{
-		NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i]		= NeOS::UserProcess();
-		NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = NeOS::ProcessStatusKind::kKilled;
+		Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i]		= Kernel::UserProcess();
+		Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled;
 	}
 }
 
-STATIC NeOS::UInt64 hal_rdtsc_fn()
+STATIC Kernel::UInt64 hal_rdtsc_fn()
 {
-	NeOS::UInt32 lo, hi;
+	Kernel::UInt32 lo, hi;
 	__asm__ volatile("rdtsc"
 					 : "=a"(lo), "=d"(hi));
 
-	return ((NeOS::UInt64)hi << 32) | lo;
+	return ((Kernel::UInt64)hi << 32) | lo;
 }
 
-STATIC NeOS::UInt64 kStartTim, kEndTim;
+STATIC Kernel::UInt64 kStartTim, kEndTim;
 
 /// @brief Kernel init procedure.
 EXTERN_C void hal_init_platform(
-	NeOS::HEL::BootInfoHeader* handover_hdr)
+	Kernel::HEL::BootInfoHeader* handover_hdr)
 {
 	kStartTim = hal_rdtsc_fn();
 
@@ -59,8 +59,8 @@ EXTERN_C void hal_init_platform(
 	/************************************** */
 
 	kKernelBitMpSize  = kHandoverHeader->f_BitMapSize;
-	kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>(
-		reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart));
+	kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>(
+		reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart));
 
 	/************************************** */
 	/*     INITIALIZE GDT AND SEGMENTS. */
@@ -69,7 +69,7 @@ EXTERN_C void hal_init_platform(
 	STATIC CONST auto kGDTEntriesCount = 6;
 
 	/* GDT, mostly descriptors for user and kernel segments. */
-	STATIC NeOS::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = {
+	STATIC Kernel::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = {
 		{.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0},   // Null entry
 		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code
 		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data
@@ -78,35 +78,35 @@ EXTERN_C void hal_init_platform(
 	};
 
 	// Load memory descriptors.
-	NeOS::HAL::RegisterGDT gdt_reg;
+	Kernel::HAL::RegisterGDT gdt_reg;
 
-	gdt_reg.Base  = reinterpret_cast<NeOS::UIntPtr>(kGDTArray);
-	gdt_reg.Limit = (sizeof(NeOS::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1;
+	gdt_reg.Base  = reinterpret_cast<Kernel::UIntPtr>(kGDTArray);
+	gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1;
 
 	FB::fb_clear_video();
 
 	//! GDT will load hal_read_init after it successfully loads the segments.
-	NeOS::HAL::GDTLoader gdt_loader;
+	Kernel::HAL::GDTLoader gdt_loader;
 	gdt_loader.Load(gdt_reg);
 
-	NeOS::ke_panic(RUNTIME_CHECK_BOOTSTRAP);
+	Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP);
 }
 
-EXTERN_C NeOS::Void hal_real_init(NeOS::Void) noexcept
+EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept
 {
-	NeOS::NeFS::fs_init_nefs();
+	Kernel::NeFS::fs_init_nefs();
 
-	NeOS::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr);
+	Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr);
 
-	NeOS::HAL::Register64 idt_reg;
+	Kernel::HAL::Register64 idt_reg;
 
-	idt_reg.Base = (NeOS::UIntPtr)kInterruptVectorTable;
+	idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable;
 
-	NeOS::HAL::IDTLoader idt_loader;
+	Kernel::HAL::IDTLoader idt_loader;
 
 	kEndTim = hal_rdtsc_fn();
 
-	kout << "Cycles Spent Before Userland: " << NeOS::number(kEndTim - kStartTim) << kendl;
+	kout << "Cycles Spent Before Userland: " << Kernel::number(kEndTim - kStartTim) << kendl;
 
 	idt_loader.Load(idt_reg);
 
diff --git a/dev/kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
index f0595903..adf510e1 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
@@ -18,7 +18,7 @@
 /* Each error code is attributed with an ID, which will prompt a string onto the
  * screen. Wait for debugger... */
 
-namespace NeOS
+namespace Kernel
 {
 	/// @brief Dumping factory class.
 	class RecoveryFactory final
@@ -31,7 +31,7 @@ namespace NeOS
 	/// @brief Stops execution of the kernel.
 	/// @param id kernel stop ID.
 	/***********************************************************************************/
-	Void ke_panic(const NeOS::Int32& id, const Char* message)
+	Void ke_panic(const Kernel::Int32& id, const Char* message)
 	{
 		fb_init();
 
@@ -65,4 +65,4 @@ namespace NeOS
 			ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed
 		}
 	}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
index fe9f0421..884d7c9e 100644
--- a/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
@@ -10,7 +10,7 @@
 #include <HALKit/AMD64/Paging.h>
 #include <HALKit/AMD64/Processor.h>
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	typedef UInt32 PageTableIndex;
 
@@ -201,4 +201,4 @@ namespace NeOS::HAL
 
 		return 0;
 	}
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
diff --git a/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc
index b3da8352..b3cf8d09 100644
--- a/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc
@@ -15,7 +15,7 @@
  * @brief Common CPU API.
  */
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	Void lrt_out8(UInt16 port, UInt8 value)
 	{
@@ -98,4 +98,4 @@ namespace NeOS::HAL
 	{
 		asm volatile("std");
 	}
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
diff --git a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
index bf4b9d91..6b287060 100644
--- a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
@@ -7,7 +7,7 @@
 #include <HALKit/AMD64/Processor.h>
 #include <KernelKit/UserProcessScheduler.h>
 
-namespace NeOS
+namespace Kernel
 {
 	/***********************************************************************************/
 	/// @brief Unimplemented function (crashes by default)
@@ -37,7 +37,7 @@ namespace NeOS
 	/// Wakes up thread from the hang state.
 	Void mp_wakeup_thread(HAL::StackFrame* stack)
 	{
-		NeOS::UserProcessHelper::StartScheduling();
+		Kernel::UserProcessHelper::StartScheduling();
 	}
 
 	/// @brief makes the thread sleep on a loop.
@@ -49,4 +49,4 @@ namespace NeOS
 			/* Nothing to do, code is spinning */
 		}
 	}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc
index 53386d36..55e92dfe 100644
--- a/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc
@@ -26,24 +26,24 @@
 ///! @file HalTimer.cc

 ///! @brief Hardware Timer (HPET)

 

-namespace NeOS::Detail

+namespace Kernel::Detail

 {

-	struct HPET_BLOCK : public NeOS::SDT

+	struct HPET_BLOCK : public Kernel::SDT

 	{

-		NeOS::UInt8	 hardware_rev_id;

-		NeOS::UInt8	 comparator_count : 5;

-		NeOS::UInt8	 counter_size : 1;

-		NeOS::UInt8	 reserved : 1;

-		NeOS::UInt8	 legacy_replacement : 1;

-		NeOS::UInt16 pci_vendor_id;

+		Kernel::UInt8	 hardware_rev_id;

+		Kernel::UInt8	 comparator_count : 5;

+		Kernel::UInt8	 counter_size : 1;

+		Kernel::UInt8	 reserved : 1;

+		Kernel::UInt8	 legacy_replacement : 1;

+		Kernel::UInt16 pci_vendor_id;

 		ACPI_ADDRESS address;

-		NeOS::UInt8	 hpet_number;

-		NeOS::UInt16 minimum_tick;

-		NeOS::UInt8	 page_protection;

+		Kernel::UInt8	 hpet_number;

+		Kernel::UInt16 minimum_tick;

+		Kernel::UInt8	 page_protection;

 	} PACKED;

-} // namespace NeOS::Detail

+} // namespace Kernel::Detail

 

-using namespace NeOS;

+using namespace Kernel;

 

 HardwareTimer::HardwareTimer(Int64 ms)

 	: fWaitFor(ms)

diff --git a/dev/kernel/HALKit/AMD64/Hypervisor.h b/dev/kernel/HALKit/AMD64/Hypervisor.h
index 4c226eee..05539c06 100644
--- a/dev/kernel/HALKit/AMD64/Hypervisor.h
+++ b/dev/kernel/HALKit/AMD64/Hypervisor.h
@@ -8,7 +8,7 @@
 
 #include <NewKit/Defines.h>
 
-namespace NeOS
+namespace Kernel
 {
 	MAKE_STRING_ENUM(HYPERVISOR)
 	ENUM_STRING(Qemu, "TCGTCGTCGTCG");
@@ -22,4 +22,4 @@ namespace NeOS
 	ENUM_STRING(Bhyve, "bhyve bhyve ");
 	ENUM_STRING(Qnx, " QNXQVMBSQG ");
 	END_STRING_ENUM()
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/PCI/DMA.cc b/dev/kernel/HALKit/AMD64/PCI/DMA.cc
index c756a572..290030cf 100644
--- a/dev/kernel/HALKit/AMD64/PCI/DMA.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/DMA.cc
@@ -6,7 +6,7 @@
 
 #include <KernelKit/PCI/DMA.h>
 
-namespace NeOS
+namespace Kernel
 {
 	DMAWrapper::operator bool()
 	{
@@ -84,4 +84,4 @@ namespace NeOS
 		this->fAddress = Ptr;
 		return *this;
 	}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/PCI/Database.cc b/dev/kernel/HALKit/AMD64/PCI/Database.cc
index c5aa1282..17bbfe57 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Database.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Database.cc
@@ -6,6 +6,6 @@
 
 #include <KernelKit/PCI/Database.h>
 
-namespace NeOS
+namespace Kernel
 {
 }
diff --git a/dev/kernel/HALKit/AMD64/PCI/Device.cc b/dev/kernel/HALKit/AMD64/PCI/Device.cc
index 348e058a..553ffad4 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Device.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Device.cc
@@ -12,33 +12,33 @@
 #define PCI_BAR_64		 0x04
 #define PCI_BAR_PREFETCH 0x08
 
-NeOS::UInt NE_PCIReadRaw(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun)
+Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
 {
-	NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) |
-						((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) |
+	Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
+						((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
 						(bar & 0xFC);
 
-	NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress,
+	Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress,
 						target);
 
-	NeOS::HAL::rt_wait_400ns();
+	Kernel::HAL::rt_wait_400ns();
 
-	return NeOS::HAL::rt_in32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigData);
+	return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData);
 }
 
-void NE_PCISetCfgTarget(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun)
+void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
 {
-	NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) |
-						((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) |
+	Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
+						((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
 						(bar & 0xFC);
 
-	NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress,
+	Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress,
 						target);
 
-	NeOS::HAL::rt_wait_400ns();
+	Kernel::HAL::rt_wait_400ns();
 }
 
-namespace NeOS::PCI
+namespace Kernel::PCI
 {
 	Device::Device(UShort bus, UShort device, UShort func, UInt32 bar)
 		: fBus(bus), fDevice(device), fFunction(func), fBar(bar)
@@ -168,4 +168,4 @@ namespace NeOS::PCI
 	{
 		return VendorId() != (UShort)PciConfigKind::Invalid;
 	}
-} // namespace NeOS::PCI
+} // namespace Kernel::PCI
diff --git a/dev/kernel/HALKit/AMD64/PCI/Express.cc b/dev/kernel/HALKit/AMD64/PCI/Express.cc
index 487cbd39..341d2e69 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Express.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Express.cc
@@ -6,6 +6,6 @@
 
 #include <KernelKit/PCI/Express.h>
 
-namespace NeOS
+namespace Kernel
 {
 }
diff --git a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
index bf215fe2..d8020ebc 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
@@ -6,7 +6,7 @@
 
 #include <KernelKit/PCI/Iterator.h>
 
-namespace NeOS::PCI
+namespace Kernel::PCI
 {
 	Iterator::Iterator(const Types::PciDeviceKind& type)
 	{
@@ -36,4 +36,4 @@ namespace NeOS::PCI
 	{
 		return fDevices[at];
 	}
-} // namespace NeOS::PCI
+} // namespace Kernel::PCI
diff --git a/dev/kernel/HALKit/AMD64/Paging.h b/dev/kernel/HALKit/AMD64/Paging.h
index 09b6ade3..4084e86a 100644
--- a/dev/kernel/HALKit/AMD64/Paging.h
+++ b/dev/kernel/HALKit/AMD64/Paging.h
@@ -31,15 +31,15 @@
 #endif // !kAlign
 
 EXTERN_C void hal_flush_tlb();
-EXTERN_C void hal_invl_tlb(NeOS::VoidPtr addr);
-EXTERN_C void hal_write_cr3(NeOS::VoidPtr cr3);
-EXTERN_C void hal_write_cr0(NeOS::VoidPtr bit);
+EXTERN_C void hal_invl_tlb(Kernel::VoidPtr addr);
+EXTERN_C void hal_write_cr3(Kernel::VoidPtr cr3);
+EXTERN_C void hal_write_cr0(Kernel::VoidPtr bit);
 
-EXTERN_C NeOS::VoidPtr hal_read_cr0(); // @brief CPU control register.
-EXTERN_C NeOS::VoidPtr hal_read_cr2(); // @brief Fault address.
-EXTERN_C NeOS::VoidPtr hal_read_cr3(); // @brief Page table.
+EXTERN_C Kernel::VoidPtr hal_read_cr0(); // @brief CPU control register.
+EXTERN_C Kernel::VoidPtr hal_read_cr2(); // @brief Fault address.
+EXTERN_C Kernel::VoidPtr hal_read_cr3(); // @brief Page table.
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	/// @brief Final page entry (Not PML, PDPT)
 	struct PACKED NE_PTE final
@@ -90,10 +90,10 @@ namespace NeOS::HAL
 
 	auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page, const SizeT pad = 0) -> VoidPtr;
 	auto mm_free_bitmap(VoidPtr page_ptr) -> Bool;
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
 
-namespace NeOS
+namespace Kernel
 {
 	typedef HAL::NE_PTE PTE;
 	typedef HAL::NE_PDE PDE;
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/AMD64/Processor.h b/dev/kernel/HALKit/AMD64/Processor.h
index d223c320..83fde9ba 100644
--- a/dev/kernel/HALKit/AMD64/Processor.h
+++ b/dev/kernel/HALKit/AMD64/Processor.h
@@ -49,7 +49,7 @@ EXTERN_C
 #define kTaskGate	   (0b10001100)
 #define kIDTSelector   (0x08)
 
-namespace NeOS
+namespace Kernel
 {
 	namespace Detail::AMD64
 	{
@@ -64,9 +64,9 @@ namespace NeOS
 			UInt32 Zero; // reserved
 		};
 	} // namespace Detail::AMD64
-} // namespace NeOS
+} // namespace Kernel
 
-namespace NeOS::HAL
+namespace Kernel::HAL
 {
 	/// @brief Memory Manager mapping flags.
 	enum
@@ -312,15 +312,15 @@ namespace NeOS::HAL
 	EXTERN_C Void rt_sti();
 	EXTERN_C Void rt_cld();
 	EXTERN_C Void rt_std();
-} // namespace NeOS::HAL
+} // namespace Kernel::HAL
 
-EXTERN_C NeOS::Void idt_handle_generic(NeOS::UIntPtr rsp);
-EXTERN_C NeOS::Void idt_handle_gpf(NeOS::UIntPtr rsp);
-EXTERN_C NeOS::Void idt_handle_math(NeOS::UIntPtr rsp);
-EXTERN_C NeOS::Void idt_handle_pf(NeOS::UIntPtr rsp);
+EXTERN_C Kernel::Void idt_handle_generic(Kernel::UIntPtr rsp);
+EXTERN_C Kernel::Void idt_handle_gpf(Kernel::UIntPtr rsp);
+EXTERN_C Kernel::Void idt_handle_math(Kernel::UIntPtr rsp);
+EXTERN_C Kernel::Void idt_handle_pf(Kernel::UIntPtr rsp);
 
-EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_idt(NeOS::HAL::Register64 ptr);
-EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_gdt(NeOS::HAL::RegisterGDT ptr);
+EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_idt(Kernel::HAL::Register64 ptr);
+EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_gdt(Kernel::HAL::RegisterGDT ptr);
 
-inline NeOS::VoidPtr kKernelBitMpStart = nullptr;
-inline NeOS::UIntPtr kKernelBitMpSize  = 0UL;
+inline Kernel::VoidPtr kKernelBitMpStart = nullptr;
+inline Kernel::UIntPtr kKernelBitMpSize  = 0UL;
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
index c941d2ba..318327f8 100644
--- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
@@ -53,7 +53,7 @@
 #define kSATASubClass	(0x06)
 #define kSATABar5		(0x24)
 
-using namespace NeOS;
+using namespace Kernel;
 
 STATIC PCI::Device kSATADev;
 STATIC HbaMemRef   kSATAHba;
@@ -386,7 +386,7 @@ Bool drv_std_detected_ahci()
 	return kSATADev.DeviceId() != (UShort)PCI::PciConfigKind::Invalid && kSATADev.Bar(kSATABar5) != 0;
 }
 
-namespace NeOS
+namespace Kernel
 {
 	/// @brief Initialize an AHCI device (StorageKit)
 	UInt16 sk_init_ahci_device(BOOL atapi)
@@ -464,7 +464,7 @@ namespace NeOS
 
 		return ErrorOr<AHCIDeviceInterface>(device);
 	}
-} // namespace NeOS
+} // namespace Kernel
 
 // ================================================================================================
 
diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
index 9624ea5b..261643fc 100644
--- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
@@ -23,15 +23,15 @@
 
 #define kATADataLen (256)
 
-using namespace NeOS;
-using namespace NeOS::HAL;
+using namespace Kernel;
+using namespace Kernel::HAL;
 
 /// BUGS: 0
 
 STATIC Boolean kATADetected			 = false;
 STATIC Int32   kATADeviceType		 = kATADeviceCount;
 STATIC Char	   kATAData[kATADataLen] = {0};
-STATIC NeOS::PCI::Device kATADevice;
+STATIC Kernel::PCI::Device kATADevice;
 STATIC Char				 kCurrentDiskModel[50] = {"UNKNOWN DMA DRIVE"};
 
 Boolean drv_std_wait_io(UInt16 IO)
@@ -105,7 +105,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster)
 			for (SizeT i = 0ul; i < kATADataLen; ++i)
 			{
 				drv_std_wait_io(IO);
-				kATAData[i] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA);
+				kATAData[i] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA);
 				drv_std_wait_io(IO);
 			}
 
@@ -131,7 +131,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster)
 	return NO;
 }
 
-namespace NeOS::Detail
+namespace Kernel::Detail
 {
 	struct PRDEntry
 	{
@@ -139,7 +139,7 @@ namespace NeOS::Detail
 		UInt16 mByteCount;
 		UInt16 mFlags;
 	};
-} // namespace NeOS::Detail
+} // namespace Kernel::Detail
 
 static UIntPtr kReadAddr  = mib_cast(2);
 static UIntPtr kWriteAddr = mib_cast(4);
@@ -166,7 +166,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz
 	rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
 
-	NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct.
+	Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct.
 
 	prd->mAddress	= (UInt32)(UIntPtr)kReadAddr;
 	prd->mByteCount = Size - 1;
@@ -209,7 +209,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS
 	rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
 	rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
 
-	NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4);
+	Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4);
 
 	prd->mAddress	= (UInt32)(UIntPtr)kWriteAddr;
 	prd->mByteCount = Size - 1;
@@ -243,7 +243,7 @@ Boolean drv_std_detected(Void)
 	@return Number of sectors, or zero.
 */
 /***********************************************************************************/
-NeOS::SizeT drv_get_sector_count()
+Kernel::SizeT drv_get_sector_count()
 {
 	return (kATAData[61] << 16) | kATAData[60];
 }
@@ -251,7 +251,7 @@ NeOS::SizeT drv_get_sector_count()
 /***********************************************************************************/
 /// @brief Get the size of the current drive.
 /***********************************************************************************/
-NeOS::SizeT drv_get_size()
+Kernel::SizeT drv_get_size()
 {
 	return (drv_get_sector_count()) * kATASectorSize;
 }
diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
index e2891484..2bbdb0e5 100644
--- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
@@ -20,8 +20,8 @@
 
 #ifdef __ATA_PIO__
 
-using namespace NeOS;
-using namespace NeOS::HAL;
+using namespace Kernel;
+using namespace Kernel::HAL;
 
 /// BUGS: 0