MHR-36: Change namespace name, got out of the codename stage.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>

29 files changed, 149 insertions, 150 deletions

diff --git a/Kernel/KernelKit/CodeManager.hpp b/Kernel/KernelKit/CodeManager.hpp
index a42aea67..97a07ce9 100644
--- a/Kernel/KernelKit/CodeManager.hpp
+++ b/Kernel/KernelKit/CodeManager.hpp
@@ -20,7 +20,7 @@
 
 #define kUPPNameLen 64
 
-namespace NewOS
+namespace Kernel
 {
 	/// @brief Main process entrypoint.
 	typedef void (*MainKind)(void);
@@ -30,4 +30,4 @@ namespace NewOS
 	/// @param main the start of the process.
 	/// @return if the process was started or not.
 	bool execute_from_image(MainKind main, const char* processName);
-} // namespace NewOS
\ No newline at end of file
+} // namespace Kernel
\ No newline at end of file
diff --git a/Kernel/KernelKit/DebugOutput.hpp b/Kernel/KernelKit/DebugOutput.hpp
index a3c01341..0d52b861 100644
--- a/Kernel/KernelKit/DebugOutput.hpp
+++ b/Kernel/KernelKit/DebugOutput.hpp
@@ -25,7 +25,7 @@
 #define kDebugTeam		 43
 #define kDebugEOP		 49
 
-namespace NewOS
+namespace Kernel
 {
 	class TerminalDevice;
 
@@ -198,7 +198,7 @@ namespace NewOS
 		Int16 fPort[kDebugMaxPorts];
 		Int16 fBoundCnt;
 	};
-} // namespace NewOS
+} // namespace Kernel
 
 #ifdef kcout
 #undef kcout
diff --git a/Kernel/KernelKit/DeviceManager.hpp b/Kernel/KernelKit/DeviceManager.hpp
index 11217fc6..219977f4 100644
--- a/Kernel/KernelKit/DeviceManager.hpp
+++ b/Kernel/KernelKit/DeviceManager.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-/* NewOS device interface manager. */
+/* Kernel device interface manager. */
 /* @file KernelKit/DeviceManager.hpp */
 /* @brief Device abstraction and I/O buffer. */
 
@@ -24,7 +24,7 @@
 // Last Rev
 // Wed, Apr  3, 2024  9:09:41 AM
 
-namespace NewOS
+namespace Kernel
 {
 	template <typename T>
 	class DeviceInterface;
@@ -126,4 +126,4 @@ namespace NewOS
 		kDeviceTypeMedia,
 		kDeviceTypeCount,
 	};
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/DriveManager.hxx b/Kernel/KernelKit/DriveManager.hxx
index 47ecba67..21d7e1b0 100644
--- a/Kernel/KernelKit/DriveManager.hxx
+++ b/Kernel/KernelKit/DriveManager.hxx
@@ -20,7 +20,7 @@
 #define kDriveInvalidID (-1)
 #define kDriveNameLen	(32)
 
-namespace NewOS
+namespace Kernel
 {
 	enum
 	{
@@ -144,6 +144,6 @@ namespace NewOS
 	/// @brief Fetches the main drive.
 	/// @return the new drive as a trait.
 	DriveTrait io_construct_main_drive(void) noexcept;
-} // namespace NewOS
+} // namespace Kernel
 
 #endif /* ifndef __INC_DRIVE_MANAGER_HXX__ */
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp
index 8bbbaaaa..55d87fea 100644
--- a/Kernel/KernelKit/FileManager.hpp
+++ b/Kernel/KernelKit/FileManager.hpp
@@ -38,7 +38,7 @@
 /** @brief invalid position. (n-pos) */
 #define kNPos (SizeT)(-1);
 
-namespace NewOS
+namespace Kernel
 {
 	enum
 	{
@@ -314,6 +314,6 @@ namespace NewOS
 	{
 		delete fFile;
 	}
-} // namespace NewOS
+} // namespace Kernel
 
