API: Inconsitency fix.

Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>

33 files changed, 108 insertions, 86 deletions

diff --git a/Private/CompilerKit/CompilerKit.hxx b/Private/CompilerKit/CompilerKit.hxx
new file mode 100644
index 00000000..7bed48f9
--- /dev/null
+++ b/Private/CompilerKit/CompilerKit.hxx
@@ -0,0 +1,13 @@
+/* -------------------------------------------
+
+    Copyright Mahrouss Logic
+
+------------------------------------------- */
+
+#ifndef _INC_CL_HPP
+#define _INC_CL_HPP
+
+#include <CompilerKit/Detail.hxx>
+#include <CompilerKit/Version.hxx>
+
+#endif /* ifndef _INC_CL_HPP */
diff --git a/Private/CompilerKit/CompilerKit.hpp b/Private/CompilerKit/Detail.hxx
index 34f69ccc..0c7a7c46 100644
--- a/Private/CompilerKit/CompilerKit.hpp
+++ b/Private/CompilerKit/Detail.hxx
@@ -4,8 +4,7 @@
 
 ------------------------------------------- */
 
-#ifndef _INC_CL_HPP
-#define _INC_CL_HPP
+#pragma once
 
 #include <NewKit/Defines.hpp>
 
@@ -28,8 +27,3 @@
     KLASS &operator=(KLASS &&) = default;                                                                              \
     KLASS(KLASS &&) = default;
 
-
-
-#include <CompilerKit/Version.hxx>
-
-#endif /* ifndef _INC_CL_HPP */
diff --git a/Private/Drivers/ATA/Defines.hxx b/Private/Drivers/ATA/Defines.hxx
index 058f0758..cc1c191f 100644
--- a/Private/Drivers/ATA/Defines.hxx
+++ b/Private/Drivers/ATA/Defines.hxx
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 
 using namespace HCore;
