3 files changed, 14 insertions, 14 deletions
diff --git a/Private/NewBoot/BootKit/Arch/ATA.hxx b/Private/NewBoot/BootKit/Arch/ATA.hxx
index 8e0a15eb..4defc0aa 100644
--- a/Private/NewBoot/BootKit/Arch/ATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/ATA.hxx
@@ -8,7 +8,7 @@
 
 #include <Builtins/ATA/Defines.hxx>
 
-using namespace HCore;
+using namespace NewOS;
 
 class BDeviceATA final {
  public:
diff --git a/Private/NewBoot/BootKit/Arch/SATA.hxx b/Private/NewBoot/BootKit/Arch/SATA.hxx
index dc48c3ea..8bd8f2cb 100644
--- a/Private/NewBoot/BootKit/Arch/SATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/SATA.hxx
@@ -17,17 +17,17 @@ class BDeviceSATA final {
   HCORE_COPY_DEFAULT(BDeviceSATA);
 
   struct SATATrait final {
-    HCore::SizeT   mBase{1024};
-    HCore::Boolean mErr{false};
-    HCore::Boolean mDetected{false};
+    NewOS::SizeT   mBase{1024};
+    NewOS::Boolean mErr{false};
+    NewOS::Boolean mDetected{false};
 
     operator bool() { return !this->mErr; }
   };
 
   operator bool() { return this->Leak().mDetected; }
 
-  BDeviceSATA& Read(HCore::WideChar* Buf, const HCore::SizeT& SecCount);
-  BDeviceSATA& Write(HCore::WideChar* Buf, const HCore::SizeT& SecCount);
+  BDeviceSATA& Read(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount);
+  BDeviceSATA& Write(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount);
 
   SATATrait& Leak();
 
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 75934ed2..a0e8309c 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -22,7 +22,7 @@ class BVersionString;
 #include <NewKit/Defines.hpp>
 #include <FirmwareKit/EPM.hxx>
 
-using namespace HCore;
+using namespace NewOS;
 
 typedef Char *PEFImagePtr;
 typedef Char *PEImagePtr;
@@ -57,18 +57,18 @@ class BTextWriter final {
   BTextWriter(const BTextWriter &) = default;
 };
 
-HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
-                      const HCore::SizeT len);
+NewOS::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
+                      const NewOS::SizeT len);
 
-HCore::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
-                     const HCore::SizeT len);
+NewOS::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
+                     const NewOS::SizeT len);
 
 /// String length functions.
 
-HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr);
+NewOS::SizeT BStrLen(const CharacterTypeUTF16 *ptr);
 
-HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
-                     const HCore::SizeT len);
+NewOS::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
+                     const NewOS::SizeT len);
 
 /**
  * @brief BootKit File Reader class