-#define node_cast(PTR) reinterpret_cast<NewOS::NodePtr>(PTR)
+#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR)
diff --git a/Kernel/KernelKit/Framebuffer.hpp b/Kernel/KernelKit/Framebuffer.hpp
index ebe983c8..6cafb767 100644
--- a/Kernel/KernelKit/Framebuffer.hpp
+++ b/Kernel/KernelKit/Framebuffer.hpp
@@ -13,7 +13,7 @@
 #include <NewKit/Defines.hpp>
 #include <NewKit/Ref.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	enum class FramebufferColorKind : UChar
 	{
@@ -86,6 +86,6 @@ namespace NewOS
 	extern const UInt32 kRgbBlue;
 	extern const UInt32 kRgbBlack;
 	extern const UInt32 kRgbWhite;
-} // namespace NewOS
+} // namespace Kernel
 
 #endif /* ifndef __INC_FB_HPP__ */
diff --git a/Kernel/KernelKit/HError.hpp b/Kernel/KernelKit/HError.hpp
index 4a2bfa0b..caee5718 100644
--- a/Kernel/KernelKit/HError.hpp
+++ b/Kernel/KernelKit/HError.hpp
@@ -11,11 +11,11 @@
 /// @file HError.hpp
 /// @brief Local Process Codes.
 
-#define ErrLocalIsOk()		   (NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == NewOS::kErrorSuccess)
-#define ErrLocalFailed()	   (NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != NewOS::kErrorSuccess)
-#define ErrLocal()				NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode()
+#define ErrLocalIsOk()		   (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() == Kernel::kErrorSuccess)
+#define ErrLocalFailed()	   (Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode() != Kernel::kErrorSuccess)
+#define ErrLocal()				Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetLocalCode()
 
-namespace NewOS
+namespace Kernel
 {
 	typedef Int32 HError;
 
@@ -52,5 +52,5 @@ namespace NewOS
 
 	Void    err_bug_check_raise(void) noexcept;
 	Boolean err_bug_check(void) noexcept;
-} // namespace NewOS
+} // namespace Kernel
 
diff --git a/Kernel/KernelKit/KernelHeap.hpp b/Kernel/KernelKit/KernelHeap.hpp
index 6be94a63..0d2f2188 100644
--- a/Kernel/KernelKit/KernelHeap.hpp
+++ b/Kernel/KernelKit/KernelHeap.hpp
@@ -12,9 +12,8 @@
 
 #include <NewKit/Defines.hpp>
 
-namespace NewOS
+namespace Kernel
 {
-
 	/// @brief Declare pointer as free.
 	/// @param heapPtr the pointer.
 	/// @return
@@ -41,4 +40,4 @@ namespace NewOS
 	/// @param heapPtr
 	/// @return
 	Int32 ke_make_ke_page(VoidPtr heapPtr);
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/LoaderInterface.hpp b/Kernel/KernelKit/LoaderInterface.hpp
index 9bce429c..dce934e6 100644
--- a/Kernel/KernelKit/LoaderInterface.hpp
+++ b/Kernel/KernelKit/LoaderInterface.hpp
@@ -11,7 +11,7 @@
 #include <NewKit/Defines.hpp>
 #include <NewKit/ErrorOr.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	/// @brief This interface is used to make loader contracts (MSCOFF, PEF).
 	/// @author @Amlal-El-Mahrouss
@@ -30,4 +30,4 @@ namespace NewOS
 		virtual _Output ErrorOr<VoidPtr> FindStart()											= 0;
 		virtual _Output VoidPtr			 FindSymbol(_Input const char* name, _Input Int32 kind) = 0;
 	};
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/LockDelegate.hpp b/Kernel/KernelKit/LockDelegate.hpp
index 0bf8104e..a4c9380a 100644
--- a/Kernel/KernelKit/LockDelegate.hpp
+++ b/Kernel/KernelKit/LockDelegate.hpp
@@ -12,7 +12,7 @@
 #define kLockDone	  (200U) /* job is done */
 #define kLockTimedOut (100U) /* job has timed out */
 
-namespace NewOS
+namespace Kernel
 {
 	/// @brief Lock condition pointer.
 	typedef Boolean* LockPtr;
@@ -61,4 +61,4 @@ namespace NewOS
 	private:
 		Atom<UInt> fLockStatus;
 	};
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/MSDOS.hpp b/Kernel/KernelKit/MSDOS.hpp
index 36da42ad..12d67488 100644
--- a/Kernel/KernelKit/MSDOS.hpp
+++ b/Kernel/KernelKit/MSDOS.hpp
@@ -3,7 +3,7 @@
 	Copyright Zeta Electronics Corporation
 
 	File: MSDOS.hpp
