8 files changed, 20 insertions, 20 deletions
diff --git a/dev/kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h
index 03f9a717..6340d966 100644
--- a/dev/kernel/KernelKit/DriveMgr.h
+++ b/dev/kernel/KernelKit/DriveMgr.h
@@ -89,12 +89,12 @@ typedef DriveTrait* DriveTraitPtr;
  * @note This class has all of it's drive set to nullptr, allocate them using
  * GetAddressOf(index).
  */
-class MountpointInterface final {
+class IMountpoint final {
  public:
-  explicit MountpointInterface() = default;
-  ~MountpointInterface()         = default;
+  explicit IMountpoint() = default;
+  ~IMountpoint()         = default;
 
-  NE_COPY_DEFAULT(MountpointInterface)
+  NE_COPY_DEFAULT(IMountpoint)
 
  public:
   DriveTrait& A() { return mA; }
diff --git a/dev/kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h
index cc2feeb8..ff290780 100644
--- a/dev/kernel/KernelKit/FileMgr.h
+++ b/dev/kernel/KernelKit/FileMgr.h
@@ -23,12 +23,12 @@
 #define INC_FILEMGR_H
 
 /// @file FileMgr.h
-/// @brief File Manager.
+/// @brief File Manager System.
 /// @author Amlal El Mahrouss (amlal@nekernel.org)
 
 //! Include filesystems that NeKernel supports.
 #include <FSKit/Ext2+IFS.h>
-#include <FSKit/HeFS.h>
+#include <FSKit/OpenHeFS.h>
 #include <FSKit/NeFS.h>
 
 #include <CompilerKit/CompilerKit.h>
@@ -71,7 +71,7 @@ enum {
   kFileIOCnt    = (kFileFlagData - kFileWriteAll) + 1,
 };
 
-typedef VoidPtr NodePtr;
+using NodePtr = VoidPtr;
 
 /**
 @brief Filesystem Mgr Interface class
diff --git a/dev/kernel/KernelKit/IFS.h b/dev/kernel/KernelKit/IFS.h
index ed1d87b5..b1dd2001 100644
--- a/dev/kernel/KernelKit/IFS.h
+++ b/dev/kernel/KernelKit/IFS.h
@@ -14,12 +14,12 @@ namespace Kernel {
 /// @param DrvTrait drive info
 /// @param DrvIndex drive index.
 /// @return
-Int32 fs_ifs_read(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex);
+Int32 fs_ifs_read(IMountpoint* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex);
 
 /// @brief Write to IFS disk.
 /// @param Mnt mounted interface.
 /// @param DrvTrait drive info
 /// @param DrvIndex drive index.
 /// @return
-Int32 fs_ifs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex);
+Int32 fs_ifs_write(IMountpoint* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex);
 }  // namespace Kernel
diff --git a/dev/kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/ILoader.h
index 1f9b1e56..ec8ee1bc 100644
--- a/dev/kernel/KernelKit/LoaderInterface.h
+++ b/dev/kernel/KernelKit/ILoader.h
@@ -14,12 +14,12 @@
 namespace Kernel {
 /// @brief This interface is used to make loader contracts (MSCOFF, PEF).
 /// @author @Amlal-El-Mahrouss
-class LoaderInterface {
+class ILoader {
  public:
-  explicit LoaderInterface() = default;
-  virtual ~LoaderInterface() = default;
+  explicit ILoader() = default;
+  virtual ~ILoader() = default;
 
-  NE_COPY_DEFAULT(LoaderInterface)
+  NE_COPY_DEFAULT(ILoader)
 
  public:
   virtual _Output ErrorOr<VoidPtr> GetBlob()                                              = 0;
diff --git a/dev/kernel/KernelKit/PEF.h b/dev/kernel/KernelKit/PEF.h
index f0ba9ef9..0410c63a 100644
--- a/dev/kernel/KernelKit/PEF.h
+++ b/dev/kernel/KernelKit/PEF.h
@@ -15,7 +15,7 @@
 #define __KERNELKIT_PEF_H__
 
 #include <CompilerKit/CompilerKit.h>
-#include <KernelKit/LoaderInterface.h>
+#include <KernelKit/ILoader.h>
 #include <NeKit/Defines.h>
 
 #define kPefMagic "Open"
diff --git a/dev/kernel/KernelKit/PEFCodeMgr.h b/dev/kernel/KernelKit/PEFCodeMgr.h
index d61aa863..3ed9c097 100644
--- a/dev/kernel/KernelKit/PEFCodeMgr.h
+++ b/dev/kernel/KernelKit/PEFCodeMgr.h
@@ -27,7 +27,7 @@ namespace Kernel {
 /// \name PEFLoader
 /// \brief PEF loader class.
 ///
-class PEFLoader : public LoaderInterface {
+class PEFLoader : public ILoader {
  private:
   explicit PEFLoader() = delete;
 
diff --git a/dev/kernel/KernelKit/UserMgr.h b/dev/kernel/KernelKit/UserMgr.h
index 6fa8ba14..c660025b 100644
--- a/dev/kernel/KernelKit/UserMgr.h
+++ b/dev/kernel/KernelKit/UserMgr.h
@@ -22,9 +22,9 @@
 
 ///! We got the MGMT, STD (%s format) and GUEST users,
 ///! all are used to make authorized operations.
-#define kSuperUser "OS AUTHORITY/MGMT/%s"
-#define kGuestUser "OS AUTHORITY/GUEST/%s"
-#define kStdUser "OS AUTHORITY/STD/%s"
+#define kSuperUser "NEKERNEL/MGMT/%s"
+#define kGuestUser "NEKERNEL/GUEST/%s"
+#define kStdUser "NEKERNEL/STD/%s"
 
 #define kUsersDir "/users/"
 
diff --git a/dev/kernel/KernelKit/ZXD.h b/dev/kernel/KernelKit/ZXD.h
index 966c54c7..bae47258 100644
--- a/dev/kernel/KernelKit/ZXD.h
+++ b/dev/kernel/KernelKit/ZXD.h
@@ -23,7 +23,7 @@ enum ZXD_FLAGS {
 
 /// @brief ZXD executable header
 /// @details This header is used to identify ZXD executable files.
-struct PACKED ZXD_EXEC_HEADER {
+struct PACKED ZXD_EXEC_HEADER final {
   UInt32  fMagic;
   UInt32  fVersion;
   UInt32  fFlags;
@@ -42,7 +42,7 @@ struct PACKED ZXD_EXEC_HEADER {
 /// @brief ZXD stub header
 /// @details This header is used to identify ZXD stub files. It contains the size of the stub, the
 /// offset of the stub, and the CRC32 checksum of the stub.
-struct PACKED ZXD_STUB_HEADER {
+struct PACKED ZXD_STUB_HEADER final {
   UInt32 fStubSize;
   UInt32 fStubOffset;
   UInt32 fStubCRC32;