diff --git a/Private/Drivers/PS2/Mouse.hxx b/Private/Drivers/PS2/Mouse.hxx
index 9e9607e1..30fb5620 100644
--- a/Private/Drivers/PS2/Mouse.hxx
+++ b/Private/Drivers/PS2/Mouse.hxx
@@ -14,7 +14,7 @@
 #pragma once
 
 #include <ArchKit/ArchKit.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 
 namespace HCore {
diff --git a/Private/FSKit/IndexableProperty.hxx b/Private/FSKit/IndexableProperty.hxx
index 1dd09b7d..36416c82 100644
--- a/Private/FSKit/IndexableProperty.hxx
+++ b/Private/FSKit/IndexableProperty.hxx
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <CFKit/Property.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <KernelKit/DriveManager.hpp>
 
 namespace HCore {
diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx
index b340aef5..3cc4ceba 100644
--- a/Private/FSKit/NewFS.hxx
+++ b/Private/FSKit/NewFS.hxx
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <HintKit/CompilerHint.hxx>
 #include <KernelKit/DriveManager.hpp>
 #include <NewKit/Defines.hpp>
diff --git a/Private/KernelKit/DebugOutput.hpp b/Private/KernelKit/DebugOutput.hpp
index 683c0903..75031687 100644
--- a/Private/KernelKit/DebugOutput.hpp
+++ b/Private/KernelKit/DebugOutput.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <KernelKit/DeviceManager.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/OwnPtr.hpp>
 #include <NewKit/Stream.hpp>
 
diff --git a/Private/KernelKit/DriveManager.hpp b/Private/KernelKit/DriveManager.hpp
index 6cfb007b..027c9391 100644
--- a/Private/KernelKit/DriveManager.hpp
+++ b/Private/KernelKit/DriveManager.hpp
@@ -7,7 +7,7 @@
 #ifndef __DRIVE_MANAGER__
 #define __DRIVE_MANAGER__
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <KernelKit/DebugOutput.hpp>
 #include <KernelKit/DeviceManager.hpp>
 #include <KernelKit/HError.hpp>
@@ -37,7 +37,7 @@ typedef Int64 rt_drive_id_type;
 struct DriveTraits final {
   Char fName[kDriveNameLen];  // /System, /Boot, //./Devices/USB...
   Int32 fKind;                // fMassStorage, fFloppy, fOpticalDisc.
-  rt_drive_id_type fId;                // Drive id.
+  rt_drive_id_type fId;       // Drive id.
   Int32 fFlags;               // fReadOnly, fXPMDrive, fXPTDrive
 
   //! for StorageKit.
@@ -61,7 +61,8 @@ typedef DriveDevice* DriveDevicePtr;
 
 /**
  * @brief Abstracted hard-drive container class.
- * @note This class has all of it's drive set to nullptr, allocate them using GetAddressOf(index).
+ * @note This class has all of it's drive set to nullptr, allocate them using
+ * GetAddressOf(index).
  */
 class Mountpoint final {
  public:
@@ -91,7 +92,7 @@ class Mountpoint final {
       default: {
         DbgLastError() = kErrorNoSuchDisk;
         kcout << "HCoreKrnl\\Mountpoint: Check HError.\n";
-        
+
         break;
       }
     }
diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp
index 4b4a63a4..22c229db 100644
--- a/Private/KernelKit/FileManager.hpp
+++ b/Private/KernelKit/FileManager.hpp
@@ -18,7 +18,7 @@
 #include <FSKit/NewFS.hxx>
 #endif  // __FSKIT_NEWFS__
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <HintKit/CompilerHint.hxx>
 #include <NewKit/ErrorID.hpp>
 #include <NewKit/Ref.hpp>
diff --git a/Private/KernelKit/Loader.hpp b/Private/KernelKit/LoaderInterface.hpp
index fb97c3a4..a19ba483 100644
--- a/Private/KernelKit/Loader.hpp
+++ b/Private/KernelKit/LoaderInterface.hpp
@@ -6,24 +6,25 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 #include <NewKit/ErrorOr.hpp>
 
 namespace HCore {
-/// This interface is used to make loader contracts (MSCOFF, PEF).
-class Loader {
+/// @brief This interface is used to make loader contracts (MSCOFF, PEF).
+/// @author @Amlal-El-Mahrouss
+class LoaderInterface {
  public:
-  explicit Loader() = default;
-  virtual ~Loader() = default;
+  explicit LoaderInterface() = default;
+  virtual ~LoaderInterface() = default;
 
-  HCORE_COPY_DEFAULT(Loader);
+  HCORE_COPY_DEFAULT(LoaderInterface);
 
  public:
   virtual const char* Format() = 0;
   virtual const char* MIME() = 0;
   virtual const char* Path() = 0;
-  virtual ErrorOr<VoidPtr> LoadStart() = 0;
+  virtual ErrorOr<VoidPtr> FindStart() = 0;
   virtual VoidPtr FindSymbol(const char* name, Int32 kind) = 0;
 };
 }  // namespace HCore
diff --git a/Private/KernelKit/PEF.hpp b/Private/KernelKit/PEF.hpp
index 69919f93..e1750242 100644
--- a/Private/KernelKit/PEF.hpp
+++ b/Private/KernelKit/PEF.hpp
@@ -14,8 +14,8 @@
 #ifndef __PEF__
 #define __PEF__
 
-#include <CompilerKit/CompilerKit.hpp>
-#include <KernelKit/Loader.hpp>
+#include <CompilerKit/CompilerKit.hxx>
+#include <KernelKit/LoaderInterface.hpp>
 #include <NewKit/Defines.hpp>
 
 #define kPefMagic "PEF"
diff --git a/Private/KernelKit/PEFCodeManager.hxx b/Private/KernelKit/PEFCodeManager.hxx
index 73bc8ea3..e952d40f 100644
--- a/Private/KernelKit/PEFCodeManager.hxx
+++ b/Private/KernelKit/PEFCodeManager.hxx
@@ -18,7 +18,7 @@ namespace HCore {
 /// \name PEFLoader
 /// \brief PEF loader class.
 ///
-class PEFLoader : public Loader {
+class PEFLoader : public LoaderInterface {
  private:
   explicit PEFLoader() = delete;
 
@@ -39,7 +39,7 @@ class PEFLoader : public Loader {
   const char *MIME() override;
 
  public:
-  ErrorOr<VoidPtr> LoadStart() override;
+  ErrorOr<VoidPtr> FindStart() override;
   VoidPtr FindSymbol(const char *name, Int32 kind) override;
 
  public:
diff --git a/Private/KernelKit/PEFSharedObject.hxx b/Private/KernelKit/PEFSharedObject.hxx
index 263f08f4..becac43e 100644
--- a/Private/KernelKit/PEFSharedObject.hxx
+++ b/Private/KernelKit/PEFSharedObject.hxx
@@ -10,7 +10,7 @@
 #ifndef __KERNELKIT_SHARED_OBJECT_HXX__
 #define __KERNELKIT_SHARED_OBJECT_HXX__
 
-#include <KernelKit/Loader.hpp>
+#include <KernelKit/LoaderInterface.hpp>
 #include <KernelKit/PEF.hpp>
 #include <KernelKit/PEFCodeManager.hxx>
 #include <NewKit/Defines.hpp>
diff --git a/Private/KernelKit/PermissionSelector.hxx b/Private/KernelKit/PermissionSelector.hxx
index 477e0f0c..c5a55fee 100644
--- a/Private/KernelKit/PermissionSelector.hxx
+++ b/Private/KernelKit/PermissionSelector.hxx
@@ -7,7 +7,7 @@
 #ifndef _INC_PERMISSION_SEL_HPP
 #define _INC_PERMISSION_SEL_HPP
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 
 // kernel mode user.
diff --git a/Private/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp
index 465ff1fc..49406f1b 100644
--- a/Private/KernelKit/SMPManager.hpp
+++ b/Private/KernelKit/SMPManager.hpp
@@ -8,7 +8,7 @@
 #define _INC_SMP_MANAGER_HPP
 
 #include <ArchKit/ArchKit.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Ref.hpp>
 
 // Last Rev
diff --git a/Private/KernelKit/Semaphore.hpp b/Private/KernelKit/Semaphore.hpp
index 8897a135..6be56f21 100644
--- a/Private/KernelKit/Semaphore.hpp
+++ b/Private/KernelKit/Semaphore.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <NewKit/Defines.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 
 namespace HCore
 {
diff --git a/Private/KernelKit/Timer.hpp b/Private/KernelKit/Timer.hpp
index ddfac06a..f60f6e0e 100644
--- a/Private/KernelKit/Timer.hpp
+++ b/Private/KernelKit/Timer.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <ArchKit/ArchKit.hpp>
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 
 #include <NewKit/ErrorID.hpp>
 
diff --git a/Private/NetworkKit/NetworkDevice.hpp b/Private/NetworkKit/NetworkDevice.hpp
index 1550afd1..74b60068 100644
--- a/Private/NetworkKit/NetworkDevice.hpp
+++ b/Private/NetworkKit/NetworkDevice.hpp
@@ -43,9 +43,17 @@ struct PACKED NetworkDeviceCommand final {
   UInt32 DmaHigh;
 };
 
+/// @brief TCP device.
 using TCPNetworkDevice = NetworkDevice;
+
+/// @brief UDP device.
 using UDPNetworkDevice = NetworkDevice;
+
+/// @brief PPP device.
 using PPPNetworkDevice = NetworkDevice;
+
+/// @brief HPC device.
+using HPCNetworkDevice = NetworkDevice;
 }  // namespace HCore
 
 #include <NetworkKit/NetworkDevice.inl>
diff --git a/Private/NewBoot/BootKit/Arch/AHCI.hxx b/Private/NewBoot/BootKit/Arch/AHCI.hxx
index 78a2c9c6..2047c404 100644
--- a/Private/NewBoot/BootKit/Arch/AHCI.hxx
+++ b/Private/NewBoot/BootKit/Arch/AHCI.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <Drivers/AHCI/Defines.hxx>
 
 class BDeviceAHCI final {
diff --git a/Private/NewKit/Json.hpp b/Private/NewKit/Json.hpp
index 6b6d90c0..3a7aa7cb 100644
--- a/Private/NewKit/Json.hpp
+++ b/Private/NewKit/Json.hpp
@@ -9,7 +9,7 @@
 
 // last-rev: 30/01/24
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 #include <NewKit/Stream.hpp>
 #include <NewKit/String.hpp>
diff --git a/Private/NewKit/MutableArray.hpp b/Private/NewKit/MutableArray.hpp
index 1b1e9229..24bb06d4 100644
--- a/Private/NewKit/MutableArray.hpp
+++ b/Private/NewKit/MutableArray.hpp
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Array.hpp>
 #include <NewKit/Defines.hpp>
 
diff --git a/Private/Source/IndexableProperty.cxx b/Private/Source/IndexableProperty.cxx
index cdc7b93d..4341038c 100644
--- a/Private/Source/IndexableProperty.cxx
+++ b/Private/Source/IndexableProperty.cxx
@@ -6,7 +6,7 @@
 
 //! @brief Filesystem Indexer.
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <FSKit/IndexableProperty.hxx>
 #include <NewKit/MutableArray.hpp>
 #include <NewKit/Utils.hpp>
diff --git a/Private/Source/PEFCodeManager.cxx b/Private/Source/PEFCodeManager.cxx
index 4c599856..d0ca40d3 100644
--- a/Private/Source/PEFCodeManager.cxx
+++ b/Private/Source/PEFCodeManager.cxx
@@ -126,7 +126,7 @@ VoidPtr PEFLoader::FindSymbol(const char *name, Int32 kind) {
   return nullptr;
 }
 
-ErrorOr<VoidPtr> PEFLoader::LoadStart() {
+ErrorOr<VoidPtr> PEFLoader::FindStart() {
   if (auto sym = this->FindSymbol(kPefStart, kPefCode); sym)
     return ErrorOr<VoidPtr>(sym);
 
@@ -137,7 +137,7 @@ bool PEFLoader::IsLoaded() noexcept { return !fBad && fCachedBlob; }
 
 namespace Utils {
 bool execute_from_image(PEFLoader &exec) noexcept {
-  auto errOrStart = exec.LoadStart();
+  auto errOrStart = exec.FindStart();
 
   if (errOrStart.Error() != 0) return false;
 
diff --git a/Public/Kits/System.Core/FileAPI.hxx b/Public/Kits/System.Core/FileAPI.hxx
index 66ecef22..2f799330 100644
--- a/Public/Kits/System.Core/FileAPI.hxx
+++ b/Public/Kits/System.Core/FileAPI.hxx
@@ -7,20 +7,21 @@
 #ifndef _SYSTEM_KIT_HCORE_FILE_HPP
 #define _SYSTEM_KIT_HCORE_FILE_HPP
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 
 using namespace HCore;
 
 /// @brief SOM class, translated to C++
 
-class HFile final {
+namespace System {
+class File final {
  public:
-  explicit HFile(const char *path);
-  ~HFile();
+  explicit File(const char *path);
+  ~File();
 
  public:
-  HCORE_COPY_DEFAULT(HFile);
+  HCORE_COPY_DEFAULT(File);
 
  public:
   voidPtr Read(SizeT off, SizeT sz);
@@ -35,6 +36,7 @@ class HFile final {
   void MIME(const char *mime);
 };
 
-typedef HFile *HFilePtr;
+typedef File *FilePtr;
+} // namespace System
 
 #endif  // ifndef _SYSTEM_KIT_HCORE_FILE_HPP
diff --git a/Public/Kits/System.Core/HeapAPI.cxx b/Public/Kits/System.Core/HeapAPI.cxx
index 2dc7338b..232b4927 100644
--- a/Public/Kits/System.Core/HeapAPI.cxx
+++ b/Public/Kits/System.Core/HeapAPI.cxx
@@ -8,28 +8,29 @@
 #include <System.Core/hcore.h>
 
 using namespace HCore;
+using namespace System;
 
 STATIC HcObjectPtr kObjectHeap;
 
-HHeap* HHeap::Shared() noexcept {
-    static HHeap* heap = nullptr;
+Heap* Heap::Shared() noexcept {
+    static Heap* heap = nullptr;
 
     if (!heap) {
-        heap = new HHeap();
+        heap = new Heap();
         kObjectHeap = HcGetProcessHeap();
     }
 
     return heap;
 }
 
-void HHeap::Delete(HHeapPtr me) noexcept { HcFreeProcessHeap(kObjectHeap, me); }
+void Heap::Delete(HeapPtr me) noexcept { HcFreeProcessHeap(kObjectHeap, me); }
 
-SizeT HHeap::Size(HHeapPtr me) noexcept { 
+SizeT Heap::Size(HeapPtr me) noexcept { 
     CA_MUST_PASS(me);
     return HcProcessHeapSize(kObjectHeap, me); 
 }
 
-HHeapPtr HHeap::New(const SizeT &sz, const Int32 flags) {
+HeapPtr Heap::New(const SizeT &sz, const Int32 flags) {
     SizeT _sz = sz;
     if (!_sz) ++_sz;
 
diff --git a/Public/Kits/System.Core/HeapAPI.hxx b/Public/Kits/System.Core/HeapAPI.hxx
index 9391bc4f..f50ff6f7 100644
--- a/Public/Kits/System.Core/HeapAPI.hxx
+++ b/Public/Kits/System.Core/HeapAPI.hxx
@@ -6,16 +6,17 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Defines.hpp>
 
 /// @brief SOM class, translated to C++
 
 using namespace HCore;
 
-class HMemoryException;
+namespace System {
+class MemoryException;
 
-typedef VoidPtr HHeapPtr;
+typedef VoidPtr HeapPtr;
 
 enum {
   kHeapExpandable = 2,
@@ -25,32 +26,32 @@ enum {
   kHeapNoFlags = 0
 };
 
-class HHeap final {
+class Heap final {
  private:
-  explicit HHeap();
+  explicit Heap();
 
  public:
-  ~HHeap();
+  ~Heap();
 
  public:
-  HCORE_COPY_DEFAULT(HHeap);
+  HCORE_COPY_DEFAULT(Heap);
 
  public:
-  static HHeap *Shared() noexcept;
+  static Heap *Shared() noexcept;
 
  public:
-  void Delete(HHeapPtr me) noexcept;
-  SizeT Size(HHeapPtr me) noexcept;
-  HHeapPtr New(const SizeT &sz, const Int32 flags = kHeapNoFlags);
+  void Delete(HeapPtr me) noexcept;
+  SizeT Size(HeapPtr me) noexcept;
+  HeapPtr New(const SizeT &sz, const Int32 flags = kHeapNoFlags);
 };
 
-class HMemoryException final {
+class MemoryException final {
  public:
-  explicit HMemoryException() = default;
-  ~HMemoryException() = default;
+  explicit MemoryException() = default;
+  ~MemoryException() = default;
 
  public:
-  HCORE_COPY_DEFAULT(HMemoryException);
+  HCORE_COPY_DEFAULT(MemoryException);
 
  public:
   const char *Name();
@@ -60,5 +61,6 @@ class HMemoryException final {
   const char *mReason{"HeapAPI: Memory Exception!"};
 
  private:
-  friend HHeap;
+  friend Heap;
 };
+} // namespace System
\ No newline at end of file
diff --git a/Public/Kits/System.Graphics/Core.hxx b/Public/Kits/System.Graphics/Core.hxx
index db9aa36f..d0f62418 100644
--- a/Public/Kits/System.Graphics/Core.hxx
+++ b/Public/Kits/System.Graphics/Core.hxx
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <NewKit/Array.hpp>
 #include <NewKit/Defines.hpp>
 #include <NewKit/Ref.hpp>
@@ -28,7 +28,7 @@
 #define G_API __attribute__((pef_container(".EXPORT")))
 #endif  // ifdef __EXPORT_LIB
 
-namespace HCore {
+namespace System::Graphics {
 template <typename... T>
 class GAction;
 
@@ -143,7 +143,7 @@ class G_API GApplication final {
 
 class G_API GDocument final {
  public:
-  explicit GDocument(StringView& sv) : mString(GString::Construct(sv)) {}
+  explicit GDocument(HCore::StringView& sv) : mString(GString::Construct(sv)) {}
   ~GDocument() = default;
 
   HCORE_COPY_DEFAULT(GDocument);
@@ -182,4 +182,4 @@ inline GFrameType* frame_cast(GFrameBase* Frame) {
 
   return dynamic_cast<GFrameType*>(Frame);
 }
-}  // namespace HCore
+}  // namespace System::Graphics
diff --git a/Public/Kits/System.Graphics/Dim2d.cxx b/Public/Kits/System.Graphics/Dim2d.cxx
index 8623a0e1..5925660d 100644
--- a/Public/Kits/System.Graphics/Dim2d.cxx
+++ b/Public/Kits/System.Graphics/Dim2d.cxx
@@ -13,8 +13,8 @@
 
 #include <System.Graphics/Dim2d.hxx>
 
-namespace HCore {
+namespace System::Graphics {
 HCore::UInt& Dim2d::X() { return m_X; }
 
 HCore::UInt& Dim2d::Y() { return m_Y; }
-}  // namespace HCore
+}  // namespace System::Graphics
diff --git a/Public/Kits/System.Graphics/Dim2d.hxx b/Public/Kits/System.Graphics/Dim2d.hxx
index a4f5fa8d..77d42c90 100644
--- a/Public/Kits/System.Graphics/Dim2d.hxx
+++ b/Public/Kits/System.Graphics/Dim2d.hxx
@@ -17,7 +17,7 @@
 
 #include <System.Graphics/Core.hxx>
 
-namespace HCore {
+namespace System::Graphics {
 class G_API Dim2d final {
  public:
   explicit Dim2d() = delete;
@@ -33,6 +33,6 @@ class G_API Dim2d final {
   HCore::UInt m_X{0};
   HCore::UInt m_Y{0};
 };
-}  // namespace HCore
+}  // namespace System::Graphics
 
 #endif /* ifndef __DIM2D__ */
diff --git a/Public/Kits/System.Graphics/Frame.cxx b/Public/Kits/System.Graphics/Frame.cxx
index 10726b57..ddb7b5ce 100644
--- a/Public/Kits/System.Graphics/Frame.cxx
+++ b/Public/Kits/System.Graphics/Frame.cxx
@@ -13,6 +13,6 @@
 
 #include <System.Graphics/Frame.hxx>
 
-namespace HCore {
+namespace System::Graphics {
 
-} // namespace HCore
+} // namespace System::Graphics
diff --git a/Public/Kits/System.Graphics/Frame.hxx b/Public/Kits/System.Graphics/Frame.hxx
index e0d52a4c..6c305cd3 100644
--- a/Public/Kits/System.Graphics/Frame.hxx
+++ b/Public/Kits/System.Graphics/Frame.hxx
@@ -17,7 +17,7 @@
 #include <System.Graphics/Dim2d.hxx>
 #include <NewKit/MutableArray.hpp>
 
-namespace HCore {
+namespace System::Graphics {
 class G_API GFrame {
  public:
   explicit GFrame(GFrame* parent = nullptr) : m_ParentFrame(parent) {}
@@ -56,4 +56,4 @@ class G_API GFrame {
   HCore::MutableArray<GFrame*> m_Frames;
   GFrame* m_ParentFrame{nullptr};
 };
-}  // namespace HCore
+}  // namespace System::Graphics
diff --git a/Public/Kits/System.Zip/Zip.cxx b/Public/Kits/System.Zip/Zip.cxx
index 81a39a18..39818da7 100644
--- a/Public/Kits/System.Zip/Zip.cxx
+++ b/Public/Kits/System.Zip/Zip.cxx
@@ -14,18 +14,18 @@
 
 namespace System::Zip {
 ZipStream::ZipStream()
-    : fSharedData(HHeap::Shared()->New(kInitialSz, kHeapExpandable)),
+    : fSharedData(System::Heap::Shared()->New(kInitialSz, kHeapExpandable)),
       fSharedSz(kInitialSz) {}
 
 ZipStream::~ZipStream() noexcept {
-  if (fSharedData) HHeap::Shared()->Delete(fSharedData);
+  if (fSharedData) System::Heap::Shared()->Delete(fSharedData);
 }
 
-HFilePtr ZipStream::FlushToFile(const char *name) {
-  HFilePtr fp = new HFile(name);
+FilePtr ZipStream::FlushToFile(const char *name) {
+  FilePtr fp = new File(name);
   CA_MUST_PASS(fp);
 
-  this->fSharedSz = HHeap::Shared()->Size(this->fSharedData);
+  this->fSharedSz = System::Heap::Shared()->Size(this->fSharedData);
 
   fp->MIME(kZipKitMime);
   fp->Write(this->fSharedData, this->fSharedSz);
diff --git a/Public/Kits/System.Zip/Zip.hpp b/Public/Kits/System.Zip/Zip.hpp
index 490fb27c..7affe917 100644
--- a/Public/Kits/System.Zip/Zip.hpp
+++ b/Public/Kits/System.Zip/Zip.hpp
@@ -11,7 +11,7 @@
 
 #define Z_SOLO 1
 
-#include <CompilerKit/CompilerKit.hpp>
+#include <CompilerKit/CompilerKit.hxx>
 #include <System.Zip/Defines.hpp>
 #include <System.Zip/zlib.hpp>
 
@@ -27,7 +27,7 @@ class ZipStream final {
   HCORE_COPY_DEFAULT(ZipStream);
 
  public:
-  HFilePtr FlushToFile(const char *name);
+  FilePtr FlushToFile(const char *name);
   void *Deflate(const char *name);
   void Inflate(const char *name, void *data);