-	Purpose: MS-DOS header for NewOS.
+	Purpose: MS-DOS header for Kernel.
 
 	Revision History:
 
@@ -23,12 +23,12 @@
 #define kMagMz0 'M'
 #define kMagMz1 'Z'
 
-typedef NewOS::UInt32 DosWord;
-typedef NewOS::Long	  DosLong;
+typedef Kernel::UInt32 DosWord;
+typedef Kernel::Long	  DosLong;
 
 typedef struct _DosHeader
 {
-	NewOS::UInt8 eMagic[2];
+	Kernel::UInt8 eMagic[2];
 	DosWord		 eMagLen;
 	DosWord		 ePagesCount;
 	DosWord		 eCrlc;
@@ -49,7 +49,7 @@ typedef struct _DosHeader
 	DosLong		 eLfanew;
 } DosHeader, *DosHeaderPtr;
 
-namespace NewOS
+namespace Kernel
 {
 	/// @brief Find the PE header inside the the blob.
 	inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr
@@ -63,6 +63,6 @@ namespace NewOS
 
 		return (VoidPtr)(&ptrDos->eLfanew + 1);
 	}
-} // namespace NewOS
+} // namespace Kernel
 
 #endif /* ifndef __MSDOS_EXEC__ */
diff --git a/Kernel/KernelKit/PCI/Database.hpp b/Kernel/KernelKit/PCI/Database.hpp
index 9cd04610..a689306a 100644
--- a/Kernel/KernelKit/PCI/Database.hpp
+++ b/Kernel/KernelKit/PCI/Database.hpp
@@ -8,7 +8,7 @@
 #include <KernelKit/PCI/Device.hpp>
 #include <NewKit/Defines.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	namespace Types
 	{
@@ -35,4 +35,4 @@ namespace NewOS
 			Invalid							  = Unassgined,
 		};
 	} // namespace Types
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PCI/Device.hpp b/Kernel/KernelKit/PCI/Device.hpp
index 313adca9..8b5388c1 100644
--- a/Kernel/KernelKit/PCI/Device.hpp
+++ b/Kernel/KernelKit/PCI/Device.hpp
@@ -7,7 +7,7 @@
 
 #include <NewKit/Defines.hpp>
 
-namespace NewOS::PCI
+namespace Kernel::PCI
 {
 	enum class PciConfigKind : UShort
 	{
@@ -73,7 +73,7 @@ namespace NewOS::PCI
 		UShort fFunction;
 		UShort fBar;
 	};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI
 
-EXTERN_C void NewOSPCISetCfgTarget(NewOS::UInt bar);
-EXTERN_C NewOS::UInt NewOSPCIReadRaw(NewOS::UInt bar);
+EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar);
+EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar);
diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hpp
index 25e90d79..48db7587 100644
--- a/Kernel/KernelKit/PCI/Dma.hpp
+++ b/Kernel/KernelKit/PCI/Dma.hpp
@@ -12,7 +12,7 @@
 #include <NewKit/OwnPtr.hpp>
 #include <NewKit/Ref.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	enum class DmaKind
 	{
@@ -76,6 +76,6 @@ namespace NewOS
 	public:
 		static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma);
 	};
-} // namespace NewOS
+} // namespace Kernel
 
 #include <KernelKit/PCI/Dma.inl>
diff --git a/Kernel/KernelKit/PCI/IO.hpp b/Kernel/KernelKit/PCI/IO.hpp
index cd44764c..262361ed 100644
--- a/Kernel/KernelKit/PCI/IO.hpp
+++ b/Kernel/KernelKit/PCI/IO.hpp
@@ -11,7 +11,7 @@
 #include <NewKit/Defines.hpp>
 #include <NewKit/Ref.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	template <SizeT Sz>
 	class IOArray final
@@ -50,7 +50,7 @@ namespace NewOS
 	};
 
 	using IOArray16 = IOArray<16>;
-} // namespace NewOS
+} // namespace Kernel
 
 #ifdef __x86_64__
 #include <KernelKit/PCI/IO-Impl-AMD64.inl>
diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hpp
index 278711a7..2274df31 100644
--- a/Kernel/KernelKit/PCI/Iterator.hpp
+++ b/Kernel/KernelKit/PCI/Iterator.hpp
@@ -11,7 +11,7 @@
 #define NEWOS_DEVICE_COUNT	 (33)
 #define NEWOS_FUNCTION_COUNT (8)
 
