3 files changed, 20 insertions, 20 deletions
diff --git a/Kernel/FirmwareKit/EFI/EFI.hxx b/Kernel/FirmwareKit/EFI/EFI.hxx
index ae3bd042..922044d4 100644
--- a/Kernel/FirmwareKit/EFI/EFI.hxx
+++ b/Kernel/FirmwareKit/EFI/EFI.hxx
@@ -8,7 +8,7 @@
 #define __EFI__
 
 /**
-@brief NewOS Implementation of EFI.
+@brief Kernel Implementation of EFI.
 @note This API is in WiP, so it's not 'pretty', just deal with it. We'll be
 improving that later.
 @author Amlal El Mahrouss
@@ -16,7 +16,7 @@ improving that later.
 
 #include <NewKit/Defines.hpp>
 
-using namespace NewOS;
+using namespace Kernel;
 
 /* we always use stdcall in EFI, the pascal way of calling functions. */
 
diff --git a/Kernel/FirmwareKit/EPM.hxx b/Kernel/FirmwareKit/EPM.hxx
index 3b2335cf..9669e324 100644
--- a/Kernel/FirmwareKit/EPM.hxx
+++ b/Kernel/FirmwareKit/EPM.hxx
@@ -22,10 +22,10 @@
 /// @brief EPM GUID structure.
 typedef struct BlockGUID
 {
-	NewOS::UInt32 Data1;
-	NewOS::UInt16 Data2;
-	NewOS::UInt16 Data3;
-	NewOS::UInt8  Data4[8];
+	Kernel::UInt32 Data1;
+	Kernel::UInt16 Data2;
+	Kernel::UInt16 Data3;
+	Kernel::UInt8  Data4[8];
 } BlockGUID;
 
 /**
@@ -34,17 +34,17 @@ typedef struct BlockGUID
  */
 struct PACKED BootBlock
 {
-	NewOS::Char	 Magic[kEPMMagicLength];
-	NewOS::Char	 Name[kEPMNameLength];
+	Kernel::Char	 Magic[kEPMMagicLength];
+	Kernel::Char	 Name[kEPMNameLength];
 	BlockGUID	 Uuid;
-	NewOS::Int32 Version;
-	NewOS::Int64 NumBlocks;
-	NewOS::Int64 SectorSz;
-	NewOS::Int64 LbaStart;
-	NewOS::Int16 Kind;
-	NewOS::Int32 FsVersion;
-	NewOS::Char	 Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
-	NewOS::Char	 Reserved[409];			   // to fill a full sector.
+	Kernel::Int32 Version;
+	Kernel::Int64 NumBlocks;
+	Kernel::Int64 SectorSz;
+	Kernel::Int64 LbaStart;
+	Kernel::Int16 Kind;
+	Kernel::Int32 FsVersion;
+	Kernel::Char	 Fs[kEPMFilesystemLength]; /* NewFS, ffs2... */
+	Kernel::Char	 Reserved[409];			   // to fill a full sector.
 };
 
 /* @brief AMD64 magic for EPM */
diff --git a/Kernel/FirmwareKit/Handover.hxx b/Kernel/FirmwareKit/Handover.hxx
index 19602fc3..02e5fb21 100644
--- a/Kernel/FirmwareKit/Handover.hxx
+++ b/Kernel/FirmwareKit/Handover.hxx
@@ -26,7 +26,7 @@
 
 #define kHandoverStructSz sizeof(HEL::HandoverHeader)
 
-namespace NewOS::HEL
+namespace Kernel::HEL
 {
 	/**
 	@brief the kind of executable we're loading.
@@ -100,11 +100,11 @@ it tells us more about it and IS format independent.
 	};
 
 	/// @brief Bootloader main type.
-	typedef void (*BootMainKind)(NewOS::HEL::HandoverInformationHeader* handoverInfo);
+	typedef void (*BootMainKind)(Kernel::HEL::HandoverInformationHeader* handoverInfo);
 
 	/// @brief Alias of bootloader main type.
 	typedef void (*HandoverProc)(HandoverInformationHeader* handoverInfo);
-} // namespace NewOS::HEL
+} // namespace Kernel::HEL
 
 /// @brief Bootloader global header.
-inline NewOS::HEL::HandoverInformationHeader* kHandoverHeader = nullptr;
+inline Kernel::HEL::HandoverInformationHeader* kHandoverHeader = nullptr;