-namespace NewOS::PCI
+namespace Kernel::PCI
 {
 	class Iterator final
 	{
@@ -33,6 +33,6 @@ namespace NewOS::PCI
 	private:
 		Array<PCI::Device, NEWOS_BUS_COUNT> fDevices;
 	};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI
 
 #endif // __PCI_ITERATOR_HPP__
diff --git a/Kernel/KernelKit/PCI/PCI.hpp b/Kernel/KernelKit/PCI/PCI.hpp
index c0c035b9..a7101a33 100644
--- a/Kernel/KernelKit/PCI/PCI.hpp
+++ b/Kernel/KernelKit/PCI/PCI.hpp
@@ -14,7 +14,7 @@
 #define PCI_FUNC_COUNT	 (8)
 #define PCI_BUS_COUNT	 (255)
 
-namespace NewOS::PCI
+namespace Kernel::PCI
 {
 	// model
 	struct DeviceHeader
@@ -55,4 +55,4 @@ namespace NewOS::PCI
 		Detail::BAR BAR4;
 		Detail::BAR BAR5;
 	};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI
diff --git a/Kernel/KernelKit/PE.hxx b/Kernel/KernelKit/PE.hxx
index 02f24595..30b71cc9 100644
--- a/Kernel/KernelKit/PE.hxx
+++ b/Kernel/KernelKit/PE.hxx
@@ -3,7 +3,7 @@
 	Copyright Zeta Electronics Corporation
 
 	File: PE.hxx
-	Purpose: Portable Executable for NewOS.
+	Purpose: Portable Executable for Kernel.
 
 	Revision History:
 
@@ -20,14 +20,14 @@
 
 typedef struct ExecHeader final
 {
-	NewOS::UInt32 mMagic; // PE\0\0 or 0x00004550
-	NewOS::UInt16 mMachine;
-	NewOS::UInt16 mNumberOfSections;
-	NewOS::UInt32 mTimeDateStamp;
-	NewOS::UInt32 mPointerToSymbolTable;
-	NewOS::UInt32 mNumberOfSymbols;
-	NewOS::UInt16 mSizeOfOptionalHeader;
-	NewOS::UInt16 mCharacteristics;
+	Kernel::UInt32 mMagic; // PE\0\0 or 0x00004550
+	Kernel::UInt16 mMachine;
+	Kernel::UInt16 mNumberOfSections;
+	Kernel::UInt32 mTimeDateStamp;
+	Kernel::UInt32 mPointerToSymbolTable;
+	Kernel::UInt32 mNumberOfSymbols;
+	Kernel::UInt16 mSizeOfOptionalHeader;
+	Kernel::UInt16 mCharacteristics;
 } ALIGN(8) ExecHeader, *ExecHeaderPtr;
 
 #define kMagPE32 0x010b
@@ -38,49 +38,49 @@ typedef struct ExecHeader final
 
 typedef struct ExecOptionalHeader final
 {
-	NewOS::UInt16  mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit)
-	NewOS::UChar   mMajorLinkerVersion;
-	NewOS::UChar   mMinorLinkerVersion;
-	NewOS::UIntPtr mSizeOfCode;
-	NewOS::UIntPtr mSizeOfInitializedData;
-	NewOS::UIntPtr mSizeOfUninitializedData;
-	NewOS::UInt32  mAddressOfEntryPoint;
-	NewOS::UInt32  mBaseOfCode;
-	NewOS::UIntPtr mImageBase;
-	NewOS::UInt32  mSectionAlignment;
-	NewOS::UInt32  mFileAlignment;
-	NewOS::UInt16  mMajorOperatingSystemVersion;
-	NewOS::UInt16  mMinorOperatingSystemVersion;
-	NewOS::UInt16  mMajorImageVersion;
-	NewOS::UInt16  mMinorImageVersion;
-	NewOS::UInt16  mMajorSubsystemVersion;
-	NewOS::UInt16  mMinorSubsystemVersion;
-	NewOS::UInt32  mWin32VersionValue;
-	NewOS::UIntPtr mSizeOfImage;
-	NewOS::UIntPtr mSizeOfHeaders;
-	NewOS::UInt32  mCheckSum;
-	NewOS::UInt16  mSubsystem;
-	NewOS::UInt16  mDllCharacteristics;
-	NewOS::UIntPtr mSizeOfStackReserve;
-	NewOS::UIntPtr mSizeOfStackCommit;
-	NewOS::UIntPtr mSizeOfHeapReserve;
-	NewOS::UIntPtr mSizeOfHeapCommit;
-	NewOS::UInt32  mLoaderFlags;
-	NewOS::UInt32  mNumberOfRvaAndSizes;
+	Kernel::UInt16  mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit)
+	Kernel::UChar   mMajorLinkerVersion;
+	Kernel::UChar   mMinorLinkerVersion;
+	Kernel::UIntPtr mSizeOfCode;
+	Kernel::UIntPtr mSizeOfInitializedData;
+	Kernel::UIntPtr mSizeOfUninitializedData;
+	Kernel::UInt32  mAddressOfEntryPoint;
+	Kernel::UInt32  mBaseOfCode;
+	Kernel::UIntPtr mImageBase;
+	Kernel::UInt32  mSectionAlignment;
+	Kernel::UInt32  mFileAlignment;
+	Kernel::UInt16  mMajorOperatingSystemVersion;
+	Kernel::UInt16  mMinorOperatingSystemVersion;
+	Kernel::UInt16  mMajorImageVersion;
+	Kernel::UInt16  mMinorImageVersion;
+	Kernel::UInt16  mMajorSubsystemVersion;
+	Kernel::UInt16  mMinorSubsystemVersion;
+	Kernel::UInt32  mWin32VersionValue;
+	Kernel::UIntPtr mSizeOfImage;
+	Kernel::UIntPtr mSizeOfHeaders;
+	Kernel::UInt32  mCheckSum;
+	Kernel::UInt16  mSubsystem;
+	Kernel::UInt16  mDllCharacteristics;
+	Kernel::UIntPtr mSizeOfStackReserve;
+	Kernel::UIntPtr mSizeOfStackCommit;
+	Kernel::UIntPtr mSizeOfHeapReserve;
+	Kernel::UIntPtr mSizeOfHeapCommit;
+	Kernel::UInt32  mLoaderFlags;
+	Kernel::UInt32  mNumberOfRvaAndSizes;
 } ExecOptionalHeader, *ExecOptionalHeaderPtr;
 
 typedef struct ExecSectionHeader final
 {
-	CONST NewOS::UChar mName[8];
-	NewOS::UInt32	   mVirtualSize;
-	NewOS::UInt32	   mVirtualAddress;
-	NewOS::UInt32	   mSizeOfRawData;
-	NewOS::UInt32	   mPointerToRawData;
-	NewOS::UInt32	   mPointerToRelocations;
-	NewOS::UInt32	   mPointerToLinenumbers;
-	NewOS::UInt16	   mNumberOfRelocations;
-	NewOS::UInt16	   mNumberOfLinenumbers;
-	NewOS::UInt32	   mCharacteristics;
+	CONST Kernel::UChar mName[8];
+	Kernel::UInt32	   mVirtualSize;
+	Kernel::UInt32	   mVirtualAddress;
+	Kernel::UInt32	   mSizeOfRawData;
+	Kernel::UInt32	   mPointerToRawData;
+	Kernel::UInt32	   mPointerToRelocations;
+	Kernel::UInt32	   mPointerToLinenumbers;
+	Kernel::UInt16	   mNumberOfRelocations;
+	Kernel::UInt16	   mNumberOfLinenumbers;
+	Kernel::UInt32	   mCharacteristics;
 } ExecSectionHeader, *ExecSectionHeaderPtr;
 
 enum kExecDataDirParams
@@ -93,29 +93,29 @@ enum kExecDataDirParams
 
 typedef struct ExecExportDirectory
 {
-	NewOS::UInt32 mCharacteristics;
-	NewOS::UInt32 mTimeDateStamp;
-	NewOS::UInt16 mMajorVersion;
-	NewOS::UInt16 mMinorVersion;
-	NewOS::UInt32 mName;
-	NewOS::UInt32 mBase;
-	NewOS::UInt32 mNumberOfFunctions;
-	NewOS::UInt32 mNumberOfNames;
-	NewOS::UInt32 mAddressOfFunctions; // export table rva
-	NewOS::UInt32 mAddressOfNames;
-	NewOS::UInt32 mAddressOfNameOrdinal; // ordinal table rva
+	Kernel::UInt32 mCharacteristics;
+	Kernel::UInt32 mTimeDateStamp;
+	Kernel::UInt16 mMajorVersion;
+	Kernel::UInt16 mMinorVersion;
+	Kernel::UInt32 mName;
+	Kernel::UInt32 mBase;
+	Kernel::UInt32 mNumberOfFunctions;
+	Kernel::UInt32 mNumberOfNames;
+	Kernel::UInt32 mAddressOfFunctions; // export table rva
+	Kernel::UInt32 mAddressOfNames;
+	Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva
 } ExecExportDirectory, *ExecExportDirectoryPtr;
 
 typedef struct ExecImportDirectory
 {
 	union {
-		NewOS::UInt32 mCharacteristics;
-		NewOS::UInt32 mOriginalFirstThunk;
+		Kernel::UInt32 mCharacteristics;
+		Kernel::UInt32 mOriginalFirstThunk;
 	};
-	NewOS::UInt32 mTimeDateStamp;
-	NewOS::UInt32 mForwarderChain;
-	NewOS::UInt32 mNameRva;
-	NewOS::UInt32 mThunkTableRva;
+	Kernel::UInt32 mTimeDateStamp;
+	Kernel::UInt32 mForwarderChain;
+	Kernel::UInt32 mNameRva;
+	Kernel::UInt32 mThunkTableRva;
 } ExecImportDirectory, *ExecImportDirectoryPtr;
 
 #define kPeStart "__hcore_subsys_start"
diff --git a/Kernel/KernelKit/PEF.hpp b/Kernel/KernelKit/PEF.hpp
index 005c7673..f27d8dd5 100644
--- a/Kernel/KernelKit/PEF.hpp
+++ b/Kernel/KernelKit/PEF.hpp
@@ -3,7 +3,7 @@
 	Copyright Zeta Electronics Corporation
 
 	File: PEF.hpp
-	Purpose: Preferred Executable Format for NewOS.
+	Purpose: Preferred Executable Format for Kernel.
 
 	Revision History:
 
@@ -26,7 +26,7 @@
 #define kPefVersion 1
 #define kPefNameLen 255
 
-namespace NewOS
+namespace Kernel
 {
 	enum
 	{
@@ -93,7 +93,7 @@ namespace NewOS
 		kPefZero	 = 0xE,
 		kPefLinkerID = 0x1,
 	};
-} // namespace NewOS
+} // namespace Kernel
 
 #define kPefExt		  ".exec"
 #define kPefDylibExt  ".lib"
@@ -101,7 +101,7 @@ namespace NewOS
 #define kPefObjectExt ".obj"
 #define kPefDebugExt  ".dbg"
 
-// NewOS System Binary Interface.
+// Kernel System Binary Interface.
 #define kPefAbi (0x5046)
 
 #define kPefStart "__ImageStart"
diff --git a/Kernel/KernelKit/PEFCodeManager.hxx b/Kernel/KernelKit/PEFCodeManager.hxx
index 1faecb5e..8bb5a7cd 100644
--- a/Kernel/KernelKit/PEFCodeManager.hxx
+++ b/Kernel/KernelKit/PEFCodeManager.hxx
@@ -14,7 +14,7 @@
 
 #define kPefApplicationMime "application/x-newos-exec"
 
-namespace NewOS
+namespace Kernel
 {
 	///
 	/// \name PEFLoader
@@ -57,6 +57,6 @@ namespace NewOS
 	{
 		bool execute_from_image(PEFLoader& exec, const Int32& procKind) noexcept;
 	} // namespace Utils
-} // namespace NewOS
+} // namespace Kernel
 
 #endif // ifndef _INC_CODE_MANAGER_PEF_HXX_
diff --git a/Kernel/KernelKit/PEFSharedObject.hxx b/Kernel/KernelKit/PEFSharedObject.hxx
index dbe9cda8..993e316d 100644
--- a/Kernel/KernelKit/PEFSharedObject.hxx
+++ b/Kernel/KernelKit/PEFSharedObject.hxx
@@ -1,7 +1,7 @@
 /*
  *      ========================================================
  *
- *      NewOS
+ *      Kernel
  *      Copyright Zeta Electronics Corporation, all rights reserved.
  *
  *      ========================================================
@@ -15,7 +15,7 @@
 #include <KernelKit/PEFCodeManager.hxx>
 #include <NewKit/Defines.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	/// @brief Pure implementation, missing method/function handler.
 	extern "C" void __mh_purecall(void);
@@ -107,6 +107,6 @@ namespace NewOS
 	};
 
 	typedef SharedObject* SharedObjectPtr;
-} // namespace NewOS
+} // namespace Kernel
 
 #endif /* ifndef __KERNELKIT_SHARED_OBJECT_HXX__ */
diff --git a/Kernel/KernelKit/PermissionSelector.hxx b/Kernel/KernelKit/PermissionSelector.hxx
index 1d972154..7c01bcd4 100644
--- a/Kernel/KernelKit/PermissionSelector.hxx
+++ b/Kernel/KernelKit/PermissionSelector.hxx
@@ -20,7 +20,7 @@
 // hash 'user@host:password' -> base64 encoded data
 // use this data to then fetch specific data.
 
-namespace NewOS
+namespace Kernel
 {
 	enum class RingKind
 	{
@@ -52,6 +52,6 @@ namespace NewOS
 	private:
 		RingKind fRing;
 	};
-} // namespace NewOS
+} // namespace Kernel
 
 #endif /* ifndef _INC_PERMISSION_SEL_HXX_ */
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index b8ac2aae..7d8518bb 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -24,7 +24,7 @@
 
 ////////////////////////////////////////////////////
 
-namespace NewOS
+namespace Kernel
 {
 	class ProcessHeader;
 	class ProcessTeam;
@@ -282,7 +282,7 @@ namespace NewOS
 	};
 
 	const Int32& rt_get_exit_code() noexcept;
-} // namespace NewOS
+} // namespace Kernel
 
 #include <KernelKit/ThreadLocalStorage.hxx>
 
diff --git a/Kernel/KernelKit/SMPManager.hpp b/Kernel/KernelKit/SMPManager.hpp
index 324358dc..31e67bb7 100644
--- a/Kernel/KernelKit/SMPManager.hpp
+++ b/Kernel/KernelKit/SMPManager.hpp
@@ -16,7 +16,7 @@
 
 #define kMaxHarts 8
 
-namespace NewOS
+namespace Kernel
 {
 	using ThreadID = UInt32;
 
@@ -122,6 +122,6 @@ namespace NewOS
 	/// @brief makes thread sleep.
 	/// hooks and hangs thread to prevent code from executing.
 	Void rt_hang_thread(HAL::StackFramePtr stack);
-} // namespace NewOS
+} // namespace Kernel
 
 #endif // !__INC_SMP_MANAGER_HPP__
diff --git a/Kernel/KernelKit/Semaphore.hpp b/Kernel/KernelKit/Semaphore.hpp
index 83d711ed..5dd7b407 100644
--- a/Kernel/KernelKit/Semaphore.hpp
+++ b/Kernel/KernelKit/Semaphore.hpp
@@ -10,7 +10,7 @@
 #include <KernelKit/Timer.hpp>
 #include <CompilerKit/CompilerKit.hxx>
 
-namespace NewOS
+namespace Kernel
 {
 	class ProcessHeader;
 
@@ -40,4 +40,4 @@ namespace NewOS
 	private:
 		ProcessHeaderRef fLockingProcess{nullptr};
 	};
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/ThreadLocalStorage.hxx b/Kernel/KernelKit/ThreadLocalStorage.hxx
index 75d29ced..fb3eec9b 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.hxx
+++ b/Kernel/KernelKit/ThreadLocalStorage.hxx
@@ -21,17 +21,17 @@
 /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64)
 struct PACKED ThreadInformationBlock final
 {
-	NewOS::Char	   Cookie[kTLSCookieLen];
-	NewOS::UIntPtr StartCode;  // Start Address
-	NewOS::UIntPtr StartData;  // Allocation Heap
-	NewOS::UIntPtr StartStack; // Stack Pointer.
-	NewOS::Int32   ThreadID;   // Thread execution ID.
+	Kernel::Char	   Cookie[kTLSCookieLen];
+	Kernel::UIntPtr StartCode;  // Start Address
+	Kernel::UIntPtr StartData;  // Allocation Heap
+	Kernel::UIntPtr StartStack; // Stack Pointer.
+	Kernel::Int32   ThreadID;   // Thread execution ID.
 };
 
 typedef struct ThreadInformationBlock ProcessInformationBlock;
 
 ///! @brief Cookie Sanity check.
-NewOS::Boolean tls_check_tib(ThreadInformationBlock* Ptr);
+Kernel::Boolean tls_check_tib(ThreadInformationBlock* Ptr);
 
 ///! @brief new ptr syscall.
 template <typename T>
@@ -48,7 +48,7 @@ T* tls_new_class(Args&&... args);
 EXTERN_C void rt_install_tib(ThreadInformationBlock* TIB, ThreadInformationBlock* PIB);
 
 /// @brief TLS check (syscall)
-EXTERN_C NewOS::Void tls_check_syscall_impl(NewOS::VoidPtr TIB) noexcept;
+EXTERN_C Kernel::Void tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept;
 
 #include <KernelKit/ThreadLocalStorage.inl>
 
diff --git a/Kernel/KernelKit/Timer.hpp b/Kernel/KernelKit/Timer.hpp
index acfb9be5..59364554 100644
--- a/Kernel/KernelKit/Timer.hpp
+++ b/Kernel/KernelKit/Timer.hpp
@@ -10,7 +10,7 @@
 #include <CompilerKit/CompilerKit.hxx>
 #include <KernelKit/HError.hpp>
 
-namespace NewOS
+namespace Kernel
 {
 	class HardwareTimer;
 	class HardwareTimerInterface;
@@ -61,4 +61,4 @@ namespace NewOS
 
 		return 1000 / Seconds(time);
 	}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/UserHeap.hpp b/Kernel/KernelKit/UserHeap.hpp
index 681896a8..6f125fdc 100644
--- a/Kernel/KernelKit/UserHeap.hpp
+++ b/Kernel/KernelKit/UserHeap.hpp
@@ -20,7 +20,7 @@
 #define kUserHeapMaxSz (4096)
 #define kUserHeapMag   (0xFAF0FEF0)
 
-namespace NewOS
+namespace Kernel
 {
 	typedef enum
 	{
@@ -43,4 +43,4 @@ namespace NewOS
 	/// @param pointer The process heap pointer.
 	/// @return
 	Int32 rt_free_heap(voidPtr pointer);
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx
index fbcfa5e7..f5063900 100644
--- a/Kernel/KernelKit/XCOFF.hxx
+++ b/Kernel/KernelKit/XCOFF.hxx
@@ -3,7 +3,7 @@
 	Copyright Zeta Electronics Corporation
 
 	File: XCOFF.hpp
-	Purpose: XCOFF for NewOS.
+	Purpose: XCOFF for Kernel.
 
 	Revision History:
 
@@ -29,13 +29,13 @@ struct XCoffForkHeader;
 /// @brief XCoff file header, meant for POWER apps.
 typedef struct XCoffFileHeader
 {
-	NewOS::UInt16  fMagic;
-	NewOS::UInt16  fTarget;
-	NewOS::UInt16  fNumSecs;
-	NewOS::UInt32  fTimeDat;
-	NewOS::UIntPtr fSymPtr;
-	NewOS::UInt32  fNumSyms;
-	NewOS::UInt16  fOptHdr; // ?: Number of bytes in optional header
+	Kernel::UInt16  fMagic;
+	Kernel::UInt16  fTarget;
+	Kernel::UInt16  fNumSecs;
+	Kernel::UInt32  fTimeDat;
+	Kernel::UIntPtr fSymPtr;
+	Kernel::UInt32  fNumSyms;
+	Kernel::UInt16  fOptHdr; // ?: Number of bytes in optional header
 } XCoffFileHeader32, XCoffFileHeader64;
 
 #define cForkNameLen (255)
@@ -43,9 +43,9 @@ typedef struct XCoffFileHeader
 /// @brief This the executable manifest fork.
 typedef struct XCoffForkHeader
 {
-	NewOS::Char fPropertiesXMLFork[cForkNameLen];
-	NewOS::Char fDynamicLoaderFork[cForkNameLen];
-	NewOS::Char fCodeSignFork[cForkNameLen];
+	Kernel::Char fPropertiesXMLFork[cForkNameLen];
+	Kernel::Char fDynamicLoaderFork[cForkNameLen];
+	Kernel::Char fCodeSignFork[cForkNameLen];
 } XCoffForkHeader;
 
 #endif // ifndef __INC_XCOFF_HXX__