feat! breaking changes on kernel sources.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

427 files changed, 301 insertions, 298 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index 76953c39..6c6ed0f8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,9 +1,9 @@
 # boot, user, and kernel are owned by amlal@nekernel.org.

-/dev/kernel/ @amlel-el-mahrouss

-/dev/boot/ @amlel-el-mahrouss

-/dev/libDDK/ @amlel-el-mahrouss

-/dev/libMsg/ @0xf00sec

-/dev/libSystem/ @0xf00sec

+/src/kernel/ @amlel-el-mahrouss

+/src/boot/ @amlel-el-mahrouss

+/src/libDDK/ @amlel-el-mahrouss

+/src/libMsg/ @0xf00sec

+/src/libSystem/ @0xf00sec

 # some other parts (tools, frameworks) need ownership too.

 /public/ @amlel-el-mahrouss

 /tools/ @0xf00sec
\ No newline at end of file
diff --git a/README.md b/README.md
index 326cd99b..0159efaa 100644
--- a/README.md
+++ b/README.md
@@ -63,16 +63,16 @@ cd nekernel
 ./debug_ata_x64.sh   # For generic ATA PIO target (QEMU)
 ```
 
-- For ARM64 or other targets, see the scripts in `dev/boot/`.
+- For ARM64 or other targets, see the scripts in `src/boot/`.
 
 ---
 
 ## Structure
 
-- `dev/kernel/` — Core kernel source (scheduling, memory, VFS, drivers)
-- `dev/boot/` — Bootloader, platform bring-up, and early system code
-- `dev/libDDK/` — Driver Development Kit (DDK) and sample drivers
-- `dev/libSystem/` — Userland system call interface and runtime
+- `src/kernel/` — Core kernel source (scheduling, memory, VFS, drivers)
+- `src/boot/` — Bootloader, platform bring-up, and early system code
+- `src/libDDK/` — Driver Development Kit (DDK) and sample drivers
+- `src/libSystem/` — Userland system call interface and runtime
 - `public/tools/` — CLI tools (mkfs, fsck, open, manual, etc.)
 - `public/frameworks/` — Userland frameworks (CoreFoundation, DiskImage, etc.)
 - `docs/` — Specifications, design docs, and diagrams
diff --git a/compile_flags.txt b/compile_flags.txt
index e4e5b612..30e25200 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -1,10 +1,10 @@
--Idev/kernel
--Idev/
--Idev/user
--Idev/boot
--Idev/launch
--Idev/misc
--Idev/libDDK
+-Isrc/kernel
+-Isrc/
+-Isrc/user
+-Isrc/boot
+-Isrc/launch
+-Isrc/misc
+-Isrc/libDDK
 -Ipublic/tools
 -Ipublic/tools/mk.app
 -Ipublic/tools/mk.fwrk
@@ -14,7 +14,7 @@
 -Ipublic/tools/ld.fwrk
 -Ipublic/tools/open
 -Ipublic/frameworks
--Idev/boot/BootKit
+-Isrc/boot/BootKit
 -Itools/
 -I./
 -std=c++20
diff --git a/debug_ahci_arm64.sh b/debug_ahci_arm64.sh
index af20558a..dcf4f145 100755
--- a/debug_ahci_arm64.sh
+++ b/debug_ahci_arm64.sh
@@ -5,12 +5,12 @@ export ATA_PIO_SUPPORT=
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f arm64-desktop.make all
 cd ../boot
 make -f arm64-desktop.make all
 make -f arm64-desktop.make disk
 cd ../../
-./tools/mk_img.py ./dev/boot/src/nekernel-esp.img ./dev/boot/src/root
-cd dev/boot
+./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root
+cd src/boot
 make -f arm64-desktop.make run-efi-arm64
diff --git a/debug_ahci_x64.sh b/debug_ahci_x64.sh
index 97ff57ee..8e1ed083 100755
--- a/debug_ahci_x64.sh
+++ b/debug_ahci_x64.sh
@@ -5,12 +5,12 @@ export ATA_PIO_SUPPORT=
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f amd64-desktop.make all
 cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make disk
 cd ../../
-./tools/mk_img.py ./dev/boot/src/nekernel-esp.img ./dev/boot/src/root
-cd dev/boot
+./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root
+cd src/boot
 make -f amd64-desktop.make run-efi-amd64-ahci
\ No newline at end of file
diff --git a/debug_ata_x64.sh b/debug_ata_x64.sh
index b021c3ed..dc133614 100755
--- a/debug_ata_x64.sh
+++ b/debug_ata_x64.sh
@@ -5,12 +5,12 @@ export ATA_PIO_SUPPORT=1
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f amd64-desktop.make all
 cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make disk
 cd ../../
-./tools/mk_img.py ./dev/boot/src/nekernel-esp.img ./dev/boot/src/root
-cd dev/boot
+./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root
+cd src/boot
 make -f amd64-desktop.make run-efi-amd64-ata-pio
diff --git a/docs/STANDARD_FWRK.md b/docs/STANDARD_FWRK.md
index 1411fe5e..8bc1444c 100644
--- a/docs/STANDARD_FWRK.md
+++ b/docs/STANDARD_FWRK.md
@@ -41,7 +41,7 @@ The JSON manifest file defines the build configuration, compilation flags, and m
 
 - **`headers_path`** (array): Array of header search paths (relative to framework)
   - Include paths for finding dependencies and kernel interfaces
-  - Example: `["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/"]`
+  - Example: `["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/"]`
 
 - **`sources_path`** (array): Array of source file globs to compile
   - Example: `["src/*.cc"]`
@@ -62,7 +62,7 @@ The JSON manifest file defines the build configuration, compilation flags, and m
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../dev", "../../../dev/kernel"],
+    "headers_path": ["../", "./", "../../../dev", "../../../src/kernel"],
     "sources_path": ["src/*.cc"],
     "output_name": "./dist/libCoreFoundation.fwrk.dylib",
     "compiler_flags": [
diff --git a/docs/tex/binary_mutex.tex b/docs/tex/binary_mutex.tex
index 0f6a6663..583dffeb 100644
--- a/docs/tex/binary_mutex.tex
+++ b/docs/tex/binary_mutex.tex
@@ -72,6 +72,6 @@ Thus its existence in Legacy VMKernel and NeKernel.}
 
 {Legacy VMKernel}: \href{https://snu.systems/specs/vmkernel}{Legacy VMKernel}
 
-{BinaryMutex}: \href{https://github.com/nekernel-org/nekernel/blob/dev/dev/kernel/KernelKit/BinaryMutex.h}{BinaryMutex}
+{BinaryMutex}: \href{https://github.com/nekernel-org/nekernel/blob/src/src/kernel/KernelKit/BinaryMutex.h}{BinaryMutex}
 
 \end{document}
diff --git a/docs/tex/core_process_scheduler.tex b/docs/tex/core_process_scheduler.tex
index 41bad465..4be38308 100644
--- a/docs/tex/core_process_scheduler.tex
+++ b/docs/tex/core_process_scheduler.tex
@@ -125,6 +125,6 @@ struct ProcessImage final {
 
 {Legacy VMKernel}: \href{https://snu.systems/specs/vmkernel}{Legacy VMKernel}
 
-{CoreProcessScheduler C++ Header}: \href{https://github.com/nekernel-org/nekernel/blob/dev/dev/kernel/KernelKit/CoreProcessScheduler.h}{CoreProcessScheduler}
+{CoreProcessScheduler C++ Header}: \href{https://github.com/nekernel-org/nekernel/blob/src/src/kernel/KernelKit/CoreProcessScheduler.h}{CoreProcessScheduler}
 
 \end{document}
diff --git a/docs/tex/hefs.tex b/docs/tex/openhefs.tex
index 1ce387a0..ea618196 100644
--- a/docs/tex/hefs.tex
+++ b/docs/tex/openhefs.tex
@@ -20,16 +20,16 @@ The High-throughput Extended File System (OpenHeFS) is a custom filesystem tailo
 \hline
 \textbf{Name} & \textbf{Value / Description} \\
 \hline
-\texttt{kHeFSVersion} & 0x0103 \\
-\texttt{kHeFSMagic} & "OpenHeFS" (8-byte magic identifier) \\
-\texttt{kHeFSMagicLen} & 9 \\
-\texttt{kHeFSBlockLen} & 512 bytes \\
-\texttt{kHeFSFileNameLen} & 256 characters \\
-\texttt{kHeFSPartNameLen} & 128 characters \\
-\texttt{kHeFSMinimumDiskSize} & 128 GiB \\
-\texttt{kHeFSDefaultVolumeName} & "OpenHeFS Volume" \\
-\texttt{kHeFSINDStartOffset} & Offset after boot node \\
-\texttt{kHeFSSearchAllStr} & "*" (wildcard string) \\
+\texttt{kOpenHeFSVersion} & 0x0103 \\
+\texttt{kOpenHeFSMagic} & "OpenHeFS" (8-byte magic identifier) \\
+\texttt{kOpenHeFSMagicLen} & 9 \\
+\texttt{kOpenHeFSBlockLen} & 512 bytes \\
+\texttt{kOpenHeFSFileNameLen} & 256 characters \\
+\texttt{kOpenHeFSPartNameLen} & 128 characters \\
+\texttt{kOpenHeFSMinimumDiskSize} & 128 GiB \\
+\texttt{kOpenHeFSDefaultVolumeName} & "OpenHeFS Volume" \\
+\texttt{kOpenHeFSINDStartOffset} & Offset after boot node \\
+\texttt{kOpenHeFSSearchAllStr} & "*" (wildcard string) \\
 \hline
 \end{longtable}
 
@@ -120,7 +120,7 @@ Red-black tree based directory node.
 \begin{itemize}
   \item \texttt{fHashPath}, \texttt{fFlags}, \texttt{fKind}, \texttt{fEntryCount}, \texttt{fChecksum}
   \item Time and ownership same as inode
-  \item \texttt{fINSlices[kHeFSSliceCount]} for storing child inode links
+  \item \texttt{fINSlices[kOpenHeFSSliceCount]} for storing child inode links
 \item RB-Tree Fields:
 \begin{itemize}
   \item \texttt{fColor}: Red or Black
@@ -145,8 +145,8 @@ Red-black tree based directory node.
 
 Constants:
 \begin{itemize}
-  \item \texttt{kHeFSTimeInvalid = 0x0}
-  \item \texttt{kHeFSTimeMax = 0xFFFFFFFFFFFFFFFF - 1}
+  \item \texttt{kOpenHeFSTimeInvalid = 0x0}
+  \item \texttt{kOpenHeFSTimeMax = 0xFFFFFFFFFFFFFFFF - 1}
 \end{itemize}
 
 \section{Filesystem API}\label{sec:filesystem-api}
diff --git a/gdb.sh b/gdb.sh
index d8a4e8df..f908da16 100755
--- a/gdb.sh
+++ b/gdb.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-gdb -q -x dev/boot/gdbinit
+gdb -q -x src/boot/gdbinit
diff --git a/kernel_ci_x64.sh b/kernel_ci_x64.sh
index e052b4f2..42f61636 100755
--- a/kernel_ci_x64.sh
+++ b/kernel_ci_x64.sh
@@ -5,5 +5,5 @@ export ATA_PIO_SUPPORT=
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f amd64-desktop.make all
diff --git a/modules_ahci_x64.sh b/modules_ahci_x64.sh
index 89d5f60b..aabb00bd 100755
--- a/modules_ahci_x64.sh
+++ b/modules_ahci_x64.sh
@@ -4,7 +4,7 @@
 # 03/25/25: Add 'disk' build step.
 # 04/05/25: Improve and fix script.
 
-cd dev/boot/modules/SysChk
+cd src/boot/modules/SysChk
 nebuild amd64-ahci-epm.json
 cd ../
 cd BootNet
diff --git a/modules_pio_x64.sh b/modules_pio_x64.sh
index bc1153ba..0cf1395d 100755
--- a/modules_pio_x64.sh
+++ b/modules_pio_x64.sh
@@ -4,7 +4,7 @@
 # 03/25/25: Add 'disk' build step.
 # 04/05/25: Improve and fix script.
 
-cd dev/boot/modules/SysChk
+cd src/boot/modules/SysChk
 nebuild amd64-pio-epm.json
 cd ../
 cd BootNet
diff --git a/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json b/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json
index 39e6b480..fa891511 100644
--- a/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json
+++ b/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json
@@ -1,7 +1,7 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../dev", "../../../dev/kernel"],
+    "headers_path": ["../", "./", "../../../dev", "../../../src/kernel"],
     "sources_path": ["src/*.cc"],
     "output_name": "./dist/libCoreFoundation.fwrk.dylib",
     "compiler_flags": [
diff --git a/public/frameworks/DiskImage.fwrk/DiskImage.json b/public/frameworks/DiskImage.fwrk/DiskImage.json
index 16c538e5..7b424b11 100644
--- a/public/frameworks/DiskImage.fwrk/DiskImage.json
+++ b/public/frameworks/DiskImage.fwrk/DiskImage.json
@@ -1,7 +1,7 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../dev", "../../../dev/kernel"],
+    "headers_path": ["../", "./", "../../../dev", "../../../src/kernel"],
     "sources_path": ["src/*.cc"],
     "output_name": "./dist/libDiskImage.fwrk.dylib",
     "compiler_flags": [
diff --git a/public/frameworks/KernelTest.fwrk/KernelTest.json b/public/frameworks/KernelTest.fwrk/KernelTest.json
index b8c322b6..691fbac5 100644
--- a/public/frameworks/KernelTest.fwrk/KernelTest.json
+++ b/public/frameworks/KernelTest.fwrk/KernelTest.json
@@ -1,7 +1,7 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../dev", "../../../dev/kernel"],
+    "headers_path": ["../", "./", "../../../dev", "../../../src/kernel"],
     "sources_path": ["src/*.cc"],
     "output_name": "./dist/libKernelTest.fwrk.dylib",
     "compiler_flags": [
diff --git a/public/frameworks/LaunchHelpers.fwrk/LaunchHelpers.json b/public/frameworks/LaunchHelpers.fwrk/LaunchHelpers.json
index 9ec17332..80b9eda8 100644
--- a/public/frameworks/LaunchHelpers.fwrk/LaunchHelpers.json
+++ b/public/frameworks/LaunchHelpers.fwrk/LaunchHelpers.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/diutil/diutil.json b/public/tools/diutil/diutil.json
index a863634b..b1d6e5f0 100644
--- a/public/tools/diutil/diutil.json
+++ b/public/tools/diutil/diutil.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
-  "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"],
-  "sources_path": ["src/CommandLine.cc", "../../../public/frameworks/DiskImage.fwrk/src/*.cc", "../../../dev/libSystem/src/*.cc"],
+  "headers_path": ["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/", "./"],
+  "sources_path": ["src/CommandLine.cc", "../../../public/frameworks/DiskImage.fwrk/src/*.cc", "../../../src/libSystem/src/*.cc"],
   "output_name": "./dist/diutil",
   "cpp_macros": [
     "kDUTILVersion=0x0100",
diff --git a/public/tools/diutil/vendor/Dialogs.h b/public/tools/diutil/vendor/Dialogs.h
index 84e239f5..a59bada3 100644
--- a/public/tools/diutil/vendor/Dialogs.h
+++ b/public/tools/diutil/vendor/Dialogs.h
@@ -703,7 +703,7 @@ inline void internal::executor::start_process(std::vector<std::string> const& co
     dup2(out[1], STDOUT_FILENO);
 
     // Ignore stderr so that it doesn’t pollute the console (e.g. GTK+ errors from zenity)
-    int fd = open("/dev/null", O_WRONLY);
+    int fd = open("/src/null", O_WRONLY);
     dup2(fd, STDERR_FILENO);
     close(fd);
 
diff --git a/public/tools/manual/manual.json b/public/tools/manual/manual.json
index 04626145..cb3acaf3 100644
--- a/public/tools/manual/manual.json
+++ b/public/tools/manual/manual.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/mgmt.hefs/mgmt.hefs.json b/public/tools/mgmt.hefs/mgmt.hefs.json
index dc1181c3..d7f4a97f 100644
--- a/public/tools/mgmt.hefs/mgmt.hefs.json
+++ b/public/tools/mgmt.hefs/mgmt.hefs.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/mgmt.launch/mgmt.launch.json b/public/tools/mgmt.launch/mgmt.launch.json
index a181d745..500882c2 100644
--- a/public/tools/mgmt.launch/mgmt.launch.json
+++ b/public/tools/mgmt.launch/mgmt.launch.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/mgmt.oe/mgmt.oe.json b/public/tools/mgmt.oe/mgmt.oe.json
index b4e9d586..1890e2e0 100644
--- a/public/tools/mgmt.oe/mgmt.oe.json
+++ b/public/tools/mgmt.oe/mgmt.oe.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/mgmt/mgmt.json b/public/tools/mgmt/mgmt.json
index 5cdd0ec7..fa9369c4 100644
--- a/public/tools/mgmt/mgmt.json
+++ b/public/tools/mgmt/mgmt.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/public/tools/ping/ping.json b/public/tools/ping/ping.json
index d8d4133a..744bc931 100644
--- a/public/tools/ping/ping.json
+++ b/public/tools/ping/ping.json
@@ -3,9 +3,9 @@
     "compiler_std": "c++20",
     "headers_path": [
         "./",
-        "../../../dev/kernel",
+        "../../../src/kernel",
         "../../../public/frameworks/",
-        "../../../dev/",
+        "../../../src/",
         "./"
     ],
     "sources_path": [],
diff --git a/release_ahci_x64.sh b/release_ahci_x64.sh
index f081c774..bd6e11aa 100755
--- a/release_ahci_x64.sh
+++ b/release_ahci_x64.sh
@@ -2,12 +2,12 @@
 
 export AHCI_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f amd64-desktop.make all
 cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make disk
 cd ../../
-./tools/mk_img.py ./dev/boot/src/nekernel-esp.img ./dev/boot/src/root
-cd dev/boot
+./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root
+cd src/boot
 make -f amd64-desktop.make run-efi-amd64-ahci
\ No newline at end of file
diff --git a/release_ata_x64.sh b/release_ata_x64.sh
index d69e3d3f..2a2fc8b4 100755
--- a/release_ata_x64.sh
+++ b/release_ata_x64.sh
@@ -2,12 +2,12 @@
 
 export ATA_PIO_SUPPORT=1
 
-cd dev/kernel
+cd src/kernel
 make -f amd64-desktop.make all
 cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make disk
 cd ../../
-./tools/mk_img.py ./dev/boot/src/nekernel-esp.img ./dev/boot/src/root
-cd dev/boot
+./tools/mk_img.py ./src/boot/src/nekernel-esp.img ./src/boot/src/root
+cd src/boot
 make -f amd64-desktop.make run-efi-amd64-ata-pio
\ No newline at end of file
diff --git a/setup_arm64_project.sh b/setup_arm64_project.sh
index ffc642d4..668ca0a8 100755
--- a/setup_arm64_project.sh
+++ b/setup_arm64_project.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd dev/boot
+cd src/boot
 make -f arm64-desktop.make efi
 make -f arm64-desktop.make epm-img
\ No newline at end of file
diff --git a/setup_x64_project.sh b/setup_x64_project.sh
index da74a332..eb145faf 100755
--- a/setup_x64_project.sh
+++ b/setup_x64_project.sh
@@ -4,7 +4,7 @@
 # 03/25/25: Add 'disk' build step.
 # 04/05/25: Improve and fix script.
 
-cd dev/libSystem
+cd src/libSystem
 cd src
 make libsys_asm_io_x64
 cd ..
diff --git a/dev/boot/BootKit/BitManip.h b/src/boot/BootKit/BitManip.h
index 32795328..32795328 100644
--- a/dev/boot/BootKit/BitManip.h
+++ b/src/boot/BootKit/BitManip.h
diff --git a/dev/boot/BootKit/BootKit.h b/src/boot/BootKit/BootKit.h
index e1a2b628..e1a2b628 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/src/boot/BootKit/BootKit.h
diff --git a/dev/boot/BootKit/BootThread.h b/src/boot/BootKit/BootThread.h
index abe4d653..abe4d653 100644
--- a/dev/boot/BootKit/BootThread.h
+++ b/src/boot/BootKit/BootThread.h
diff --git a/dev/boot/BootKit/Device.h b/src/boot/BootKit/Device.h
index 36e2b3d4..36e2b3d4 100644
--- a/dev/boot/BootKit/Device.h
+++ b/src/boot/BootKit/Device.h
diff --git a/dev/boot/BootKit/EPM.h b/src/boot/BootKit/EPM.h
index cc82dd41..cc82dd41 100644
--- a/dev/boot/BootKit/EPM.h
+++ b/src/boot/BootKit/EPM.h
diff --git a/dev/boot/BootKit/HW/ATA.h b/src/boot/BootKit/HW/ATA.h
index 25629869..25629869 100644
--- a/dev/boot/BootKit/HW/ATA.h
+++ b/src/boot/BootKit/HW/ATA.h
diff --git a/dev/boot/BootKit/HW/SATA.h b/src/boot/BootKit/HW/SATA.h
index 07ce7611..07ce7611 100644
--- a/dev/boot/BootKit/HW/SATA.h
+++ b/src/boot/BootKit/HW/SATA.h
diff --git a/dev/boot/BootKit/Platform.h b/src/boot/BootKit/Platform.h
index bfc738fc..bfc738fc 100644
--- a/dev/boot/BootKit/Platform.h
+++ b/src/boot/BootKit/Platform.h
diff --git a/dev/boot/BootKit/Protocol.h b/src/boot/BootKit/Protocol.h
index 0a049b77..0a049b77 100644
--- a/dev/boot/BootKit/Protocol.h
+++ b/src/boot/BootKit/Protocol.h
diff --git a/dev/boot/BootKit/Qr.h b/src/boot/BootKit/Qr.h
index f537aa5e..f537aa5e 100644
--- a/dev/boot/BootKit/Qr.h
+++ b/src/boot/BootKit/Qr.h
diff --git a/dev/boot/BootKit/QrPrelude.h b/src/boot/BootKit/QrPrelude.h
index e89fad7a..e89fad7a 100644
--- a/dev/boot/BootKit/QrPrelude.h
+++ b/src/boot/BootKit/QrPrelude.h
diff --git a/dev/boot/BootKit/Shared/base.h b/src/boot/BootKit/Shared/base.h
index c95db0cc..c95db0cc 100644
--- a/dev/boot/BootKit/Shared/base.h
+++ b/src/boot/BootKit/Shared/base.h
diff --git a/dev/boot/BootKit/Shared/bit.h b/src/boot/BootKit/Shared/bit.h
index 1ac29c89..1ac29c89 100644
--- a/dev/boot/BootKit/Shared/bit.h
+++ b/src/boot/BootKit/Shared/bit.h
diff --git a/dev/boot/BootKit/Support.h b/src/boot/BootKit/Support.h
index 110b220c..110b220c 100644
--- a/dev/boot/BootKit/Support.h
+++ b/src/boot/BootKit/Support.h
diff --git a/dev/boot/amd64-ci.make b/src/boot/amd64-ci.make
index eee7b3cb..eee7b3cb 100644
--- a/dev/boot/amd64-ci.make
+++ b/src/boot/amd64-ci.make
diff --git a/dev/boot/amd64-desktop.make b/src/boot/amd64-desktop.make
index 2ddc4659..2ddc4659 100644
--- a/dev/boot/amd64-desktop.make
+++ b/src/boot/amd64-desktop.make
diff --git a/dev/boot/arm64-desktop.make b/src/boot/arm64-desktop.make
index 44299cc3..44299cc3 100644
--- a/dev/boot/arm64-desktop.make
+++ b/src/boot/arm64-desktop.make
diff --git a/dev/boot/download-ovmf.ps1 b/src/boot/download-ovmf.ps1
index 5a2c5f0e..5a2c5f0e 100644
--- a/dev/boot/download-ovmf.ps1
+++ b/src/boot/download-ovmf.ps1
diff --git a/dev/boot/gdbinit b/src/boot/gdbinit
index b55fa645..b55fa645 100644
--- a/dev/boot/gdbinit
+++ b/src/boot/gdbinit
diff --git a/dev/boot/modules/.keep b/src/boot/modules/.keep
index e69de29b..e69de29b 100644
--- a/dev/boot/modules/.keep
+++ b/src/boot/modules/.keep
diff --git a/dev/boot/modules/BootNet/.hgkeep b/src/boot/modules/BootNet/.hgkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/modules/BootNet/.hgkeep
+++ b/src/boot/modules/BootNet/.hgkeep
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/src/boot/modules/BootNet/BootNet.cc
index 20d1a6c9..20d1a6c9 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/src/boot/modules/BootNet/BootNet.cc
diff --git a/dev/boot/modules/BootNet/BootNet.h b/src/boot/modules/BootNet/BootNet.h
index 9fe1a186..9fe1a186 100644
--- a/dev/boot/modules/BootNet/BootNet.h
+++ b/src/boot/modules/BootNet/BootNet.h
diff --git a/dev/boot/modules/BootNet/BootNetStartup.S b/src/boot/modules/BootNet/BootNetStartup.S
index a5832ee6..a5832ee6 100644
--- a/dev/boot/modules/BootNet/BootNetStartup.S
+++ b/src/boot/modules/BootNet/BootNetStartup.S
diff --git a/dev/boot/modules/BootNet/amd64.json b/src/boot/modules/BootNet/amd64.json
index 3d58cbc1..3d58cbc1 100644
--- a/dev/boot/modules/BootNet/amd64.json
+++ b/src/boot/modules/BootNet/amd64.json
diff --git a/dev/boot/modules/SysChk/.hgkeep b/src/boot/modules/SysChk/.hgkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/modules/SysChk/.hgkeep
+++ b/src/boot/modules/SysChk/.hgkeep
diff --git a/dev/boot/modules/SysChk/SysChk.cc b/src/boot/modules/SysChk/SysChk.cc
index 0706d457..0706d457 100644
--- a/dev/boot/modules/SysChk/SysChk.cc
+++ b/src/boot/modules/SysChk/SysChk.cc
diff --git a/dev/boot/modules/SysChk/SysChkStartup.S b/src/boot/modules/SysChk/SysChkStartup.S
index a5832ee6..a5832ee6 100644
--- a/dev/boot/modules/SysChk/SysChkStartup.S
+++ b/src/boot/modules/SysChk/SysChkStartup.S
diff --git a/dev/boot/modules/SysChk/amd64-ahci-epm.json b/src/boot/modules/SysChk/amd64-ahci-epm.json
index 8ce9bfd8..8ce9bfd8 100644
--- a/dev/boot/modules/SysChk/amd64-ahci-epm.json
+++ b/src/boot/modules/SysChk/amd64-ahci-epm.json
diff --git a/dev/boot/modules/SysChk/amd64-ahci-gpt.json b/src/boot/modules/SysChk/amd64-ahci-gpt.json
index 80bb433e..80bb433e 100644
--- a/dev/boot/modules/SysChk/amd64-ahci-gpt.json
+++ b/src/boot/modules/SysChk/amd64-ahci-gpt.json
diff --git a/dev/boot/modules/SysChk/amd64-pio-epm.json b/src/boot/modules/SysChk/amd64-pio-epm.json
index b1b95d8d..b1b95d8d 100644
--- a/dev/boot/modules/SysChk/amd64-pio-epm.json
+++ b/src/boot/modules/SysChk/amd64-pio-epm.json
diff --git a/dev/boot/modules/SysChk/amd64-pio-gpt.json b/src/boot/modules/SysChk/amd64-pio-gpt.json
index b1a4d38b..b1a4d38b 100644
--- a/dev/boot/modules/SysChk/amd64-pio-gpt.json
+++ b/src/boot/modules/SysChk/amd64-pio-gpt.json
diff --git a/dev/boot/modules/SysChk/arm64.json b/src/boot/modules/SysChk/arm64.json
index ad5fde6e..ad5fde6e 100644
--- a/dev/boot/modules/SysChk/arm64.json
+++ b/src/boot/modules/SysChk/arm64.json
diff --git a/dev/boot/obj/.gitkeep b/src/boot/obj/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/obj/.gitkeep
+++ b/src/boot/obj/.gitkeep
diff --git a/dev/boot/src/.gitkeep b/src/boot/src/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/src/.gitkeep
+++ b/src/boot/src/.gitkeep
diff --git a/dev/boot/src/BootFileReader.cc b/src/boot/src/BootFileReader.cc
index a929bb93..a929bb93 100644
--- a/dev/boot/src/BootFileReader.cc
+++ b/src/boot/src/BootFileReader.cc
diff --git a/dev/boot/src/BootString.cc b/src/boot/src/BootString.cc
index 6dadda3f..6dadda3f 100644
--- a/dev/boot/src/BootString.cc
+++ b/src/boot/src/BootString.cc
diff --git a/dev/boot/src/BootSupport.cc b/src/boot/src/BootSupport.cc
index 24e09094..24e09094 100644
--- a/dev/boot/src/BootSupport.cc
+++ b/src/boot/src/BootSupport.cc
diff --git a/dev/boot/src/BootTextWriter.cc b/src/boot/src/BootTextWriter.cc
index 0b53e845..0b53e845 100644
--- a/dev/boot/src/BootTextWriter.cc
+++ b/src/boot/src/BootTextWriter.cc
diff --git a/dev/boot/src/BootThread.cc b/src/boot/src/BootThread.cc
index e3ca9221..e3ca9221 100644
--- a/dev/boot/src/BootThread.cc
+++ b/src/boot/src/BootThread.cc
diff --git a/dev/boot/src/HEL/64X000/.gitkeep b/src/boot/src/HEL/64X000/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/src/HEL/64X000/.gitkeep
+++ b/src/boot/src/HEL/64X000/.gitkeep
diff --git a/dev/boot/src/HEL/64X000/BootCB.S b/src/boot/src/HEL/64X000/BootCB.S
index 223a697e..223a697e 100644
--- a/dev/boot/src/HEL/64X000/BootCB.S
+++ b/src/boot/src/HEL/64X000/BootCB.S
diff --git a/dev/boot/src/HEL/AMD64/BootAPI.S b/src/boot/src/HEL/AMD64/BootAPI.S
index 33c1f5d3..33c1f5d3 100644
--- a/dev/boot/src/HEL/AMD64/BootAPI.S
+++ b/src/boot/src/HEL/AMD64/BootAPI.S
diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/src/boot/src/HEL/AMD64/BootATA.cc
index 02051471..02051471 100644
--- a/dev/boot/src/HEL/AMD64/BootATA.cc
+++ b/src/boot/src/HEL/AMD64/BootATA.cc
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/src/boot/src/HEL/AMD64/BootEFI.cc
index 331ded5f..331ded5f 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/src/boot/src/HEL/AMD64/BootEFI.cc
diff --git a/dev/boot/src/HEL/AMD64/BootPlatform.cc b/src/boot/src/HEL/AMD64/BootPlatform.cc
index 7d88b883..7d88b883 100644
--- a/dev/boot/src/HEL/AMD64/BootPlatform.cc
+++ b/src/boot/src/HEL/AMD64/BootPlatform.cc
diff --git a/dev/boot/src/HEL/AMD64/BootSATA.cc b/src/boot/src/HEL/AMD64/BootSATA.cc
index 1364c58b..1364c58b 100644
--- a/dev/boot/src/HEL/AMD64/BootSATA.cc
+++ b/src/boot/src/HEL/AMD64/BootSATA.cc
diff --git a/dev/boot/src/HEL/ARM64/.gitkeep b/src/boot/src/HEL/ARM64/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/src/HEL/ARM64/.gitkeep
+++ b/src/boot/src/HEL/ARM64/.gitkeep
diff --git a/dev/boot/src/HEL/ARM64/BootAPI.S b/src/boot/src/HEL/ARM64/BootAPI.S
index 55183abf..55183abf 100644
--- a/dev/boot/src/HEL/ARM64/BootAPI.S
+++ b/src/boot/src/HEL/ARM64/BootAPI.S
diff --git a/dev/boot/src/HEL/ARM64/BootEFI.cc b/src/boot/src/HEL/ARM64/BootEFI.cc
index ac5eb030..ac5eb030 100644
--- a/dev/boot/src/HEL/ARM64/BootEFI.cc
+++ b/src/boot/src/HEL/ARM64/BootEFI.cc
diff --git a/dev/boot/src/HEL/ARM64/BootNB.S b/src/boot/src/HEL/ARM64/BootNB.S
index f781ad37..f781ad37 100644
--- a/dev/boot/src/HEL/ARM64/BootNB.S
+++ b/src/boot/src/HEL/ARM64/BootNB.S
diff --git a/dev/boot/src/HEL/ARM64/BootPlatform.cc b/src/boot/src/HEL/ARM64/BootPlatform.cc
index 2ad9b776..2ad9b776 100644
--- a/dev/boot/src/HEL/ARM64/BootPlatform.cc
+++ b/src/boot/src/HEL/ARM64/BootPlatform.cc
diff --git a/dev/boot/src/HEL/POWER/.gitkeep b/src/boot/src/HEL/POWER/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/boot/src/HEL/POWER/.gitkeep
+++ b/src/boot/src/HEL/POWER/.gitkeep
diff --git a/dev/boot/src/HEL/POWER/BootNB.S b/src/boot/src/HEL/POWER/BootNB.S
index 45b9c9e1..45b9c9e1 100644
--- a/dev/boot/src/HEL/POWER/BootNB.S
+++ b/src/boot/src/HEL/POWER/BootNB.S
diff --git a/dev/boot/src/New+Delete.cc b/src/boot/src/New+Delete.cc
index a66d8464..a66d8464 100644
--- a/dev/boot/src/New+Delete.cc
+++ b/src/boot/src/New+Delete.cc
diff --git a/dev/boot/src/boot_rsrc.rsrc b/src/boot/src/boot_rsrc.rsrc
index e875fa24..e875fa24 100644
--- a/dev/boot/src/boot_rsrc.rsrc
+++ b/src/boot/src/boot_rsrc.rsrc
diff --git a/dev/boot/src/docs/KERN_VER.md b/src/boot/src/docs/KERN_VER.md
index c47c3d5b..c47c3d5b 100644
--- a/dev/boot/src/docs/KERN_VER.md
+++ b/src/boot/src/docs/KERN_VER.md
diff --git a/dev/boot/src/docs/MKFS_HEFS.md b/src/boot/src/docs/MKFS_HEFS.md
index fd2a099e..b42ad9c2 100644
--- a/dev/boot/src/docs/MKFS_HEFS.md
+++ b/src/boot/src/docs/MKFS_HEFS.md
@@ -46,7 +46,7 @@
 ## 🧷 Notes
 
 - Default sector size is `512` bytes.
-- Default volume name is `"HeFS_VOLUME"`, defined as `kHeFSDefaultVolumeName`.
+- Default volume name is `"HeFS_VOLUME"`, defined as `kOpenHeFSDefaultVolumeName`.
 - The tool writes a `BootNode` at the beginning of the index node range.
 - A CRC-safe magic signature is embedded for boot and integrity validation.
 - After writing the metadata, the tool flushes and closes the file stream.
diff --git a/dev/boot/src/root/ifs.json b/src/boot/src/root/ifs.json
index 354ab503..354ab503 100644
--- a/dev/boot/src/root/ifs.json
+++ b/src/boot/src/root/ifs.json
diff --git a/dev/hint/CompilerHint.h b/src/hint/CompilerHint.h
index 8b651a17..8b651a17 100644
--- a/dev/hint/CompilerHint.h
+++ b/src/hint/CompilerHint.h
diff --git a/dev/kernel/ArchKit/ArchKit.h b/src/kernel/ArchKit/ArchKit.h
index 626f1e0b..626f1e0b 100644
--- a/dev/kernel/ArchKit/ArchKit.h
+++ b/src/kernel/ArchKit/ArchKit.h
diff --git a/dev/kernel/CFKit/GUIDWizard.h b/src/kernel/CFKit/GUIDWizard.h
index 8745a1f9..8745a1f9 100644
--- a/dev/kernel/CFKit/GUIDWizard.h
+++ b/src/kernel/CFKit/GUIDWizard.h
diff --git a/dev/kernel/CFKit/GUIDWrapper.h b/src/kernel/CFKit/GUIDWrapper.h
index 2bf7b64e..2bf7b64e 100644
--- a/dev/kernel/CFKit/GUIDWrapper.h
+++ b/src/kernel/CFKit/GUIDWrapper.h
diff --git a/dev/kernel/CFKit/Property.h b/src/kernel/CFKit/Property.h
index cfb8a599..cfb8a599 100644
--- a/dev/kernel/CFKit/Property.h
+++ b/src/kernel/CFKit/Property.h
diff --git a/dev/kernel/CFKit/Utils.h b/src/kernel/CFKit/Utils.h
index 247ad5fb..247ad5fb 100644
--- a/dev/kernel/CFKit/Utils.h
+++ b/src/kernel/CFKit/Utils.h
diff --git a/dev/kernel/CompilerKit/CompilerKit.h b/src/kernel/CompilerKit/CompilerKit.h
index 523a4ecd..523a4ecd 100644
--- a/dev/kernel/CompilerKit/CompilerKit.h
+++ b/src/kernel/CompilerKit/CompilerKit.h
diff --git a/dev/kernel/CompilerKit/Detail.h b/src/kernel/CompilerKit/Detail.h
index 93e9b2dd..93e9b2dd 100644
--- a/dev/kernel/CompilerKit/Detail.h
+++ b/src/kernel/CompilerKit/Detail.h
diff --git a/dev/kernel/CompilerKit/Version.h b/src/kernel/CompilerKit/Version.h
index 4250531a..4250531a 100644
--- a/dev/kernel/CompilerKit/Version.h
+++ b/src/kernel/CompilerKit/Version.h
diff --git a/dev/kernel/DmaKit/DmaPool.h b/src/kernel/DmaKit/DmaPool.h
index e20f8c69..e20f8c69 100644
--- a/dev/kernel/DmaKit/DmaPool.h
+++ b/src/kernel/DmaKit/DmaPool.h
diff --git a/dev/kernel/FSKit/Defines.h b/src/kernel/FSKit/Defines.h
index c5bf8f88..c5bf8f88 100644
--- a/dev/kernel/FSKit/Defines.h
+++ b/src/kernel/FSKit/Defines.h
diff --git a/dev/kernel/FSKit/Ext2+IFS.h b/src/kernel/FSKit/Ext2+IFS.h
index 01ca4c90..01ca4c90 100644
--- a/dev/kernel/FSKit/Ext2+IFS.h
+++ b/src/kernel/FSKit/Ext2+IFS.h
diff --git a/dev/kernel/FSKit/Ext2.h b/src/kernel/FSKit/Ext2.h
index e979e556..e979e556 100644
--- a/dev/kernel/FSKit/Ext2.h
+++ b/src/kernel/FSKit/Ext2.h
diff --git a/dev/kernel/FSKit/IndexableProperty.h b/src/kernel/FSKit/IndexableProperty.h
index a89e78b8..a89e78b8 100644
--- a/dev/kernel/FSKit/IndexableProperty.h
+++ b/src/kernel/FSKit/IndexableProperty.h
diff --git a/dev/kernel/FSKit/NeFS.h b/src/kernel/FSKit/NeFS.h
index 54861dec..54861dec 100644
--- a/dev/kernel/FSKit/NeFS.h
+++ b/src/kernel/FSKit/NeFS.h
diff --git a/dev/kernel/FSKit/OpenHeFS.h b/src/kernel/FSKit/OpenHeFS.h
index 04f07b8e..bd392fc3 100644
--- a/dev/kernel/FSKit/OpenHeFS.h
+++ b/src/kernel/FSKit/OpenHeFS.h
@@ -17,30 +17,30 @@
 /// @file OpenHeFS.h

 /// @brief OpenHeFS filesystem support.

 

-#define kHeFSVersion (0x0104)

-#define kHeFSMagic "OpenHeFS"

-#define kHeFSMagicLen (9U)

+#define kOpenHeFSVersion (0x0104)

+#define kOpenHeFSMagic "OpenHeFS"

+#define kOpenHeFSMagicLen (9U)

 

-#define kHeFSBlockLen (512U)

-#define kHeFSFileNameLen (256U)

-#define kHeFSPartNameLen (128U)

+#define kOpenHeFSBlockLen (512U)

+#define kOpenHeFSFileNameLen (256U)

+#define kOpenHeFSPartNameLen (128U)

 

-#define kHeFSMinimumDiskSize (gib_cast(128))

+#define kOpenHeFSMinimumDiskSize (gib_cast(128))

 

-#define kHeFSDefaultVolumeName u8"OpenHeFS Volume"

+#define kOpenHeFSDefaultVolumeName u8"OpenHeFS Volume"

 

-#define kHeFSINDStartOffset (sizeof(HEFS_BOOT_NODE))

-#define kHeFSINStartOffset (sizeof(HEFS_INDEX_NODE_DIRECTORY))

+#define kOpenHeFSINDStartOffset (sizeof(HEFS_BOOT_NODE))

+#define kOpenHeFSINStartOffset (sizeof(HEFS_INDEX_NODE_DIRECTORY))

 

-#define kHeFSRootDirectory "/"

-#define kHeFSRootDirectoryU8 u8"/"

+#define kOpenHeFSRootDirectory "/"

+#define kOpenHeFSRootDirectoryU8 u8"/"

 

-#define kHeFSSeparator '/'

-#define kHeFSUpDir ".."

+#define kOpenHeFSSeparator '/'

+#define kOpenHeFSUpDir ".."

 

-#define kHeFSRootDirectoryLen (2U)

+#define kOpenHeFSRootDirectoryLen (2U)

 

-#define kHeFSSearchAllStr u8"*"

+#define kOpenHeFSSearchAllStr u8"*"

 

 struct HEFS_BOOT_NODE;

 struct HEFS_INDEX_NODE;

@@ -48,61 +48,61 @@ struct HEFS_INDEX_NODE_DIRECTORY;
 struct HEFS_JOURNAL_NODE;

 

 enum : UInt8 {

-  kHeFSHardDrive         = 0xC0,  // Hard Drive

-  kHeFSSolidStateDrive   = 0xC1,  // Solid State Drive

-  kHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD

-  kHeFSMassStorageDevice = 0xCC,  // USB

-  kHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive

-  kHeFSFlashDrive        = 0xC6,

-  kHeFSUnknown           = 0xFF,  // Unknown device.

-  kHeFSDriveCount        = 8,

+  kOpenHeFSHardDrive         = 0xC0,  // Hard Drive

+  kOpenHeFSSolidStateDrive   = 0xC1,  // Solid State Drive

+  kOpenHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD

+  kOpenHeFSMassStorageDevice = 0xCC,  // USB

+  kOpenHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive

+  kOpenHeFSFlashDrive        = 0xC6,

+  kOpenHeFSUnknown           = 0xFF,  // Unknown device.

+  kOpenHeFSDriveCount        = 8,

 };

 

 enum : UInt8 {

-  kHeFSStatusUnlocked = 0x18,

-  kHeFSStatusLocked,

-  kHeFSStatusError,

-  kHeFSStatusInvalid,

-  kHeFSStatusCount,

+  kOpenHeFSStatusUnlocked = 0x18,

+  kOpenHeFSStatusLocked,

+  kOpenHeFSStatusError,

+  kOpenHeFSStatusInvalid,

+  kOpenHeFSStatusCount,

 };

 

 enum : UInt16 {

-  kHeFSEncodingFlagsUTF8 = 0x50,

-  kHeFSEncodingFlagsUTF16,

-  kHeFSEncodingFlagsUTF32,

-  kHeFSEncodingFlagsUTF16BE,

-  kHeFSEncodingFlagsUTF16LE,

-  kHeFSEncodingFlagsUTF32BE,

-  kHeFSEncodingFlagsUTF32LE,

-  kHeFSEncodingFlagsUTF8BE,

-  kHeFSEncodingFlagsUTF8LE,

-  kHeFSEncodingFlagsBinary,

-  kHeFSEncodingFlagsCount = 11,

-  kHeFSFlagsNone          = 0,

-  kHeFSFlagsReadOnly      = 0x100,

-  kHeFSFlagsHidden,

-  kHeFSFlagsSystem,

-  kHeFSFlagsArchive,

-  kHeFSFlagsDevice,

-  kHeFSFlagsCount = 7

+  kOpenHeFSEncodingFlagsUTF8 = 0x50,

+  kOpenHeFSEncodingFlagsUTF16,

+  kOpenHeFSEncodingFlagsUTF32,

+  kOpenHeFSEncodingFlagsUTF16BE,

+  kOpenHeFSEncodingFlagsUTF16LE,

+  kOpenHeFSEncodingFlagsUTF32BE,

+  kOpenHeFSEncodingFlagsUTF32LE,

+  kOpenHeFSEncodingFlagsUTF8BE,

+  kOpenHeFSEncodingFlagsUTF8LE,

+  kOpenHeFSEncodingFlagsBinary,

+  kOpenHeFSEncodingFlagsCount = 11,

+  kOpenHeFSFlagsNone          = 0,

+  kOpenHeFSFlagsReadOnly      = 0x100,

+  kOpenHeFSFlagsHidden,

+  kOpenHeFSFlagsSystem,

+  kOpenHeFSFlagsArchive,

+  kOpenHeFSFlagsDevice,

+  kOpenHeFSFlagsCount = 7

 };

 

-inline constexpr UInt16 kHeFSFileKindRegular      = 0x00;

-inline constexpr UInt16 kHeFSFileKindDirectory    = 0x01;

-inline constexpr UInt16 kHeFSFileKindBlock        = 0x02;

-inline constexpr UInt16 kHeFSFileKindCharacter    = 0x03;

-inline constexpr UInt16 kHeFSFileKindFIFO         = 0x04;

-inline constexpr UInt16 kHeFSFileKindSocket       = 0x05;

-inline constexpr UInt16 kHeFSFileKindSymbolicLink = 0x06;

-inline constexpr UInt16 kHeFSFileKindUnknown      = 0x07;

-inline constexpr UInt16 kHeFSFileKindCount        = 0x08;

+inline constexpr UInt16 kOpenHeFSFileKindRegular      = 0x00;

+inline constexpr UInt16 kOpenHeFSFileKindDirectory    = 0x01;

+inline constexpr UInt16 kOpenHeFSFileKindBlock        = 0x02;

+inline constexpr UInt16 kOpenHeFSFileKindCharacter    = 0x03;

+inline constexpr UInt16 kOpenHeFSFileKindFIFO         = 0x04;

+inline constexpr UInt16 kOpenHeFSFileKindSocket       = 0x05;

+inline constexpr UInt16 kOpenHeFSFileKindSymbolicLink = 0x06;

+inline constexpr UInt16 kOpenHeFSFileKindUnknown      = 0x07;

+inline constexpr UInt16 kOpenHeFSFileKindCount        = 0x08;

 

 /// @brief OpenHeFS blocks are array containing sparse blocks of data.

 /// @details The blocks are used to store the data of a file. Each block is a pointer to a block of

 /// data on the disk.

-inline constexpr UInt16 kHeFSSliceCount = 0x10;

+inline constexpr UInt16 kOpenHeFSSliceCount = 0x10;

 

-inline constexpr UInt16 kHeFSInvalidVID = 0xFFFF;

+inline constexpr UInt16 kOpenHeFSInvalidVID = 0xFFFF;

 

 namespace Kernel {

 /// @brief Access time type.

@@ -113,8 +113,8 @@ typedef UInt64 ATime;
 /// @details Acts like a superblock, it contains the information about the filesystem.

 /// @note The boot node is the first block of the filesystem.

 struct PACKED HEFS_BOOT_NODE final {

-  Char     fMagic[kHeFSMagicLen];       /// @brief Magic number of the filesystem.

-  Utf8Char fVolName[kHeFSPartNameLen];  /// @brief Volume name.

+  Char     fMagic[kOpenHeFSMagicLen];       /// @brief Magic number of the filesystem.

+  Utf8Char fVolName[kOpenHeFSPartNameLen];  /// @brief Volume name.

   UInt32   fVersion;                    /// @brief Version of the filesystem.

   UInt64   fBadSectors;                 /// @brief Number of bad sectors in the filesystem.

   UInt64   fSectorCount;                /// @brief Number of sectors in the filesystem.

@@ -139,8 +139,8 @@ struct PACKED HEFS_BOOT_NODE final {
   Char   fPad[264];

 };

 

-inline constexpr ATime kHeFSTimeInvalid = 0x0000000000000000;

-inline constexpr ATime kHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;

+inline constexpr ATime kOpenHeFSTimeInvalid = 0x0000000000000000;

+inline constexpr ATime kOpenHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;

 

 /// @brief Journal Node structure

 /// @param fHashPath target hash path

@@ -194,10 +194,10 @@ struct PACKED HEFS_INDEX_NODE final {
 };

 

 enum {

-  kHeFSInvalidColor = 0,

-  kHeFSRed          = 100,

-  kHeFSBlack,

-  kHeFSColorCount,

+  kOpenHeFSInvalidColor = 0,

+  kOpenHeFSRed          = 100,

+  kOpenHeFSBlack,

+  kOpenHeFSColorCount,

 };

 

 /// @brief OpenHeFS directory node.

@@ -220,7 +220,7 @@ struct PACKED HEFS_INDEX_NODE_DIRECTORY final {
   /// [0] = OFFSET

   /// [1] = SIZE

   /// @note Thus the += 2 when iterating over them.

-  UInt64 fINSlices[kHeFSSliceCount];  /// @brief Start of the index node.

+  UInt64 fINSlices[kOpenHeFSSliceCount];  /// @brief Start of the index node.

 

   UInt8 fColor;                         /// @brief Color of the node. (Red or Black).

   Lba   fNext, fPrev, fChild, fParent;  /// @brief Red-black tree pointers.

@@ -270,21 +270,21 @@ inline UInt32 hefs_minute_get(ATime raw_atime) noexcept {
   return (raw_atime) &0xFF;

 }

 

-inline constexpr UInt32 kHeFSBaseYear   = 1970;

-inline constexpr UInt32 kHeFSBaseMonth  = 1;

-inline constexpr UInt32 kHeFSBaseDay    = 1;

-inline constexpr UInt32 kHeFSBaseHour   = 0;

-inline constexpr UInt32 kHeFSBaseMinute = 0;

+inline constexpr UInt32 kOpenHeFSBaseYear   = 1970;

+inline constexpr UInt32 kOpenHeFSBaseMonth  = 1;

+inline constexpr UInt32 kOpenHeFSBaseDay    = 1;

+inline constexpr UInt32 kOpenHeFSBaseHour   = 0;

+inline constexpr UInt32 kOpenHeFSBaseMinute = 0;

 

 inline const Char* hefs_status_to_string(UInt16 status) noexcept {

   switch (status) {

-    case kHeFSStatusUnlocked:

+    case kOpenHeFSStatusUnlocked:

       return "Unlocked";

-    case kHeFSStatusLocked:

+    case kOpenHeFSStatusLocked:

       return "Locked";

-    case kHeFSStatusError:

+    case kOpenHeFSStatusError:

       return "Error";

-    case kHeFSStatusInvalid:

+    case kOpenHeFSStatusInvalid:

       return "Invalid";

     default:

       return "Unknown";

@@ -293,19 +293,19 @@ inline const Char* hefs_status_to_string(UInt16 status) noexcept {
 

 inline const Char* hefs_drive_kind_to_string(UInt8 kind) noexcept {

   switch (kind) {

-    case kHeFSHardDrive:

+    case kOpenHeFSHardDrive:

       return "Hard Drive";

-    case kHeFSSolidStateDrive:

+    case kOpenHeFSSolidStateDrive:

       return "Solid State Drive";

-    case kHeFSOpticalDrive:

+    case kOpenHeFSOpticalDrive:

       return "Optical Drive";

-    case kHeFSMassStorageDevice:

+    case kOpenHeFSMassStorageDevice:

       return "Mass Storage Device";

-    case kHeFSScsiDrive:

+    case kOpenHeFSScsiDrive:

       return "SCSI/SAS Drive";

-    case kHeFSFlashDrive:

+    case kOpenHeFSFlashDrive:

       return "Flash Drive";

-    case kHeFSUnknown:

+    case kOpenHeFSUnknown:

     default:

       return "Unknown";

   }

@@ -313,23 +313,23 @@ inline const Char* hefs_drive_kind_to_string(UInt8 kind) noexcept {
 

 inline const Char* hefs_encoding_to_string(UInt8 encoding) noexcept {

   switch (encoding) {

-    case kHeFSEncodingFlagsUTF8:

+    case kOpenHeFSEncodingFlagsUTF8:

       return "UTF-8";

-    case kHeFSEncodingFlagsUTF16:

+    case kOpenHeFSEncodingFlagsUTF16:

       return "UTF-16";

-    case kHeFSEncodingFlagsUTF32:

+    case kOpenHeFSEncodingFlagsUTF32:

       return "UTF-32";

-    case kHeFSEncodingFlagsUTF16BE:

+    case kOpenHeFSEncodingFlagsUTF16BE:

       return "UTF-16BE";

-    case kHeFSEncodingFlagsUTF16LE:

+    case kOpenHeFSEncodingFlagsUTF16LE:

       return "UTF-16LE";

-    case kHeFSEncodingFlagsUTF32BE:

+    case kOpenHeFSEncodingFlagsUTF32BE:

       return "UTF-32BE";

-    case kHeFSEncodingFlagsUTF32LE:

+    case kOpenHeFSEncodingFlagsUTF32LE:

       return "UTF-32LE";

-    case kHeFSEncodingFlagsUTF8BE:

+    case kOpenHeFSEncodingFlagsUTF8BE:

       return "UTF-8BE";

-    case kHeFSEncodingFlagsUTF8LE:

+    case kOpenHeFSEncodingFlagsUTF8LE:

       return "UTF-8LE";

     default:

       return "Unknown";

@@ -338,21 +338,21 @@ inline const Char* hefs_encoding_to_string(UInt8 encoding) noexcept {
 

 inline const Char* hefs_file_kind_to_string(UInt16 kind) noexcept {

   switch (kind) {

-    case kHeFSFileKindRegular:

+    case kOpenHeFSFileKindRegular:

       return "Regular File";

-    case kHeFSFileKindDirectory:

+    case kOpenHeFSFileKindDirectory:

       return "Directory";

-    case kHeFSFileKindBlock:

+    case kOpenHeFSFileKindBlock:

       return "Block Device";

-    case kHeFSFileKindCharacter:

+    case kOpenHeFSFileKindCharacter:

       return "Character Device";

-    case kHeFSFileKindFIFO:

+    case kOpenHeFSFileKindFIFO:

       return "FIFO";

-    case kHeFSFileKindSocket:

+    case kOpenHeFSFileKindSocket:

       return "Socket";

-    case kHeFSFileKindSymbolicLink:

+    case kOpenHeFSFileKindSymbolicLink:

       return "Symbolic Link";

-    case kHeFSFileKindUnknown:

+    case kOpenHeFSFileKindUnknown:

     default:

       return "Unknown";

   }

@@ -360,17 +360,17 @@ inline const Char* hefs_file_kind_to_string(UInt16 kind) noexcept {
 

 inline const Char* hefs_file_flags_to_string(UInt32 flags) noexcept {

   switch (flags) {

-    case kHeFSFlagsNone:

+    case kOpenHeFSFlagsNone:

       return "No Flags";

-    case kHeFSFlagsReadOnly:

+    case kOpenHeFSFlagsReadOnly:

       return "Read Only";

-    case kHeFSFlagsHidden:

+    case kOpenHeFSFlagsHidden:

       return "Hidden";

-    case kHeFSFlagsSystem:

+    case kOpenHeFSFlagsSystem:

       return "System";

-    case kHeFSFlagsArchive:

+    case kOpenHeFSFlagsArchive:

       return "Archive";

-    case kHeFSFlagsDevice:

+    case kOpenHeFSFlagsDevice:

       return "Device";

     default:

       return "Unknown";

diff --git a/dev/kernel/FirmwareKit/.gitkeep b/src/kernel/FirmwareKit/.gitkeep
index 8b137891..8b137891 100644
--- a/dev/kernel/FirmwareKit/.gitkeep
+++ b/src/kernel/FirmwareKit/.gitkeep
diff --git a/dev/kernel/FirmwareKit/EFI.h b/src/kernel/FirmwareKit/EFI.h
index f75f0fbe..f75f0fbe 100644
--- a/dev/kernel/FirmwareKit/EFI.h
+++ b/src/kernel/FirmwareKit/EFI.h
diff --git a/dev/kernel/FirmwareKit/EFI/API.h b/src/kernel/FirmwareKit/EFI/API.h
index 24fceb2b..24fceb2b 100644
--- a/dev/kernel/FirmwareKit/EFI/API.h
+++ b/src/kernel/FirmwareKit/EFI/API.h
diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/src/kernel/FirmwareKit/EFI/EFI.h
index 240fb9ea..240fb9ea 100644
--- a/dev/kernel/FirmwareKit/EFI/EFI.h
+++ b/src/kernel/FirmwareKit/EFI/EFI.h
diff --git a/dev/kernel/FirmwareKit/EFI/NS.h b/src/kernel/FirmwareKit/EFI/NS.h
index 64e59870..64e59870 100644
--- a/dev/kernel/FirmwareKit/EFI/NS.h
+++ b/src/kernel/FirmwareKit/EFI/NS.h
diff --git a/dev/kernel/FirmwareKit/EPM.h b/src/kernel/FirmwareKit/EPM.h
index 8df4d345..8df4d345 100644
--- a/dev/kernel/FirmwareKit/EPM.h
+++ b/src/kernel/FirmwareKit/EPM.h
diff --git a/dev/kernel/FirmwareKit/GPT.h b/src/kernel/FirmwareKit/GPT.h
index 1772cc79..1772cc79 100644
--- a/dev/kernel/FirmwareKit/GPT.h
+++ b/src/kernel/FirmwareKit/GPT.h
diff --git a/dev/kernel/FirmwareKit/Handover.h b/src/kernel/FirmwareKit/Handover.h
index 354b6e57..354b6e57 100644
--- a/dev/kernel/FirmwareKit/Handover.h
+++ b/src/kernel/FirmwareKit/Handover.h
diff --git a/dev/kernel/FirmwareKit/NeBoot/BootNet.h b/src/kernel/FirmwareKit/NeBoot/BootNet.h
index 3637bab0..3637bab0 100644
--- a/dev/kernel/FirmwareKit/NeBoot/BootNet.h
+++ b/src/kernel/FirmwareKit/NeBoot/BootNet.h
diff --git a/dev/kernel/FirmwareKit/NeBoot/NS.h b/src/kernel/FirmwareKit/NeBoot/NS.h
index 3a6bed6d..3a6bed6d 100644
--- a/dev/kernel/FirmwareKit/NeBoot/NS.h
+++ b/src/kernel/FirmwareKit/NeBoot/NS.h
diff --git a/dev/kernel/FirmwareKit/NeBoot/NeBoot.h b/src/kernel/FirmwareKit/NeBoot/NeBoot.h
index 8e8fd87f..8e8fd87f 100644
--- a/dev/kernel/FirmwareKit/NeBoot/NeBoot.h
+++ b/src/kernel/FirmwareKit/NeBoot/NeBoot.h
diff --git a/dev/kernel/FirmwareKit/VEPM.h b/src/kernel/FirmwareKit/VEPM.h
index b2bee0d3..b2bee0d3 100644
--- a/dev/kernel/FirmwareKit/VEPM.h
+++ b/src/kernel/FirmwareKit/VEPM.h
diff --git a/dev/kernel/GfxKit/FB.h b/src/kernel/GfxKit/FB.h
index c8a2dc4b..c8a2dc4b 100644
--- a/dev/kernel/GfxKit/FB.h
+++ b/src/kernel/GfxKit/FB.h
diff --git a/dev/kernel/HALKit/.gitkeep b/src/kernel/HALKit/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/.gitkeep
+++ b/src/kernel/HALKit/.gitkeep
diff --git a/dev/kernel/HALKit/AMD64/CPUID.h b/src/kernel/HALKit/AMD64/CPUID.h
index 0ab95c07..0ab95c07 100644
--- a/dev/kernel/HALKit/AMD64/CPUID.h
+++ b/src/kernel/HALKit/AMD64/CPUID.h
diff --git a/dev/kernel/HALKit/AMD64/CxxAbi.cc b/src/kernel/HALKit/AMD64/CxxAbi.cc
index 9049457b..9049457b 100644
--- a/dev/kernel/HALKit/AMD64/CxxAbi.cc
+++ b/src/kernel/HALKit/AMD64/CxxAbi.cc
diff --git a/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/src/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
index 83545df8..83545df8 100644
--- a/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
+++ b/src/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
diff --git a/dev/kernel/HALKit/AMD64/HalAPICDmaWrapper.cc b/src/kernel/HALKit/AMD64/HalAPICDmaWrapper.cc
index 36a027a2..36a027a2 100644
--- a/dev/kernel/HALKit/AMD64/HalAPICDmaWrapper.cc
+++ b/src/kernel/HALKit/AMD64/HalAPICDmaWrapper.cc
diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/src/kernel/HALKit/AMD64/HalApplicationProcessor.cc
index 5a530457..5a530457 100644
--- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
+++ b/src/kernel/HALKit/AMD64/HalApplicationProcessor.cc
diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessorStartup.s b/src/kernel/HALKit/AMD64/HalApplicationProcessorStartup.s
index 7b383404..7b383404 100644
--- a/dev/kernel/HALKit/AMD64/HalApplicationProcessorStartup.s
+++ b/src/kernel/HALKit/AMD64/HalApplicationProcessorStartup.s
diff --git a/dev/kernel/HALKit/AMD64/HalCommonAPI.asm b/src/kernel/HALKit/AMD64/HalCommonAPI.asm
index 9f3652bc..9f3652bc 100644
--- a/dev/kernel/HALKit/AMD64/HalCommonAPI.asm
+++ b/src/kernel/HALKit/AMD64/HalCommonAPI.asm
diff --git a/dev/kernel/HALKit/AMD64/HalControlRegisterAPI.s b/src/kernel/HALKit/AMD64/HalControlRegisterAPI.s
index 90fdeb81..90fdeb81 100644
--- a/dev/kernel/HALKit/AMD64/HalControlRegisterAPI.s
+++ b/src/kernel/HALKit/AMD64/HalControlRegisterAPI.s
diff --git a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc b/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
index f19e49b5..f19e49b5 100644
--- a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
+++ b/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
diff --git a/dev/kernel/HALKit/AMD64/HalCoreSystemCalls.cc b/src/kernel/HALKit/AMD64/HalCoreSystemCalls.cc
index f50e4abd..f50e4abd 100644
--- a/dev/kernel/HALKit/AMD64/HalCoreSystemCalls.cc
+++ b/src/kernel/HALKit/AMD64/HalCoreSystemCalls.cc
diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/src/kernel/HALKit/AMD64/HalDebugOutput.cc
index 8e5f4cbd..8e5f4cbd 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/src/kernel/HALKit/AMD64/HalDebugOutput.cc
diff --git a/dev/kernel/HALKit/AMD64/HalDebugProtocol.cc b/src/kernel/HALKit/AMD64/HalDebugProtocol.cc
index 1adfff3e..1adfff3e 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugProtocol.cc
+++ b/src/kernel/HALKit/AMD64/HalDebugProtocol.cc
diff --git a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc b/src/kernel/HALKit/AMD64/HalDescriptorLoader.cc
index 65bf0b1e..65bf0b1e 100644
--- a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
+++ b/src/kernel/HALKit/AMD64/HalDescriptorLoader.cc
diff --git a/dev/kernel/HALKit/AMD64/HalHandoverStub.asm b/src/kernel/HALKit/AMD64/HalHandoverStub.asm
index c9cabd1c..c9cabd1c 100644
--- a/dev/kernel/HALKit/AMD64/HalHandoverStub.asm
+++ b/src/kernel/HALKit/AMD64/HalHandoverStub.asm
diff --git a/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm b/src/kernel/HALKit/AMD64/HalInterruptAPI.asm
index c761684e..c761684e 100644
--- a/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm
+++ b/src/kernel/HALKit/AMD64/HalInterruptAPI.asm
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/src/kernel/HALKit/AMD64/HalKernelMain.cc
index e23c5bc1..e23c5bc1 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/src/kernel/HALKit/AMD64/HalKernelMain.cc
diff --git a/dev/kernel/HALKit/AMD64/HalKernelPanic.cc b/src/kernel/HALKit/AMD64/HalKernelPanic.cc
index 12538667..12538667 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
+++ b/src/kernel/HALKit/AMD64/HalKernelPanic.cc
diff --git a/dev/kernel/HALKit/AMD64/HalPagingMgr.cc b/src/kernel/HALKit/AMD64/HalPagingMgr.cc
index 4043da96..4043da96 100644
--- a/dev/kernel/HALKit/AMD64/HalPagingMgr.cc
+++ b/src/kernel/HALKit/AMD64/HalPagingMgr.cc
diff --git a/dev/kernel/HALKit/AMD64/HalProcessor.cc b/src/kernel/HALKit/AMD64/HalProcessor.cc
index d202a758..d202a758 100644
--- a/dev/kernel/HALKit/AMD64/HalProcessor.cc
+++ b/src/kernel/HALKit/AMD64/HalProcessor.cc
diff --git a/dev/kernel/HALKit/AMD64/HalRoutineWait.s b/src/kernel/HALKit/AMD64/HalRoutineWait.s
index 89051ba4..89051ba4 100644
--- a/dev/kernel/HALKit/AMD64/HalRoutineWait.s
+++ b/src/kernel/HALKit/AMD64/HalRoutineWait.s
diff --git a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc b/src/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
index 44ec2a37..44ec2a37 100644
--- a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
+++ b/src/kernel/HALKit/AMD64/HalSchedulerCorePrimitives.cc
diff --git a/dev/kernel/HALKit/AMD64/HalTimer.cc b/src/kernel/HALKit/AMD64/HalTimer.cc
index f6488b05..f6488b05 100644
--- a/dev/kernel/HALKit/AMD64/HalTimer.cc
+++ b/src/kernel/HALKit/AMD64/HalTimer.cc
diff --git a/dev/kernel/HALKit/AMD64/HalUtilsAPI.asm b/src/kernel/HALKit/AMD64/HalUtilsAPI.asm
index 2a0a5eff..2a0a5eff 100644
--- a/dev/kernel/HALKit/AMD64/HalUtilsAPI.asm
+++ b/src/kernel/HALKit/AMD64/HalUtilsAPI.asm
diff --git a/dev/kernel/HALKit/AMD64/Hypervisor.h b/src/kernel/HALKit/AMD64/Hypervisor.h
index 4cacb003..4cacb003 100644
--- a/dev/kernel/HALKit/AMD64/Hypervisor.h
+++ b/src/kernel/HALKit/AMD64/Hypervisor.h
diff --git a/dev/kernel/HALKit/AMD64/Network/Generic+Basic+RTL8139.cc b/src/kernel/HALKit/AMD64/Network/Generic+Basic+RTL8139.cc
index f9865139..f9865139 100644
--- a/dev/kernel/HALKit/AMD64/Network/Generic+Basic+RTL8139.cc
+++ b/src/kernel/HALKit/AMD64/Network/Generic+Basic+RTL8139.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/DMA.cc b/src/kernel/HALKit/AMD64/PCI/DMA.cc
index 809494b6..809494b6 100644
--- a/dev/kernel/HALKit/AMD64/PCI/DMA.cc
+++ b/src/kernel/HALKit/AMD64/PCI/DMA.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/Database.cc b/src/kernel/HALKit/AMD64/PCI/Database.cc
index ba3e946c..ba3e946c 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Database.cc
+++ b/src/kernel/HALKit/AMD64/PCI/Database.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/Device.cc b/src/kernel/HALKit/AMD64/PCI/Device.cc
index 65af2f25..65af2f25 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Device.cc
+++ b/src/kernel/HALKit/AMD64/PCI/Device.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/Express.cc b/src/kernel/HALKit/AMD64/PCI/Express.cc
index 2b6ba8d3..2b6ba8d3 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Express.cc
+++ b/src/kernel/HALKit/AMD64/PCI/Express.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/IO.cc b/src/kernel/HALKit/AMD64/PCI/IO.cc
index 233c8ef2..233c8ef2 100644
--- a/dev/kernel/HALKit/AMD64/PCI/IO.cc
+++ b/src/kernel/HALKit/AMD64/PCI/IO.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc b/src/kernel/HALKit/AMD64/PCI/Iterator.cc
index 103ddb2c..103ddb2c 100644
--- a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
+++ b/src/kernel/HALKit/AMD64/PCI/Iterator.cc
diff --git a/dev/kernel/HALKit/AMD64/PCI/PCI.cc b/src/kernel/HALKit/AMD64/PCI/PCI.cc
index a8c48fb9..a8c48fb9 100644
--- a/dev/kernel/HALKit/AMD64/PCI/PCI.cc
+++ b/src/kernel/HALKit/AMD64/PCI/PCI.cc
diff --git a/dev/kernel/HALKit/AMD64/Paging.h b/src/kernel/HALKit/AMD64/Paging.h
index a938700e..a938700e 100644
--- a/dev/kernel/HALKit/AMD64/Paging.h
+++ b/src/kernel/HALKit/AMD64/Paging.h
diff --git a/dev/kernel/HALKit/AMD64/Processor.h b/src/kernel/HALKit/AMD64/Processor.h
index db1ed573..db1ed573 100644
--- a/dev/kernel/HALKit/AMD64/Processor.h
+++ b/src/kernel/HALKit/AMD64/Processor.h
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/src/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
index 14b40b98..14b40b98 100644
--- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
+++ b/src/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/src/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
index cf6147d9..cf6147d9 100644
--- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
+++ b/src/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
diff --git a/dev/kernel/HALKit/AMD64/Storage/NVME+Generic.cc b/src/kernel/HALKit/AMD64/Storage/NVME+Generic.cc
index 88f95a86..88f95a86 100644
--- a/dev/kernel/HALKit/AMD64/Storage/NVME+Generic.cc
+++ b/src/kernel/HALKit/AMD64/Storage/NVME+Generic.cc
diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/src/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
index 0516be39..0516be39 100644
--- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
+++ b/src/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
diff --git a/dev/kernel/HALKit/AMD64/Storage/SCSI+Generic.cc b/src/kernel/HALKit/AMD64/Storage/SCSI+Generic.cc
index 0200ec5a..0200ec5a 100644
--- a/dev/kernel/HALKit/AMD64/Storage/SCSI+Generic.cc
+++ b/src/kernel/HALKit/AMD64/Storage/SCSI+Generic.cc
diff --git a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc b/src/kernel/HALKit/ARM64/APM/APM+IO.cc
index c4d0154b..c4d0154b 100644
--- a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc
+++ b/src/kernel/HALKit/ARM64/APM/APM+IO.cc
diff --git a/dev/kernel/HALKit/ARM64/ApplicationProcessor.h b/src/kernel/HALKit/ARM64/ApplicationProcessor.h
index 208bf82e..208bf82e 100644
--- a/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
+++ b/src/kernel/HALKit/ARM64/ApplicationProcessor.h
diff --git a/dev/kernel/HALKit/ARM64/CxxAbi.cc b/src/kernel/HALKit/ARM64/CxxAbi.cc
index 7b4eca20..7b4eca20 100644
--- a/dev/kernel/HALKit/ARM64/CxxAbi.cc
+++ b/src/kernel/HALKit/ARM64/CxxAbi.cc
diff --git a/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/src/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
index 9a8661cd..9a8661cd 100644
--- a/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
+++ b/src/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
diff --git a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc b/src/kernel/HALKit/ARM64/HalApplicationProcessor.cc
index 2a3c73e5..2a3c73e5 100644
--- a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
+++ b/src/kernel/HALKit/ARM64/HalApplicationProcessor.cc
diff --git a/dev/kernel/HALKit/ARM64/HalApplicationProcessorStartup.s b/src/kernel/HALKit/ARM64/HalApplicationProcessorStartup.s
index dca52571..dca52571 100644
--- a/dev/kernel/HALKit/ARM64/HalApplicationProcessorStartup.s
+++ b/src/kernel/HALKit/ARM64/HalApplicationProcessorStartup.s
diff --git a/dev/kernel/HALKit/ARM64/HalCommonAPI.s b/src/kernel/HALKit/ARM64/HalCommonAPI.s
index f0c69368..f0c69368 100644
--- a/dev/kernel/HALKit/ARM64/HalCommonAPI.s
+++ b/src/kernel/HALKit/ARM64/HalCommonAPI.s
diff --git a/dev/kernel/HALKit/ARM64/HalCoreInterruptHandler.cc b/src/kernel/HALKit/ARM64/HalCoreInterruptHandler.cc
index b89f68bd..b89f68bd 100644
--- a/dev/kernel/HALKit/ARM64/HalCoreInterruptHandler.cc
+++ b/src/kernel/HALKit/ARM64/HalCoreInterruptHandler.cc
diff --git a/dev/kernel/HALKit/ARM64/HalDebugOutput.cc b/src/kernel/HALKit/ARM64/HalDebugOutput.cc
index c0da9c3a..c0da9c3a 100644
--- a/dev/kernel/HALKit/ARM64/HalDebugOutput.cc
+++ b/src/kernel/HALKit/ARM64/HalDebugOutput.cc
diff --git a/dev/kernel/HALKit/ARM64/HalHandoverStub.s b/src/kernel/HALKit/ARM64/HalHandoverStub.s
index 5d5647c4..5d5647c4 100644
--- a/dev/kernel/HALKit/ARM64/HalHandoverStub.s
+++ b/src/kernel/HALKit/ARM64/HalHandoverStub.s
diff --git a/dev/kernel/HALKit/ARM64/HalInterruptAPI.s b/src/kernel/HALKit/ARM64/HalInterruptAPI.s
index cafebb7d..cafebb7d 100644
--- a/dev/kernel/HALKit/ARM64/HalInterruptAPI.s
+++ b/src/kernel/HALKit/ARM64/HalInterruptAPI.s
diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/src/kernel/HALKit/ARM64/HalKernelMain.cc
index e36535c3..e36535c3 100644
--- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/src/kernel/HALKit/ARM64/HalKernelMain.cc
diff --git a/dev/kernel/HALKit/ARM64/HalKernelPanic.cc b/src/kernel/HALKit/ARM64/HalKernelPanic.cc
index 6837ba1c..6837ba1c 100644
--- a/dev/kernel/HALKit/ARM64/HalKernelPanic.cc
+++ b/src/kernel/HALKit/ARM64/HalKernelPanic.cc
diff --git a/dev/kernel/HALKit/ARM64/HalPagingMgr.cc b/src/kernel/HALKit/ARM64/HalPagingMgr.cc
index d597ccce..d597ccce 100644
--- a/dev/kernel/HALKit/ARM64/HalPagingMgr.cc
+++ b/src/kernel/HALKit/ARM64/HalPagingMgr.cc
diff --git a/dev/kernel/HALKit/ARM64/HalSchedulerCore.cc b/src/kernel/HALKit/ARM64/HalSchedulerCore.cc
index 467547b0..467547b0 100644
--- a/dev/kernel/HALKit/ARM64/HalSchedulerCore.cc
+++ b/src/kernel/HALKit/ARM64/HalSchedulerCore.cc
diff --git a/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc b/src/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
index b1728bac..b1728bac 100644
--- a/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
+++ b/src/kernel/HALKit/ARM64/HalSchedulerCorePrimitives.cc
diff --git a/dev/kernel/HALKit/ARM64/HalTimer.cc b/src/kernel/HALKit/ARM64/HalTimer.cc
index 2f524a1b..2f524a1b 100644
--- a/dev/kernel/HALKit/ARM64/HalTimer.cc
+++ b/src/kernel/HALKit/ARM64/HalTimer.cc
diff --git a/dev/kernel/HALKit/ARM64/Paging.h b/src/kernel/HALKit/ARM64/Paging.h
index 766210b3..766210b3 100644
--- a/dev/kernel/HALKit/ARM64/Paging.h
+++ b/src/kernel/HALKit/ARM64/Paging.h
diff --git a/dev/kernel/HALKit/ARM64/Processor.h b/src/kernel/HALKit/ARM64/Processor.h
index 716d317b..716d317b 100644
--- a/dev/kernel/HALKit/ARM64/Processor.h
+++ b/src/kernel/HALKit/ARM64/Processor.h
diff --git a/dev/kernel/HALKit/ARM64/Storage/SCSI+Generic.cc b/src/kernel/HALKit/ARM64/Storage/SCSI+Generic.cc
index 0200ec5a..0200ec5a 100644
--- a/dev/kernel/HALKit/ARM64/Storage/SCSI+Generic.cc
+++ b/src/kernel/HALKit/ARM64/Storage/SCSI+Generic.cc
diff --git a/dev/kernel/HALKit/ARM64/Storage/UFS+Generic.cc b/src/kernel/HALKit/ARM64/Storage/UFS+Generic.cc
index 9971b2a8..9971b2a8 100644
--- a/dev/kernel/HALKit/ARM64/Storage/UFS+Generic.cc
+++ b/src/kernel/HALKit/ARM64/Storage/UFS+Generic.cc
diff --git a/dev/kernel/HALKit/POWER/.gitkeep b/src/kernel/HALKit/POWER/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/POWER/.gitkeep
+++ b/src/kernel/HALKit/POWER/.gitkeep
diff --git a/dev/kernel/HALKit/POWER/AP.h b/src/kernel/HALKit/POWER/AP.h
index efe4ceff..efe4ceff 100644
--- a/dev/kernel/HALKit/POWER/AP.h
+++ b/src/kernel/HALKit/POWER/AP.h
diff --git a/dev/kernel/HALKit/POWER/APM/.gitkeep b/src/kernel/HALKit/POWER/APM/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/POWER/APM/.gitkeep
+++ b/src/kernel/HALKit/POWER/APM/.gitkeep
diff --git a/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc b/src/kernel/HALKit/POWER/HalApplicationProcessor.cc
index 84d9b1c1..84d9b1c1 100644
--- a/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc
+++ b/src/kernel/HALKit/POWER/HalApplicationProcessor.cc
diff --git a/dev/kernel/HALKit/POWER/HalDebugOutput.cc b/src/kernel/HALKit/POWER/HalDebugOutput.cc
index 0c4be809..0c4be809 100644
--- a/dev/kernel/HALKit/POWER/HalDebugOutput.cc
+++ b/src/kernel/HALKit/POWER/HalDebugOutput.cc
diff --git a/dev/kernel/HALKit/POWER/HalHardwareThread.cc b/src/kernel/HALKit/POWER/HalHardwareThread.cc
index c77040f7..c77040f7 100644
--- a/dev/kernel/HALKit/POWER/HalHardwareThread.cc
+++ b/src/kernel/HALKit/POWER/HalHardwareThread.cc
diff --git a/dev/kernel/HALKit/POWER/HalStartSequence.s b/src/kernel/HALKit/POWER/HalStartSequence.s
index 194e220e..194e220e 100644
--- a/dev/kernel/HALKit/POWER/HalStartSequence.s
+++ b/src/kernel/HALKit/POWER/HalStartSequence.s
diff --git a/dev/kernel/HALKit/POWER/HalVirtualMemory.cc b/src/kernel/HALKit/POWER/HalVirtualMemory.cc
index cd9511c9..cd9511c9 100644
--- a/dev/kernel/HALKit/POWER/HalVirtualMemory.cc
+++ b/src/kernel/HALKit/POWER/HalVirtualMemory.cc
diff --git a/dev/kernel/HALKit/POWER/Processor.h b/src/kernel/HALKit/POWER/Processor.h
index 46cda33e..46cda33e 100644
--- a/dev/kernel/HALKit/POWER/Processor.h
+++ b/src/kernel/HALKit/POWER/Processor.h
diff --git a/dev/kernel/HALKit/RISCV/.keep b/src/kernel/HALKit/RISCV/.keep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/RISCV/.keep
+++ b/src/kernel/HALKit/RISCV/.keep
diff --git a/dev/kernel/HALKit/RISCV/AP.h b/src/kernel/HALKit/RISCV/AP.h
index 1061b637..1061b637 100644
--- a/dev/kernel/HALKit/RISCV/AP.h
+++ b/src/kernel/HALKit/RISCV/AP.h
diff --git a/dev/kernel/HALKit/RISCV/APM/.gitkeep b/src/kernel/HALKit/RISCV/APM/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/RISCV/APM/.gitkeep
+++ b/src/kernel/HALKit/RISCV/APM/.gitkeep
diff --git a/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc b/src/kernel/HALKit/RISCV/HalApplicationProcessor.cc
index 520481d1..520481d1 100644
--- a/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc
+++ b/src/kernel/HALKit/RISCV/HalApplicationProcessor.cc
diff --git a/dev/kernel/HALKit/RISCV/Storage/.gitkeep b/src/kernel/HALKit/RISCV/Storage/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/RISCV/Storage/.gitkeep
+++ b/src/kernel/HALKit/RISCV/Storage/.gitkeep
diff --git a/dev/kernel/HALKit/X86S/.gitkeep b/src/kernel/HALKit/X86S/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/X86S/.gitkeep
+++ b/src/kernel/HALKit/X86S/.gitkeep
diff --git a/dev/kernel/HALKit/X86S/ACPI/.gitkeep b/src/kernel/HALKit/X86S/ACPI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/X86S/ACPI/.gitkeep
+++ b/src/kernel/HALKit/X86S/ACPI/.gitkeep
diff --git a/dev/kernel/HALKit/X86S/Storage/.gitkeep b/src/kernel/HALKit/X86S/Storage/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/HALKit/X86S/Storage/.gitkeep
+++ b/src/kernel/HALKit/X86S/Storage/.gitkeep
diff --git a/dev/kernel/KernelKit/BinaryMutex.h b/src/kernel/KernelKit/BinaryMutex.h
index 5431ab72..5431ab72 100644
--- a/dev/kernel/KernelKit/BinaryMutex.h
+++ b/src/kernel/KernelKit/BinaryMutex.h
diff --git a/dev/kernel/KernelKit/CodeMgr.h b/src/kernel/KernelKit/CodeMgr.h
index e537b26d..e537b26d 100644
--- a/dev/kernel/KernelKit/CodeMgr.h
+++ b/src/kernel/KernelKit/CodeMgr.h
diff --git a/dev/kernel/KernelKit/CoreProcessScheduler.h b/src/kernel/KernelKit/CoreProcessScheduler.h
index 54a0614a..54a0614a 100644
--- a/dev/kernel/KernelKit/CoreProcessScheduler.h
+++ b/src/kernel/KernelKit/CoreProcessScheduler.h
diff --git a/dev/kernel/KernelKit/DebugOutput.h b/src/kernel/KernelKit/DebugOutput.h
index 3f9b5125..3f9b5125 100644
--- a/dev/kernel/KernelKit/DebugOutput.h
+++ b/src/kernel/KernelKit/DebugOutput.h
diff --git a/dev/kernel/KernelKit/Defines.h b/src/kernel/KernelKit/Defines.h
index e88441d2..e88441d2 100644
--- a/dev/kernel/KernelKit/Defines.h
+++ b/src/kernel/KernelKit/Defines.h
diff --git a/dev/kernel/KernelKit/DeviceMgr.h b/src/kernel/KernelKit/DeviceMgr.h
index 1dbad161..1dbad161 100644
--- a/dev/kernel/KernelKit/DeviceMgr.h
+++ b/src/kernel/KernelKit/DeviceMgr.h
diff --git a/dev/kernel/KernelKit/DriveMgr.h b/src/kernel/KernelKit/DriveMgr.h
index daf93b89..daf93b89 100644
--- a/dev/kernel/KernelKit/DriveMgr.h
+++ b/src/kernel/KernelKit/DriveMgr.h
diff --git a/dev/kernel/KernelKit/FileMgr.h b/src/kernel/KernelKit/FileMgr.h
index 93d5f580..93d5f580 100644
--- a/dev/kernel/KernelKit/FileMgr.h
+++ b/src/kernel/KernelKit/FileMgr.h
diff --git a/dev/kernel/KernelKit/HardwareThreadScheduler.h b/src/kernel/KernelKit/HardwareThreadScheduler.h
index 36a870ba..36a870ba 100644
--- a/dev/kernel/KernelKit/HardwareThreadScheduler.h
+++ b/src/kernel/KernelKit/HardwareThreadScheduler.h
diff --git a/dev/kernel/KernelKit/HeapMgr.h b/src/kernel/KernelKit/HeapMgr.h
index 58bac7a5..58bac7a5 100644
--- a/dev/kernel/KernelKit/HeapMgr.h
+++ b/src/kernel/KernelKit/HeapMgr.h
diff --git a/dev/kernel/KernelKit/HeapMgr.inl b/src/kernel/KernelKit/HeapMgr.inl
index 3231d33c..3231d33c 100644
--- a/dev/kernel/KernelKit/HeapMgr.inl
+++ b/src/kernel/KernelKit/HeapMgr.inl
diff --git a/dev/kernel/KernelKit/IDylibObject.h b/src/kernel/KernelKit/IDylibObject.h
index ef6b96db..ef6b96db 100644
--- a/dev/kernel/KernelKit/IDylibObject.h
+++ b/src/kernel/KernelKit/IDylibObject.h
diff --git a/dev/kernel/KernelKit/IFS.h b/src/kernel/KernelKit/IFS.h
index 7118a935..7118a935 100644
--- a/dev/kernel/KernelKit/IFS.h
+++ b/src/kernel/KernelKit/IFS.h
diff --git a/dev/kernel/KernelKit/ILoader.h b/src/kernel/KernelKit/ILoader.h
index 28dd1ed9..28dd1ed9 100644
--- a/dev/kernel/KernelKit/ILoader.h
+++ b/src/kernel/KernelKit/ILoader.h
diff --git a/dev/kernel/KernelKit/IPEFDylibObject.h b/src/kernel/KernelKit/IPEFDylibObject.h
index 17ef02d5..17ef02d5 100644
--- a/dev/kernel/KernelKit/IPEFDylibObject.h
+++ b/src/kernel/KernelKit/IPEFDylibObject.h
diff --git a/dev/kernel/KernelKit/KPC.h b/src/kernel/KernelKit/KPC.h
index dbdc2a93..dbdc2a93 100644
--- a/dev/kernel/KernelKit/KPC.h
+++ b/src/kernel/KernelKit/KPC.h
diff --git a/dev/kernel/KernelKit/KernelTaskScheduler.h b/src/kernel/KernelKit/KernelTaskScheduler.h
index 9bfce1d6..9bfce1d6 100644
--- a/dev/kernel/KernelKit/KernelTaskScheduler.h
+++ b/src/kernel/KernelKit/KernelTaskScheduler.h
diff --git a/dev/kernel/KernelKit/LockDelegate.h b/src/kernel/KernelKit/LockDelegate.h
index 8ff67f19..8ff67f19 100644
--- a/dev/kernel/KernelKit/LockDelegate.h
+++ b/src/kernel/KernelKit/LockDelegate.h
diff --git a/dev/kernel/KernelKit/MSDOS.h b/src/kernel/KernelKit/MSDOS.h
index 8c58b65b..8c58b65b 100644
--- a/dev/kernel/KernelKit/MSDOS.h
+++ b/src/kernel/KernelKit/MSDOS.h
diff --git a/dev/kernel/KernelKit/PCI/DMA.h b/src/kernel/KernelKit/PCI/DMA.h
index 80103dab..80103dab 100644
--- a/dev/kernel/KernelKit/PCI/DMA.h
+++ b/src/kernel/KernelKit/PCI/DMA.h
diff --git a/dev/kernel/KernelKit/PCI/DMA.inl b/src/kernel/KernelKit/PCI/DMA.inl
index d81a632e..d81a632e 100644
--- a/dev/kernel/KernelKit/PCI/DMA.inl
+++ b/src/kernel/KernelKit/PCI/DMA.inl
diff --git a/dev/kernel/KernelKit/PCI/Database.h b/src/kernel/KernelKit/PCI/Database.h
index 463fde38..463fde38 100644
--- a/dev/kernel/KernelKit/PCI/Database.h
+++ b/src/kernel/KernelKit/PCI/Database.h
diff --git a/dev/kernel/KernelKit/PCI/Device.h b/src/kernel/KernelKit/PCI/Device.h
index f2111e40..f2111e40 100644
--- a/dev/kernel/KernelKit/PCI/Device.h
+++ b/src/kernel/KernelKit/PCI/Device.h
diff --git a/dev/kernel/KernelKit/PCI/Express.h b/src/kernel/KernelKit/PCI/Express.h
index 484739ec..484739ec 100644
--- a/dev/kernel/KernelKit/PCI/Express.h
+++ b/src/kernel/KernelKit/PCI/Express.h
diff --git a/dev/kernel/KernelKit/PCI/IO.h b/src/kernel/KernelKit/PCI/IO.h
index 2ab72269..2ab72269 100644
--- a/dev/kernel/KernelKit/PCI/IO.h
+++ b/src/kernel/KernelKit/PCI/IO.h
diff --git a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl b/src/kernel/KernelKit/PCI/IOArray+AMD64.inl
index 2b9125e0..2b9125e0 100644
--- a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl
+++ b/src/kernel/KernelKit/PCI/IOArray+AMD64.inl
diff --git a/dev/kernel/KernelKit/PCI/Iterator.h b/src/kernel/KernelKit/PCI/Iterator.h
index 5926049b..5926049b 100644
--- a/dev/kernel/KernelKit/PCI/Iterator.h
+++ b/src/kernel/KernelKit/PCI/Iterator.h
diff --git a/dev/kernel/KernelKit/PCI/PCI.h b/src/kernel/KernelKit/PCI/PCI.h
index f76270da..f76270da 100644
--- a/dev/kernel/KernelKit/PCI/PCI.h
+++ b/src/kernel/KernelKit/PCI/PCI.h
diff --git a/dev/kernel/KernelKit/PE.h b/src/kernel/KernelKit/PE.h
index b4b4576e..b4b4576e 100644
--- a/dev/kernel/KernelKit/PE.h
+++ b/src/kernel/KernelKit/PE.h
diff --git a/dev/kernel/KernelKit/PE32CodeMgr.h b/src/kernel/KernelKit/PE32CodeMgr.h
index 52bc22b4..52bc22b4 100644
--- a/dev/kernel/KernelKit/PE32CodeMgr.h
+++ b/src/kernel/KernelKit/PE32CodeMgr.h
diff --git a/dev/kernel/KernelKit/PEF.h b/src/kernel/KernelKit/PEF.h
index 94284c98..94284c98 100644
--- a/dev/kernel/KernelKit/PEF.h
+++ b/src/kernel/KernelKit/PEF.h
diff --git a/dev/kernel/KernelKit/PEFCodeMgr.h b/src/kernel/KernelKit/PEFCodeMgr.h
index 41b135e0..41b135e0 100644
--- a/dev/kernel/KernelKit/PEFCodeMgr.h
+++ b/src/kernel/KernelKit/PEFCodeMgr.h
diff --git a/dev/kernel/KernelKit/ProcessScheduler.h b/src/kernel/KernelKit/ProcessScheduler.h
index 7414e4fe..7414e4fe 100644
--- a/dev/kernel/KernelKit/ProcessScheduler.h
+++ b/src/kernel/KernelKit/ProcessScheduler.h
diff --git a/dev/kernel/KernelKit/Semaphore.h b/src/kernel/KernelKit/Semaphore.h
index 831774a5..831774a5 100644
--- a/dev/kernel/KernelKit/Semaphore.h
+++ b/src/kernel/KernelKit/Semaphore.h
diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.h b/src/kernel/KernelKit/ThreadLocalStorage.h
index 205d6df9..205d6df9 100644
--- a/dev/kernel/KernelKit/ThreadLocalStorage.h
+++ b/src/kernel/KernelKit/ThreadLocalStorage.h
diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.inl b/src/kernel/KernelKit/ThreadLocalStorage.inl
index 66a3d282..66a3d282 100644
--- a/dev/kernel/KernelKit/ThreadLocalStorage.inl
+++ b/src/kernel/KernelKit/ThreadLocalStorage.inl
diff --git a/dev/kernel/KernelKit/Timer.h b/src/kernel/KernelKit/Timer.h
index 46db5671..46db5671 100644
--- a/dev/kernel/KernelKit/Timer.h
+++ b/src/kernel/KernelKit/Timer.h
diff --git a/dev/kernel/KernelKit/TraceSrv.h b/src/kernel/KernelKit/TraceSrv.h
index df188ea2..df188ea2 100644
--- a/dev/kernel/KernelKit/TraceSrv.h
+++ b/src/kernel/KernelKit/TraceSrv.h
diff --git a/dev/kernel/KernelKit/UserMgr.h b/src/kernel/KernelKit/UserMgr.h
index 3ce6254d..3ce6254d 100644
--- a/dev/kernel/KernelKit/UserMgr.h
+++ b/src/kernel/KernelKit/UserMgr.h
diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/src/kernel/KernelKit/UserProcessScheduler.h
index b2ab7dc2..b2ab7dc2 100644
--- a/dev/kernel/KernelKit/UserProcessScheduler.h
+++ b/src/kernel/KernelKit/UserProcessScheduler.h
diff --git a/dev/kernel/KernelKit/UserProcessScheduler.inl b/src/kernel/KernelKit/UserProcessScheduler.inl
index 3d3659d6..3d3659d6 100644
--- a/dev/kernel/KernelKit/UserProcessScheduler.inl
+++ b/src/kernel/KernelKit/UserProcessScheduler.inl
diff --git a/dev/kernel/KernelKit/XCOFF.h b/src/kernel/KernelKit/XCOFF.h
index cbee6100..cbee6100 100644
--- a/dev/kernel/KernelKit/XCOFF.h
+++ b/src/kernel/KernelKit/XCOFF.h
diff --git a/dev/kernel/KernelKit/ZXD.h b/src/kernel/KernelKit/ZXD.h
index a4b07bfa..a4b07bfa 100644
--- a/dev/kernel/KernelKit/ZXD.h
+++ b/src/kernel/KernelKit/ZXD.h
diff --git a/dev/kernel/NeKit/Array.h b/src/kernel/NeKit/Array.h
index 5b8371db..5b8371db 100644
--- a/dev/kernel/NeKit/Array.h
+++ b/src/kernel/NeKit/Array.h
diff --git a/dev/kernel/NeKit/ArrayList.h b/src/kernel/NeKit/ArrayList.h
index 54613b67..54613b67 100644
--- a/dev/kernel/NeKit/ArrayList.h
+++ b/src/kernel/NeKit/ArrayList.h
diff --git a/dev/kernel/NeKit/Atom.h b/src/kernel/NeKit/Atom.h
index 0f8eefbc..0f8eefbc 100644
--- a/dev/kernel/NeKit/Atom.h
+++ b/src/kernel/NeKit/Atom.h
diff --git a/dev/kernel/NeKit/Crc32.h b/src/kernel/NeKit/Crc32.h
index 3c6a904f..3c6a904f 100644
--- a/dev/kernel/NeKit/Crc32.h
+++ b/src/kernel/NeKit/Crc32.h
diff --git a/dev/kernel/NeKit/CxxAbi.h b/src/kernel/NeKit/CxxAbi.h
index 7b13d6b3..7b13d6b3 100644
--- a/dev/kernel/NeKit/CxxAbi.h
+++ b/src/kernel/NeKit/CxxAbi.h
diff --git a/dev/kernel/NeKit/Defines.h b/src/kernel/NeKit/Defines.h
index 1a6a2cf6..1a6a2cf6 100644
--- a/dev/kernel/NeKit/Defines.h
+++ b/src/kernel/NeKit/Defines.h
diff --git a/dev/kernel/NeKit/ErrorOr.h b/src/kernel/NeKit/ErrorOr.h
index d930fe17..d930fe17 100644
--- a/dev/kernel/NeKit/ErrorOr.h
+++ b/src/kernel/NeKit/ErrorOr.h
diff --git a/dev/kernel/NeKit/Function.h b/src/kernel/NeKit/Function.h
index 70242bc3..70242bc3 100644
--- a/dev/kernel/NeKit/Function.h
+++ b/src/kernel/NeKit/Function.h
diff --git a/dev/kernel/NeKit/Json.h b/src/kernel/NeKit/Json.h
index 1e804354..1e804354 100644
--- a/dev/kernel/NeKit/Json.h
+++ b/src/kernel/NeKit/Json.h
diff --git a/dev/kernel/NeKit/KString.h b/src/kernel/NeKit/KString.h
index fa83fed4..fa83fed4 100644
--- a/dev/kernel/NeKit/KString.h
+++ b/src/kernel/NeKit/KString.h
diff --git a/dev/kernel/NeKit/KString.inl b/src/kernel/NeKit/KString.inl
index 3a73e90f..3a73e90f 100644
--- a/dev/kernel/NeKit/KString.inl
+++ b/src/kernel/NeKit/KString.inl
diff --git a/dev/kernel/NeKit/KernelPanic.h b/src/kernel/NeKit/KernelPanic.h
index f716e6de..f716e6de 100644
--- a/dev/kernel/NeKit/KernelPanic.h
+++ b/src/kernel/NeKit/KernelPanic.h
diff --git a/dev/kernel/NeKit/Macros.h b/src/kernel/NeKit/Macros.h
index 5949b414..5949b414 100644
--- a/dev/kernel/NeKit/Macros.h
+++ b/src/kernel/NeKit/Macros.h
diff --git a/dev/kernel/NeKit/MutableArray.h b/src/kernel/NeKit/MutableArray.h
index e1138b3b..e1138b3b 100644
--- a/dev/kernel/NeKit/MutableArray.h
+++ b/src/kernel/NeKit/MutableArray.h
diff --git a/dev/kernel/NeKit/NeKit.h b/src/kernel/NeKit/NeKit.h
index 4b1e64ca..4b1e64ca 100644
--- a/dev/kernel/NeKit/NeKit.h
+++ b/src/kernel/NeKit/NeKit.h
diff --git a/dev/kernel/NeKit/New.h b/src/kernel/NeKit/New.h
index 36830129..36830129 100644
--- a/dev/kernel/NeKit/New.h
+++ b/src/kernel/NeKit/New.h
diff --git a/dev/kernel/NeKit/OwnPtr.h b/src/kernel/NeKit/OwnPtr.h
index c8ceb1a2..c8ceb1a2 100644
--- a/dev/kernel/NeKit/OwnPtr.h
+++ b/src/kernel/NeKit/OwnPtr.h
diff --git a/dev/kernel/NeKit/PageMgr.h b/src/kernel/NeKit/PageMgr.h
index 6cdd5a5c..6cdd5a5c 100644
--- a/dev/kernel/NeKit/PageMgr.h
+++ b/src/kernel/NeKit/PageMgr.h
diff --git a/dev/kernel/NeKit/Pair.h b/src/kernel/NeKit/Pair.h
index c8914ec6..c8914ec6 100644
--- a/dev/kernel/NeKit/Pair.h
+++ b/src/kernel/NeKit/Pair.h
diff --git a/dev/kernel/NeKit/Pmm.h b/src/kernel/NeKit/Pmm.h
index 8c117a67..8c117a67 100644
--- a/dev/kernel/NeKit/Pmm.h
+++ b/src/kernel/NeKit/Pmm.h
diff --git a/dev/kernel/NeKit/Ref.h b/src/kernel/NeKit/Ref.h
index dac701e0..dac701e0 100644
--- a/dev/kernel/NeKit/Ref.h
+++ b/src/kernel/NeKit/Ref.h
diff --git a/dev/kernel/NeKit/Stream.h b/src/kernel/NeKit/Stream.h
index 1a53e7f0..1a53e7f0 100644
--- a/dev/kernel/NeKit/Stream.h
+++ b/src/kernel/NeKit/Stream.h
diff --git a/dev/kernel/NeKit/TOML.h b/src/kernel/NeKit/TOML.h
index dee273ad..dee273ad 100644
--- a/dev/kernel/NeKit/TOML.h
+++ b/src/kernel/NeKit/TOML.h
diff --git a/dev/kernel/NeKit/Utils.h b/src/kernel/NeKit/Utils.h
index caabd2af..caabd2af 100644
--- a/dev/kernel/NeKit/Utils.h
+++ b/src/kernel/NeKit/Utils.h
diff --git a/dev/kernel/NeKit/Variant.h b/src/kernel/NeKit/Variant.h
index 7bcd0dff..7bcd0dff 100644
--- a/dev/kernel/NeKit/Variant.h
+++ b/src/kernel/NeKit/Variant.h
diff --git a/dev/kernel/NetworkKit/IP.h b/src/kernel/NetworkKit/IP.h
index b19d132f..b19d132f 100644
--- a/dev/kernel/NetworkKit/IP.h
+++ b/src/kernel/NetworkKit/IP.h
diff --git a/dev/kernel/NetworkKit/IPC.h b/src/kernel/NetworkKit/IPC.h
index c08a9457..c08a9457 100644
--- a/dev/kernel/NetworkKit/IPC.h
+++ b/src/kernel/NetworkKit/IPC.h
diff --git a/dev/kernel/NetworkKit/LTE.h b/src/kernel/NetworkKit/LTE.h
index c29f1687..c29f1687 100644
--- a/dev/kernel/NetworkKit/LTE.h
+++ b/src/kernel/NetworkKit/LTE.h
diff --git a/dev/kernel/NetworkKit/MAC.h b/src/kernel/NetworkKit/MAC.h
index 382eca77..382eca77 100644
--- a/dev/kernel/NetworkKit/MAC.h
+++ b/src/kernel/NetworkKit/MAC.h
diff --git a/dev/kernel/NetworkKit/NetworkDevice.h b/src/kernel/NetworkKit/NetworkDevice.h
index 3afa8484..3afa8484 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.h
+++ b/src/kernel/NetworkKit/NetworkDevice.h
diff --git a/dev/kernel/NetworkKit/NetworkDevice.inl b/src/kernel/NetworkKit/NetworkDevice.inl
index a86d7e56..a86d7e56 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.inl
+++ b/src/kernel/NetworkKit/NetworkDevice.inl
diff --git a/dev/kernel/SignalKit/Signals.h b/src/kernel/SignalKit/Signals.h
index b4e72fc4..b4e72fc4 100644
--- a/dev/kernel/SignalKit/Signals.h
+++ b/src/kernel/SignalKit/Signals.h
diff --git a/dev/kernel/StorageKit/AHCI.h b/src/kernel/StorageKit/AHCI.h
index 82bd9747..82bd9747 100644
--- a/dev/kernel/StorageKit/AHCI.h
+++ b/src/kernel/StorageKit/AHCI.h
diff --git a/dev/kernel/StorageKit/ATA.h b/src/kernel/StorageKit/ATA.h
index f92e09d3..f92e09d3 100644
--- a/dev/kernel/StorageKit/ATA.h
+++ b/src/kernel/StorageKit/ATA.h
diff --git a/dev/kernel/StorageKit/NVME.h b/src/kernel/StorageKit/NVME.h
index d1c036ab..d1c036ab 100644
--- a/dev/kernel/StorageKit/NVME.h
+++ b/src/kernel/StorageKit/NVME.h
diff --git a/dev/kernel/StorageKit/PRDT.h b/src/kernel/StorageKit/PRDT.h
index 44eb11be..44eb11be 100644
--- a/dev/kernel/StorageKit/PRDT.h
+++ b/src/kernel/StorageKit/PRDT.h
diff --git a/dev/kernel/StorageKit/SCSI.h b/src/kernel/StorageKit/SCSI.h
index 4dad00ad..4dad00ad 100644
--- a/dev/kernel/StorageKit/SCSI.h
+++ b/src/kernel/StorageKit/SCSI.h
diff --git a/dev/kernel/StorageKit/StorageKit.h b/src/kernel/StorageKit/StorageKit.h
index c9633392..c9633392 100644
--- a/dev/kernel/StorageKit/StorageKit.h
+++ b/src/kernel/StorageKit/StorageKit.h
diff --git a/dev/kernel/SwapKit/DiskSwap.h b/src/kernel/SwapKit/DiskSwap.h
index cd81b13a..cd81b13a 100644
--- a/dev/kernel/SwapKit/DiskSwap.h
+++ b/src/kernel/SwapKit/DiskSwap.h
diff --git a/dev/kernel/amd64-ci.make b/src/kernel/amd64-ci.make
index 203d0dc9..203d0dc9 100644
--- a/dev/kernel/amd64-ci.make
+++ b/src/kernel/amd64-ci.make
diff --git a/dev/kernel/amd64-desktop.make b/src/kernel/amd64-desktop.make
index 081bf75b..081bf75b 100644
--- a/dev/kernel/amd64-desktop.make
+++ b/src/kernel/amd64-desktop.make
diff --git a/dev/kernel/arm64-desktop.make b/src/kernel/arm64-desktop.make
index f5228d6b..f5228d6b 100644
--- a/dev/kernel/arm64-desktop.make
+++ b/src/kernel/arm64-desktop.make
diff --git a/dev/kernel/kernel_rsrc.rsrc b/src/kernel/kernel_rsrc.rsrc
index 0a43086e..0a43086e 100644
--- a/dev/kernel/kernel_rsrc.rsrc
+++ b/src/kernel/kernel_rsrc.rsrc
diff --git a/dev/kernel/move-all-aarch64.sh b/src/kernel/move-all-aarch64.sh
index 35e0909e..35e0909e 100755
--- a/dev/kernel/move-all-aarch64.sh
+++ b/src/kernel/move-all-aarch64.sh
diff --git a/dev/kernel/move-all-x64.sh b/src/kernel/move-all-x64.sh
index 1c135d06..1c135d06 100755
--- a/dev/kernel/move-all-x64.sh
+++ b/src/kernel/move-all-x64.sh
diff --git a/dev/kernel/obj/.gitkeep b/src/kernel/obj/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/kernel/obj/.gitkeep
+++ b/src/kernel/obj/.gitkeep
diff --git a/dev/kernel/power64-cb.make b/src/kernel/power64-cb.make
index c46a00d0..c46a00d0 100644
--- a/dev/kernel/power64-cb.make
+++ b/src/kernel/power64-cb.make
diff --git a/dev/kernel/riscv64-cb.make b/src/kernel/riscv64-cb.make
index e69de29b..e69de29b 100644
--- a/dev/kernel/riscv64-cb.make
+++ b/src/kernel/riscv64-cb.make
diff --git a/dev/kernel/src/ACPIFactoryInterface.cc b/src/kernel/src/ACPIFactoryInterface.cc
index 42819b7e..42819b7e 100644
--- a/dev/kernel/src/ACPIFactoryInterface.cc
+++ b/src/kernel/src/ACPIFactoryInterface.cc
diff --git a/dev/kernel/src/Array.cc b/src/kernel/src/Array.cc
index c792ef93..c792ef93 100644
--- a/dev/kernel/src/Array.cc
+++ b/src/kernel/src/Array.cc
diff --git a/dev/kernel/src/ArrayList.cc b/src/kernel/src/ArrayList.cc
index 37042320..37042320 100644
--- a/dev/kernel/src/ArrayList.cc
+++ b/src/kernel/src/ArrayList.cc
diff --git a/dev/kernel/src/AsciiUtils.cc b/src/kernel/src/AsciiUtils.cc
index 1f1ab0f6..1f1ab0f6 100644
--- a/dev/kernel/src/AsciiUtils.cc
+++ b/src/kernel/src/AsciiUtils.cc
diff --git a/dev/kernel/src/Atom.cc b/src/kernel/src/Atom.cc
index c6c1dd40..c6c1dd40 100644
--- a/dev/kernel/src/Atom.cc
+++ b/src/kernel/src/Atom.cc
diff --git a/dev/kernel/src/BinaryMutex.cc b/src/kernel/src/BinaryMutex.cc
index 3c332b33..3c332b33 100644
--- a/dev/kernel/src/BinaryMutex.cc
+++ b/src/kernel/src/BinaryMutex.cc
diff --git a/dev/kernel/src/BitMapMgr.cc b/src/kernel/src/BitMapMgr.cc
index d7ecb810..d7ecb810 100644
--- a/dev/kernel/src/BitMapMgr.cc
+++ b/src/kernel/src/BitMapMgr.cc
diff --git a/dev/kernel/src/CRuntimeOverrides.cc b/src/kernel/src/CRuntimeOverrides.cc
index a773d4f9..a773d4f9 100644
--- a/dev/kernel/src/CRuntimeOverrides.cc
+++ b/src/kernel/src/CRuntimeOverrides.cc
diff --git a/dev/kernel/src/CodeMgr.cc b/src/kernel/src/CodeMgr.cc
index 7b7add6d..7b7add6d 100644
--- a/dev/kernel/src/CodeMgr.cc
+++ b/src/kernel/src/CodeMgr.cc
diff --git a/dev/kernel/src/Crc32.cc b/src/kernel/src/Crc32.cc
index 88a9b73a..88a9b73a 100644
--- a/dev/kernel/src/Crc32.cc
+++ b/src/kernel/src/Crc32.cc
diff --git a/dev/kernel/src/Defines.cc b/src/kernel/src/Defines.cc
index 1ae6f12f..1ae6f12f 100644
--- a/dev/kernel/src/Defines.cc
+++ b/src/kernel/src/Defines.cc
diff --git a/dev/kernel/src/DeviceMgr.cc b/src/kernel/src/DeviceMgr.cc
index b392a4ee..b392a4ee 100644
--- a/dev/kernel/src/DeviceMgr.cc
+++ b/src/kernel/src/DeviceMgr.cc
diff --git a/dev/kernel/src/DriveMgr.cc b/src/kernel/src/DriveMgr.cc
index 8f2611a4..8f2611a4 100644
--- a/dev/kernel/src/DriveMgr.cc
+++ b/src/kernel/src/DriveMgr.cc
diff --git a/dev/kernel/src/ErrorOr.cc b/src/kernel/src/ErrorOr.cc
index 9f1b550b..9f1b550b 100644
--- a/dev/kernel/src/ErrorOr.cc
+++ b/src/kernel/src/ErrorOr.cc
diff --git a/dev/kernel/src/FS/Ext2+IFS.cc b/src/kernel/src/FS/Ext2+IFS.cc
index 106229f7..106229f7 100644
--- a/dev/kernel/src/FS/Ext2+IFS.cc
+++ b/src/kernel/src/FS/Ext2+IFS.cc
diff --git a/dev/kernel/src/FS/NeFS+FileMgr.cc b/src/kernel/src/FS/NeFS+FileMgr.cc
index 0fdabd6f..0fdabd6f 100644
--- a/dev/kernel/src/FS/NeFS+FileMgr.cc
+++ b/src/kernel/src/FS/NeFS+FileMgr.cc
diff --git a/dev/kernel/src/FS/NeFS+FileSystemParser.cc b/src/kernel/src/FS/NeFS+FileSystemParser.cc
index bfb8d63a..bfb8d63a 100644
--- a/dev/kernel/src/FS/NeFS+FileSystemParser.cc
+++ b/src/kernel/src/FS/NeFS+FileSystemParser.cc
diff --git a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc b/src/kernel/src/FS/OpenHeFS+FileMgr.cc
index e70e3626..7340514a 100644
--- a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc
+++ b/src/kernel/src/FS/OpenHeFS+FileMgr.cc
@@ -86,19 +86,19 @@ NodePtr HeFileSystemMgr::CreateSwapFile(const Char* path) {
 /// @brief Gets the root directory.
 /// @return
 const Char* NeFileSystemHelper::Root() {
-  return kHeFSRootDirectory;
+  return kOpenHeFSRootDirectory;
 }
 
 /// @brief Gets the up-dir directory.
 /// @return
 const Char* NeFileSystemHelper::UpDir() {
-  return kHeFSUpDir;
+  return kOpenHeFSUpDir;
 }
 
 /// @brief Gets the separator character.
 /// @return
 Char NeFileSystemHelper::Separator() {
-  return kHeFSSeparator;
+  return kOpenHeFSSeparator;
 }
 
 /// @brief Gets the metafile character.
diff --git a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc b/src/kernel/src/FS/OpenHeFS+FileSystemParser.cc
index d8e22f18..d6aeb992 100644
--- a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc
+++ b/src/kernel/src/FS/OpenHeFS+FileSystemParser.cc
@@ -365,7 +365,7 @@ namespace Detail {
           dirent->fColor  = tmpdir->fColor;
 
           if (dirent->fColor == 0) {
-            dirent->fColor = dirent->fNext ? kHeFSRed : kHeFSBlack;
+            dirent->fColor = dirent->fNext ? kOpenHeFSRed : kOpenHeFSBlack;
           }
 
           if (dirent->fPrev == 0) {
@@ -397,13 +397,13 @@ namespace Detail {
               if (child > boot->fEndIND) break;
             }
 
-            dirent->fColor = kHeFSRed;
+            dirent->fColor = kOpenHeFSRed;
             dirent->fChild = child;
 
             if (child > boot->fEndIND) dirent->fChild = boot->fStartIND;
           }
 
-          for (SizeT index = 0UL; index < kHeFSSliceCount; ++index) {
+          for (SizeT index = 0UL; index < kOpenHeFSSliceCount; ++index) {
             dirent->fINSlices[index] = 0UL;
           }
 
@@ -497,7 +497,7 @@ namespace Detail {
         if (dir->fHashPath == 0) break;
 
         if (hefsi_hash_64(dir_name) == dir->fHashPath) {
-          for (SizeT inode_index = 0UL; inode_index < kHeFSSliceCount; ++inode_index) {
+          for (SizeT inode_index = 0UL; inode_index < kOpenHeFSSliceCount; ++inode_index) {
             mnt->fPacket.fPacketLba     = dir->fINSlices[inode_index];
             mnt->fPacket.fPacketSize    = sizeof(HEFS_INDEX_NODE);
             mnt->fPacket.fPacketContent = node;
@@ -563,7 +563,7 @@ namespace Detail {
         (Void)(kout << hex_number(dir->fHashPath) << kendl);
 
         if (hefsi_hash_64(dir_name) == dir->fHashPath) {
-          for (SizeT inode_index = 0UL; inode_index < kHeFSSliceCount; ++inode_index) {
+          for (SizeT inode_index = 0UL; inode_index < kOpenHeFSSliceCount; ++inode_index) {
             if (dir->fINSlices[inode_index] == 0 && !delete_or_create) {
               dir->fINSlices[inode_index] = boot->fStartIN;
 
@@ -591,7 +591,7 @@ namespace Detail {
               mnt->fOutput(mnt->fPacket);
 
               boot->fStartIN += sizeof(HEFS_INDEX_NODE);
-              boot->fStartBlock += kHeFSBlockLen;
+              boot->fStartBlock += kOpenHeFSBlockLen;
 
               boot->fChecksum = ke_calculate_crc32((Char*) boot, sizeof(HEFS_BOOT_NODE));
 
@@ -623,7 +623,7 @@ namespace Detail {
               node->fOffsetSliceHigh = 0;
 
               boot->fStartIN -= sizeof(HEFS_INDEX_NODE);
-              boot->fStartBlock -= kHeFSBlockLen;
+              boot->fStartBlock -= kOpenHeFSBlockLen;
 
               boot->fChecksum = ke_calculate_crc32((Char*) boot, sizeof(HEFS_BOOT_NODE));
 
@@ -698,7 +698,7 @@ namespace Detail {
         }
 
         if (start == boot->fStartIND) {
-          dir->fColor = kHeFSBlack;
+          dir->fColor = kOpenHeFSBlack;
 
           mnt->fPacket.fPacketLba     = start;
           mnt->fPacket.fPacketSize    = sizeof(HEFS_INDEX_NODE_DIRECTORY);
@@ -707,11 +707,11 @@ namespace Detail {
           mnt->fOutput(mnt->fPacket);
         }
 
-        if (dir->fColor == kHeFSBlack && dir->fChild != 0UL) {
-          dir->fColor = kHeFSRed;
+        if (dir->fColor == kOpenHeFSBlack && dir->fChild != 0UL) {
+          dir->fColor = kOpenHeFSRed;
           hefsi_rotate_tree(start, mnt);
-        } else if (dir->fColor == kHeFSBlack && dir->fChild == 0UL) {
-          dir->fColor = kHeFSBlack;
+        } else if (dir->fColor == kOpenHeFSBlack && dir->fChild == 0UL) {
+          dir->fColor = kOpenHeFSBlack;
 
           mnt->fPacket.fPacketLba     = start;
           mnt->fPacket.fPacketSize    = sizeof(HEFS_INDEX_NODE_DIRECTORY);
@@ -762,7 +762,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
     return NO;
   }
 
-  if (drv_std_get_size() < kHeFSMinimumDiskSize) {
+  if (drv_std_get_size() < kOpenHeFSMinimumDiskSize) {
     (Void)(kout << "OpenHeFS recommends at least 128 GiB of free space." << kendl);
   }
 
@@ -782,7 +782,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
 
   // Check if the disk is already formatted.
 
-  if (KStringBuilder::Equals(boot->fMagic, kHeFSMagic) && boot->fVersion == kHeFSVersion) {
+  if (KStringBuilder::Equals(boot->fMagic, kOpenHeFSMagic) && boot->fVersion == kOpenHeFSVersion) {
     if (ke_calculate_crc32((Char*) boot, sizeof(HEFS_BOOT_NODE)) != boot->fChecksum &&
         boot->fChecksum > 0) {
       err_global_get() = kErrorDiskIsCorrupted;
@@ -803,7 +803,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
                       rt_string_len("fs/hefs-packet"), sizeof(mnt->fPacket.fPacketMime));
 
   urt_copy_memory((VoidPtr) vol_name, boot->fVolName, urt_string_len(vol_name) + 1);
-  rt_copy_memory_safe((VoidPtr) kHeFSMagic, boot->fMagic, kHeFSMagicLen - 1, sizeof(boot->fMagic));
+  rt_copy_memory_safe((VoidPtr) kOpenHeFSMagic, boot->fMagic, kOpenHeFSMagicLen - 1, sizeof(boot->fMagic));
 
   if (mnt->fLbaStart > mnt->fLbaEnd) {
     err_global_get() = kErrorDiskIsCorrupted;
@@ -824,7 +824,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
   const SizeT dir_max   = max_lba / 300;  // 5% for directory inodes
   const SizeT inode_max = max_lba / 400;  // 5% for inodes
 
-  boot->fStartIND = mnt->fLbaStart + kHeFSINDStartOffset;
+  boot->fStartIND = mnt->fLbaStart + kOpenHeFSINDStartOffset;
   boot->fEndIND   = boot->fStartIND + dir_max;
 
   boot->fStartIN = boot->fEndIND;
@@ -836,21 +836,21 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
   boot->fINDCount = 0;
 
   boot->fDiskSize   = drv_std_get_size();
-  boot->fDiskStatus = kHeFSStatusUnlocked;
+  boot->fDiskStatus = kOpenHeFSStatusUnlocked;
 
   boot->fDiskFlags = flags;
 
   if (mnt->fKind & kMassStorageDrive) {
-    boot->fDiskKind = kHeFSMassStorageDevice;
-  } else if (mnt->fKind & kHeFSOpticalDrive) {
-    boot->fDiskKind = kHeFSOpticalDrive;
+    boot->fDiskKind = kOpenHeFSMassStorageDevice;
+  } else if (mnt->fKind & kOpenHeFSOpticalDrive) {
+    boot->fDiskKind = kOpenHeFSOpticalDrive;
   } else {
-    boot->fDiskKind = kHeFSUnknown;
+    boot->fDiskKind = kOpenHeFSUnknown;
   }
 
-  boot->fVersion = kHeFSVersion;
+  boot->fVersion = kOpenHeFSVersion;
 
-  boot->fVID = kHeFSInvalidVID;
+  boot->fVID = kOpenHeFSInvalidVID;
 
   boot->fChecksum = ke_calculate_crc32((Char*) boot, sizeof(HEFS_BOOT_NODE));
 
@@ -883,7 +883,7 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
 
   SizeT i = 0;
   while (kFileMap[++i] != nullptr) {
-    this->CreateINodeDirectory(mnt, kHeFSEncodingFlagsUTF8, kFileMap[i]);
+    this->CreateINodeDirectory(mnt, kOpenHeFSEncodingFlagsUTF8, kFileMap[i]);
   }
 
   err_global_get() = kErrorSuccess;
@@ -900,7 +900,7 @@ _Output Bool HeFileSystemParser::INodeDirectoryCtlManip(_Input DriveTrait* mnt,
                                                         _Input const Int32 flags,
                                                         const Utf8Char*    dir,
                                                         const BOOL         delete_or_create) {
-  if (urt_string_len(dir) > kHeFSFileNameLen) {
+  if (urt_string_len(dir) > kOpenHeFSFileNameLen) {
     err_global_get() = kErrorDisk;
     return NO;
   }
@@ -916,12 +916,12 @@ _Output Bool HeFileSystemParser::INodeDirectoryCtlManip(_Input DriveTrait* mnt,
 
   mnt->fInput(mnt->fPacket);
 
-  if (!KStringBuilder::Equals(boot->fMagic, kHeFSMagic) || boot->fVersion != kHeFSVersion) {
+  if (!KStringBuilder::Equals(boot->fMagic, kOpenHeFSMagic) || boot->fVersion != kOpenHeFSVersion) {
     err_global_get() = kErrorDisk;
     return YES;
   }
 
-  if (!KStringBuilder::Equals(boot->fMagic, kHeFSMagic) || boot->fVersion != kHeFSVersion) {
+  if (!KStringBuilder::Equals(boot->fMagic, kOpenHeFSMagic) || boot->fVersion != kOpenHeFSVersion) {
     err_global_get() = kErrorDiskIsCorrupted;
 
     kout << "Invalid Boot Node, this can't continue!\r";
@@ -929,7 +929,7 @@ _Output Bool HeFileSystemParser::INodeDirectoryCtlManip(_Input DriveTrait* mnt,
     return NO;
   }
 
-  if (KStringBuilder::Equals(dir, kHeFSSearchAllStr)) {
+  if (KStringBuilder::Equals(dir, kOpenHeFSSearchAllStr)) {
     kout << "Error: Invalid directory name.\r";
 
     err_global_get() = kErrorInvalidData;
@@ -976,12 +976,12 @@ _Output Bool HeFileSystemParser::CreateINode(_Input DriveTrait* mnt, _Input cons
 _Output Bool HeFileSystemParser::INodeManip(_Input DriveTrait* mnt, VoidPtr block, SizeT block_sz,
                                             const Utf8Char* dir, const Utf8Char* name,
                                             const UInt8 kind, const BOOL is_input) {
-  if (urt_string_len(dir) > kHeFSFileNameLen) {
+  if (urt_string_len(dir) > kOpenHeFSFileNameLen) {
     err_global_get() = kErrorDisk;
     return NO;
   }
 
-  if (urt_string_len(name) > kHeFSFileNameLen) {
+  if (urt_string_len(name) > kOpenHeFSFileNameLen) {
     err_global_get() = kErrorDisk;
     return NO;
   }
@@ -1002,7 +1002,7 @@ _Output Bool HeFileSystemParser::INodeManip(_Input DriveTrait* mnt, VoidPtr bloc
 
   mnt->fInput(mnt->fPacket);
 
-  if (!KStringBuilder::Equals(boot->fMagic, kHeFSMagic) || boot->fVersion != kHeFSVersion) {
+  if (!KStringBuilder::Equals(boot->fMagic, kOpenHeFSMagic) || boot->fVersion != kOpenHeFSVersion) {
     (Void)(kout << "Invalid Boot Node, OpenHeFS partition is invalid." << kendl);
     mm_free_ptr((VoidPtr) boot);
     err_global_get() = kErrorDisk;
@@ -1023,7 +1023,7 @@ _Output Bool HeFileSystemParser::INodeManip(_Input DriveTrait* mnt, VoidPtr bloc
       if (is_input) {
         mnt->fInput(mnt->fPacket);
       } else {
-        if (start->fFlags & kHeFSFlagsReadOnly) {
+        if (start->fFlags & kOpenHeFSFlagsReadOnly) {
           mm_free_ptr((VoidPtr) boot);
           delete start;
 
@@ -1051,12 +1051,12 @@ _Output Bool HeFileSystemParser::INodeManip(_Input DriveTrait* mnt, VoidPtr bloc
 _Output Bool HeFileSystemParser::INodeCtlManip(_Input DriveTrait* mnt, _Input const Int32 flags,
                                                const Utf8Char* dir, const Utf8Char* name,
                                                const BOOL delete_or_create, const UInt8 kind) {
-  if (urt_string_len(name) > kHeFSFileNameLen) {
+  if (urt_string_len(name) > kOpenHeFSFileNameLen) {
     err_global_get() = kErrorDisk;
     return NO;
   }
 
-  if (urt_string_len(dir) > kHeFSFileNameLen) {
+  if (urt_string_len(dir) > kOpenHeFSFileNameLen) {
     err_global_get() = kErrorDisk;
     return NO;
   }
@@ -1088,12 +1088,12 @@ _Output Bool HeFileSystemParser::INodeCtlManip(_Input DriveTrait* mnt, _Input co
 
   mnt->fInput(mnt->fPacket);
 
-  if (!KStringBuilder::Equals(boot->fMagic, kHeFSMagic) || boot->fVersion != kHeFSVersion) {
+  if (!KStringBuilder::Equals(boot->fMagic, kOpenHeFSMagic) || boot->fVersion != kOpenHeFSVersion) {
     err_global_get() = kErrorDisk;
     return YES;
   }
 
-  if (KStringBuilder::Equals(dir, kHeFSSearchAllStr)) {
+  if (KStringBuilder::Equals(dir, kOpenHeFSSearchAllStr)) {
     kout << "Error: Invalid file name.\r";
 
     err_global_get() = kErrorInvalidData;
@@ -1107,7 +1107,7 @@ _Output Bool HeFileSystemParser::INodeCtlManip(_Input DriveTrait* mnt, _Input co
     }
   }
 
-  if (KStringBuilder::Equals(dir, kHeFSSearchAllStr)) {
+  if (KStringBuilder::Equals(dir, kOpenHeFSSearchAllStr)) {
     kout << "Error: Invalid directory name.\r";
 
     err_global_get() = kErrorInvalidData;
@@ -1153,7 +1153,7 @@ Boolean OpenHeFS::fs_init_openhefs(Void) noexcept {
     return YES;
   }
 
-  return HeFileSystemParser{}.Format(&kMountpoint.A(), kHeFSEncodingFlagsUTF8, kHeFSDefaultVolumeName);
+  return HeFileSystemParser{}.Format(&kMountpoint.A(), kOpenHeFSEncodingFlagsUTF8, kOpenHeFSDefaultVolumeName);
 }
 }  // namespace Kernel
 
diff --git a/dev/kernel/src/FileMgr.cc b/src/kernel/src/FileMgr.cc
index 88b17470..88b17470 100644
--- a/dev/kernel/src/FileMgr.cc
+++ b/src/kernel/src/FileMgr.cc
diff --git a/dev/kernel/src/GUIDWizard.cc b/src/kernel/src/GUIDWizard.cc
index 2d1218ed..2d1218ed 100644
--- a/dev/kernel/src/GUIDWizard.cc
+++ b/src/kernel/src/GUIDWizard.cc
diff --git a/dev/kernel/src/GUIDWrapper.cc b/src/kernel/src/GUIDWrapper.cc
index ee29f911..ee29f911 100644
--- a/dev/kernel/src/GUIDWrapper.cc
+++ b/src/kernel/src/GUIDWrapper.cc
diff --git a/dev/kernel/src/Gfx/FBDeviceInterface.cc b/src/kernel/src/Gfx/FBDeviceInterface.cc
index c5fac330..c5fac330 100644
--- a/dev/kernel/src/Gfx/FBDeviceInterface.cc
+++ b/src/kernel/src/Gfx/FBDeviceInterface.cc
diff --git a/dev/kernel/src/HardwareThreadScheduler.cc b/src/kernel/src/HardwareThreadScheduler.cc
index 41d927f6..41d927f6 100644
--- a/dev/kernel/src/HardwareThreadScheduler.cc
+++ b/src/kernel/src/HardwareThreadScheduler.cc
diff --git a/dev/kernel/src/HeapMgr.cc b/src/kernel/src/HeapMgr.cc
index 848a0377..848a0377 100644
--- a/dev/kernel/src/HeapMgr.cc
+++ b/src/kernel/src/HeapMgr.cc
diff --git a/dev/kernel/src/IDylibObject.cc b/src/kernel/src/IDylibObject.cc
index 61191af1..61191af1 100644
--- a/dev/kernel/src/IDylibObject.cc
+++ b/src/kernel/src/IDylibObject.cc
diff --git a/dev/kernel/src/IFS.cc b/src/kernel/src/IFS.cc
index 4679b8a3..4679b8a3 100644
--- a/dev/kernel/src/IFS.cc
+++ b/src/kernel/src/IFS.cc
diff --git a/dev/kernel/src/IPEFDylibObject.cc b/src/kernel/src/IPEFDylibObject.cc
index 4ba9278d..4ba9278d 100644
--- a/dev/kernel/src/IPEFDylibObject.cc
+++ b/src/kernel/src/IPEFDylibObject.cc
diff --git a/dev/kernel/src/IndexableProperty.cc b/src/kernel/src/IndexableProperty.cc
index 85207d4b..85207d4b 100644
--- a/dev/kernel/src/IndexableProperty.cc
+++ b/src/kernel/src/IndexableProperty.cc
diff --git a/dev/kernel/src/Json.cc b/src/kernel/src/Json.cc
index 198aed99..198aed99 100644
--- a/dev/kernel/src/Json.cc
+++ b/src/kernel/src/Json.cc
diff --git a/dev/kernel/src/KPC.cc b/src/kernel/src/KPC.cc
index 4318b9cd..4318b9cd 100644
--- a/dev/kernel/src/KPC.cc
+++ b/src/kernel/src/KPC.cc
diff --git a/dev/kernel/src/KernelTaskScheduler.cc b/src/kernel/src/KernelTaskScheduler.cc
index c3628765..c3628765 100644
--- a/dev/kernel/src/KernelTaskScheduler.cc
+++ b/src/kernel/src/KernelTaskScheduler.cc
diff --git a/dev/kernel/src/LockDelegate.cc b/src/kernel/src/LockDelegate.cc
index 2fe2b464..2fe2b464 100644
--- a/dev/kernel/src/LockDelegate.cc
+++ b/src/kernel/src/LockDelegate.cc
diff --git a/dev/kernel/src/MutableArray.cc b/src/kernel/src/MutableArray.cc
index 3c86e8b8..3c86e8b8 100644
--- a/dev/kernel/src/MutableArray.cc
+++ b/src/kernel/src/MutableArray.cc
diff --git a/dev/kernel/src/Network/IPAddress.cc b/src/kernel/src/Network/IPAddress.cc
index 98279979..98279979 100644
--- a/dev/kernel/src/Network/IPAddress.cc
+++ b/src/kernel/src/Network/IPAddress.cc
diff --git a/dev/kernel/src/Network/IPCAddress.cc b/src/kernel/src/Network/IPCAddress.cc
index 2da5ac0a..2da5ac0a 100644
--- a/dev/kernel/src/Network/IPCAddress.cc
+++ b/src/kernel/src/Network/IPCAddress.cc
diff --git a/dev/kernel/src/Network/IPCMessage.cc b/src/kernel/src/Network/IPCMessage.cc
index b376b7c8..b376b7c8 100644
--- a/dev/kernel/src/Network/IPCMessage.cc
+++ b/src/kernel/src/Network/IPCMessage.cc
diff --git a/dev/kernel/src/Network/MACAddressGetter.cc b/src/kernel/src/Network/MACAddressGetter.cc
index 09d82a78..09d82a78 100644
--- a/dev/kernel/src/Network/MACAddressGetter.cc
+++ b/src/kernel/src/Network/MACAddressGetter.cc
diff --git a/dev/kernel/src/Network/NetworkDevice.cc b/src/kernel/src/Network/NetworkDevice.cc
index 450c0191..450c0191 100644
--- a/dev/kernel/src/Network/NetworkDevice.cc
+++ b/src/kernel/src/Network/NetworkDevice.cc
diff --git a/dev/kernel/src/New+Delete.cc b/src/kernel/src/New+Delete.cc
index ba37e7ec..ba37e7ec 100644
--- a/dev/kernel/src/New+Delete.cc
+++ b/src/kernel/src/New+Delete.cc
diff --git a/dev/kernel/src/OwnPtr.cc b/src/kernel/src/OwnPtr.cc
index e223d448..e223d448 100644
--- a/dev/kernel/src/OwnPtr.cc
+++ b/src/kernel/src/OwnPtr.cc
diff --git a/dev/kernel/src/PE32CodeMgr.cc b/src/kernel/src/PE32CodeMgr.cc
index a8440c23..a8440c23 100644
--- a/dev/kernel/src/PE32CodeMgr.cc
+++ b/src/kernel/src/PE32CodeMgr.cc
diff --git a/dev/kernel/src/PEFCodeMgr.cc b/src/kernel/src/PEFCodeMgr.cc
index c0a79c32..c0a79c32 100644
--- a/dev/kernel/src/PEFCodeMgr.cc
+++ b/src/kernel/src/PEFCodeMgr.cc
diff --git a/dev/kernel/src/PRDT.cc b/src/kernel/src/PRDT.cc
index 626a7e16..626a7e16 100644
--- a/dev/kernel/src/PRDT.cc
+++ b/src/kernel/src/PRDT.cc
diff --git a/dev/kernel/src/PageMgr.cc b/src/kernel/src/PageMgr.cc
index 81833ee2..81833ee2 100644
--- a/dev/kernel/src/PageMgr.cc
+++ b/src/kernel/src/PageMgr.cc
diff --git a/dev/kernel/src/Pmm.cc b/src/kernel/src/Pmm.cc
index 84086929..84086929 100644
--- a/dev/kernel/src/Pmm.cc
+++ b/src/kernel/src/Pmm.cc
diff --git a/dev/kernel/src/Property.cc b/src/kernel/src/Property.cc
index 8b7454fe..8b7454fe 100644
--- a/dev/kernel/src/Property.cc
+++ b/src/kernel/src/Property.cc
diff --git a/dev/kernel/src/Ref.cc b/src/kernel/src/Ref.cc
index 90b1c22d..90b1c22d 100644
--- a/dev/kernel/src/Ref.cc
+++ b/src/kernel/src/Ref.cc
diff --git a/dev/kernel/src/Semaphore.cc b/src/kernel/src/Semaphore.cc
index 484c89ca..484c89ca 100644
--- a/dev/kernel/src/Semaphore.cc
+++ b/src/kernel/src/Semaphore.cc
diff --git a/dev/kernel/src/SoftwareTimer.cc b/src/kernel/src/SoftwareTimer.cc
index eafe8db6..eafe8db6 100644
--- a/dev/kernel/src/SoftwareTimer.cc
+++ b/src/kernel/src/SoftwareTimer.cc
diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/src/kernel/src/Storage/AHCIDeviceInterface.cc
index 02b39fb5..02b39fb5 100644
--- a/dev/kernel/src/Storage/AHCIDeviceInterface.cc
+++ b/src/kernel/src/Storage/AHCIDeviceInterface.cc
diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/src/kernel/src/Storage/ATADeviceInterface.cc
index 8e15fdea..8e15fdea 100644
--- a/dev/kernel/src/Storage/ATADeviceInterface.cc
+++ b/src/kernel/src/Storage/ATADeviceInterface.cc
diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/src/kernel/src/Storage/NVMEDeviceInterface.cc
index f05d384e..f05d384e 100644
--- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc
+++ b/src/kernel/src/Storage/NVMEDeviceInterface.cc
diff --git a/dev/kernel/src/Storage/SCSIDeviceInterface.cc b/src/kernel/src/Storage/SCSIDeviceInterface.cc
index 2e331ae9..2e331ae9 100644
--- a/dev/kernel/src/Storage/SCSIDeviceInterface.cc
+++ b/src/kernel/src/Storage/SCSIDeviceInterface.cc
diff --git a/dev/kernel/src/Stream.cc b/src/kernel/src/Stream.cc
index 8572e222..8572e222 100644
--- a/dev/kernel/src/Stream.cc
+++ b/src/kernel/src/Stream.cc
diff --git a/dev/kernel/src/Swap/DiskSwap.cc b/src/kernel/src/Swap/DiskSwap.cc
index f0fa5915..f0fa5915 100644
--- a/dev/kernel/src/Swap/DiskSwap.cc
+++ b/src/kernel/src/Swap/DiskSwap.cc
diff --git a/dev/kernel/src/ThreadLocalStorage.cc b/src/kernel/src/ThreadLocalStorage.cc
index fa445d84..fa445d84 100644
--- a/dev/kernel/src/ThreadLocalStorage.cc
+++ b/src/kernel/src/ThreadLocalStorage.cc
diff --git a/dev/kernel/src/Timer.cc b/src/kernel/src/Timer.cc
index 648cc92b..648cc92b 100644
--- a/dev/kernel/src/Timer.cc
+++ b/src/kernel/src/Timer.cc
diff --git a/dev/kernel/src/UserMgr.cc b/src/kernel/src/UserMgr.cc
index 103e8ec9..103e8ec9 100644
--- a/dev/kernel/src/UserMgr.cc
+++ b/src/kernel/src/UserMgr.cc
diff --git a/dev/kernel/src/UserProcessScheduler.cc b/src/kernel/src/UserProcessScheduler.cc
index 264bddf3..264bddf3 100644
--- a/dev/kernel/src/UserProcessScheduler.cc
+++ b/src/kernel/src/UserProcessScheduler.cc
diff --git a/dev/kernel/src/UserProcessTeam.cc b/src/kernel/src/UserProcessTeam.cc
index e5b7a7eb..e5b7a7eb 100644
--- a/dev/kernel/src/UserProcessTeam.cc
+++ b/src/kernel/src/UserProcessTeam.cc
diff --git a/dev/kernel/src/UtfUtils.cc b/src/kernel/src/UtfUtils.cc
index 47ac2729..47ac2729 100644
--- a/dev/kernel/src/UtfUtils.cc
+++ b/src/kernel/src/UtfUtils.cc
diff --git a/dev/kernel/src/Variant.cc b/src/kernel/src/Variant.cc
index fcf2f443..fcf2f443 100644
--- a/dev/kernel/src/Variant.cc
+++ b/src/kernel/src/Variant.cc
diff --git a/dev/kernel/src/ZXD.cc b/src/kernel/src/ZXD.cc
index 1baa18f3..1baa18f3 100644
--- a/dev/kernel/src/ZXD.cc
+++ b/src/kernel/src/ZXD.cc
diff --git a/dev/launch/.keep b/src/launch/.keep
index e69de29b..e69de29b 100644
--- a/dev/launch/.keep
+++ b/src/launch/.keep
diff --git a/dev/launch/LaunchKit/Foundation.h b/src/launch/LaunchKit/Foundation.h
index d7eb901f..d7eb901f 100644
--- a/dev/launch/LaunchKit/Foundation.h
+++ b/src/launch/LaunchKit/Foundation.h
diff --git a/dev/launch/launch.json b/src/launch/launch.json
index dbc111b2..dbc111b2 100644
--- a/dev/launch/launch.json
+++ b/src/launch/launch.json
diff --git a/dev/launch/obj/.keep b/src/launch/obj/.keep
index e69de29b..e69de29b 100644
--- a/dev/launch/obj/.keep
+++ b/src/launch/obj/.keep
diff --git a/dev/launch/src/.keep b/src/launch/src/.keep
index e69de29b..e69de29b 100644
--- a/dev/launch/src/.keep
+++ b/src/launch/src/.keep
diff --git a/dev/launch/src/AppMain.cc b/src/launch/src/AppMain.cc
index 10e9ff2b..10e9ff2b 100644
--- a/dev/launch/src/AppMain.cc
+++ b/src/launch/src/AppMain.cc
diff --git a/dev/launch/src/CRuntimeZero.S b/src/launch/src/CRuntimeZero.S
index 4f983b46..4f983b46 100644
--- a/dev/launch/src/CRuntimeZero.S
+++ b/src/launch/src/CRuntimeZero.S
diff --git a/dev/libDDK/DriverKit/ddk.h b/src/libDDK/DriverKit/ddk.h
index 45f7d356..45f7d356 100644
--- a/dev/libDDK/DriverKit/ddk.h
+++ b/src/libDDK/DriverKit/ddk.h
diff --git a/dev/libDDK/DriverKit/dev.h b/src/libDDK/DriverKit/dev.h
index a88a00dd..a88a00dd 100644
--- a/dev/libDDK/DriverKit/dev.h
+++ b/src/libDDK/DriverKit/dev.h
diff --git a/dev/libDDK/DriverKit/dki/contract.h b/src/libDDK/DriverKit/dki/contract.h
index 81b16e48..7361d792 100644
--- a/dev/libDDK/DriverKit/dki/contract.h
+++ b/src/libDDK/DriverKit/dki/contract.h
@@ -12,7 +12,7 @@
 #include <CompilerKit/CompilerKit.h>
 #include <libDDK/DriverKit/macros.h>
 
-#define DKI_CONTRACT_IMPL : public ::Kernel::DKIContract
+#define DKI_CONTRACT_IMPL final : public ::Kernel::DKI::DKIContract
 
 /// @author Amlal El Mahrouss
 
@@ -24,8 +24,10 @@ class DKIContract {
 
   NE_COPY_DEFAULT(DKIContract);
 
-  virtual BOOL    IsCastable() { return false; }
-  virtual BOOL    IsActive() { return false; }
+  using PtrType = VoidPtr;
+
+  virtual BOOL    IsCastable() { return NO; }
+  virtual BOOL    IsActive() { return NO; }
   virtual VoidPtr Leak() { return nullptr; }
   virtual Int32   Type() { return 0; }
 };
diff --git a/dev/libDDK/DriverKit/io.h b/src/libDDK/DriverKit/io.h
index 58b625ac..58b625ac 100644
--- a/dev/libDDK/DriverKit/io.h
+++ b/src/libDDK/DriverKit/io.h
diff --git a/dev/libDDK/DriverKit/macros.h b/src/libDDK/DriverKit/macros.h
index 7fd1403b..7fd1403b 100644
--- a/dev/libDDK/DriverKit/macros.h
+++ b/src/libDDK/DriverKit/macros.h
diff --git a/dev/libDDK/DriverKit/net.h b/src/libDDK/DriverKit/net.h
index 5dfe6374..5dfe6374 100644
--- a/dev/libDDK/DriverKit/net.h
+++ b/src/libDDK/DriverKit/net.h
diff --git a/dev/libDDK/DriverKit/str.h b/src/libDDK/DriverKit/str.h
index 6409b1a7..6409b1a7 100644
--- a/dev/libDDK/DriverKit/str.h
+++ b/src/libDDK/DriverKit/str.h
diff --git a/dev/libDDK/docs/SPECIFICATION_DDK.md b/src/libDDK/docs/SPECIFICATION_DDK.md
index d59b6e77..d59b6e77 100644
--- a/dev/libDDK/docs/SPECIFICATION_DDK.md
+++ b/src/libDDK/docs/SPECIFICATION_DDK.md
diff --git a/dev/libDDK/libDDK.json b/src/libDDK/libDDK.json
index 113dd585..113dd585 100644
--- a/dev/libDDK/libDDK.json
+++ b/src/libDDK/libDDK.json
diff --git a/dev/libDDK/obj/.gitkeep b/src/libDDK/obj/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/libDDK/obj/.gitkeep
+++ b/src/libDDK/obj/.gitkeep
diff --git a/dev/libDDK/src/ddk_abi_cxx.cc b/src/libDDK/src/ddk_abi_cxx.cc
index 196f7f6a..196f7f6a 100644
--- a/dev/libDDK/src/ddk_abi_cxx.cc
+++ b/src/libDDK/src/ddk_abi_cxx.cc
diff --git a/dev/libDDK/src/ddk_alloc.c b/src/libDDK/src/ddk_alloc.c
index 09f3034f..09f3034f 100644
--- a/dev/libDDK/src/ddk_alloc.c
+++ b/src/libDDK/src/ddk_alloc.c
diff --git a/dev/libDDK/src/ddk_dev.c b/src/libDDK/src/ddk_dev.c
index 64ecefb6..64ecefb6 100644
--- a/dev/libDDK/src/ddk_dev.c
+++ b/src/libDDK/src/ddk_dev.c
diff --git a/dev/libDDK/src/ddk_io.c b/src/libDDK/src/ddk_io.c
index 07287b91..07287b91 100644
--- a/dev/libDDK/src/ddk_io.c
+++ b/src/libDDK/src/ddk_io.c
diff --git a/dev/libDDK/src/ddk_kernel_call.c b/src/libDDK/src/ddk_kernel_call.c
index 92662ea5..92652969 100644
--- a/dev/libDDK/src/ddk_kernel_call.c
+++ b/src/libDDK/src/ddk_kernel_call.c
@@ -14,6 +14,7 @@
 /// @brief this is an internal call, do not use it.
 DDK_EXTERN ATTRIBUTE(naked) ptr_t
     __ke_call_dispatch(const int32_t name, int32_t cnt, void* data, size_t sz);
+
 /// @brief This function hashes the path into a FNV symbol.
 /// @param path the path to hash.
 /// @retval 0 symbol wasn't hashed.
diff --git a/dev/libDDK/src/ddk_kernel_call_dispatch.S b/src/libDDK/src/ddk_kernel_call_dispatch.S
index a607fe40..a607fe40 100644
--- a/dev/libDDK/src/ddk_kernel_call_dispatch.S
+++ b/src/libDDK/src/ddk_kernel_call_dispatch.S
diff --git a/dev/libDDK/src/ddk_str.c b/src/libDDK/src/ddk_str.c
index 3021f84a..3021f84a 100644
--- a/dev/libDDK/src/ddk_str.c
+++ b/src/libDDK/src/ddk_str.c
diff --git a/dev/libDDK/src/ddk_ver.c b/src/libDDK/src/ddk_ver.c
index 3679bdef..3679bdef 100644
--- a/dev/libDDK/src/ddk_ver.c
+++ b/src/libDDK/src/ddk_ver.c
diff --git a/dev/libMsg/.keep b/src/libMsg/.keep
index e69de29b..e69de29b 100644
--- a/dev/libMsg/.keep
+++ b/src/libMsg/.keep
diff --git a/dev/libMsg/MsgKit/Network.h b/src/libMsg/MsgKit/Network.h
index ca7cf2d3..ca7cf2d3 100644
--- a/dev/libMsg/MsgKit/Network.h
+++ b/src/libMsg/MsgKit/Network.h
diff --git a/dev/libMsg/MsgKit/Server.h b/src/libMsg/MsgKit/Server.h
index b75fb96a..b75fb96a 100644
--- a/dev/libMsg/MsgKit/Server.h
+++ b/src/libMsg/MsgKit/Server.h
diff --git a/dev/libMsg/obj/.keep b/src/libMsg/obj/.keep
index e69de29b..e69de29b 100644
--- a/dev/libMsg/obj/.keep
+++ b/src/libMsg/obj/.keep
diff --git a/dev/libMsg/script/window_client.json b/src/libMsg/script/window_client.json
index 4c8a21ba..4c8a21ba 100644
--- a/dev/libMsg/script/window_client.json
+++ b/src/libMsg/script/window_client.json
diff --git a/dev/libMsg/src/.keep b/src/libMsg/src/.keep
index e69de29b..e69de29b 100644
--- a/dev/libMsg/src/.keep
+++ b/src/libMsg/src/.keep
diff --git a/dev/libSystem/SystemKit/Err.h b/src/libSystem/SystemKit/Err.h
index ea36abde..ea36abde 100644
--- a/dev/libSystem/SystemKit/Err.h
+++ b/src/libSystem/SystemKit/Err.h
diff --git a/dev/libSystem/SystemKit/Jail.h b/src/libSystem/SystemKit/Jail.h
index f28968b4..f28968b4 100644
--- a/dev/libSystem/SystemKit/Jail.h
+++ b/src/libSystem/SystemKit/Jail.h
diff --git a/dev/libSystem/SystemKit/Macros.h b/src/libSystem/SystemKit/Macros.h
index aac2bf1b..aac2bf1b 100644
--- a/dev/libSystem/SystemKit/Macros.h
+++ b/src/libSystem/SystemKit/Macros.h
diff --git a/dev/libSystem/SystemKit/Syscall.h b/src/libSystem/SystemKit/Syscall.h
index 58d7d7f1..58d7d7f1 100644
--- a/dev/libSystem/SystemKit/Syscall.h
+++ b/src/libSystem/SystemKit/Syscall.h
diff --git a/dev/libSystem/SystemKit/System.h b/src/libSystem/SystemKit/System.h
index 544b7ee3..544b7ee3 100644
--- a/dev/libSystem/SystemKit/System.h
+++ b/src/libSystem/SystemKit/System.h
diff --git a/dev/libSystem/SystemKit/Verify.h b/src/libSystem/SystemKit/Verify.h
index 7d15435a..7d15435a 100644
--- a/dev/libSystem/SystemKit/Verify.h
+++ b/src/libSystem/SystemKit/Verify.h
diff --git a/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md b/src/libSystem/docs/SPECIFICATION_SYSCALLS.md
index 89f61498..89f61498 100644
--- a/dev/libSystem/docs/SPECIFICATION_SYSCALLS.md
+++ b/src/libSystem/docs/SPECIFICATION_SYSCALLS.md
diff --git a/dev/libSystem/libSystem.json b/src/libSystem/libSystem.json
index 9df1b8f0..9df1b8f0 100644
--- a/dev/libSystem/libSystem.json
+++ b/src/libSystem/libSystem.json
diff --git a/dev/libSystem/obj/.keep b/src/libSystem/obj/.keep
index e69de29b..e69de29b 100644
--- a/dev/libSystem/obj/.keep
+++ b/src/libSystem/obj/.keep
diff --git a/dev/libSystem/src/JailCalls.cc b/src/libSystem/src/JailCalls.cc
index f7ca5bec..f7ca5bec 100644
--- a/dev/libSystem/src/JailCalls.cc
+++ b/src/libSystem/src/JailCalls.cc
diff --git a/dev/libSystem/src/Makefile b/src/libSystem/src/Makefile
index 622223b4..622223b4 100644
--- a/dev/libSystem/src/Makefile
+++ b/src/libSystem/src/Makefile
diff --git a/dev/libSystem/src/SystemCalls.cc b/src/libSystem/src/SystemCalls.cc
index 7409c9b7..7409c9b7 100644
--- a/dev/libSystem/src/SystemCalls.cc
+++ b/src/libSystem/src/SystemCalls.cc
diff --git a/dev/libSystem/src/SystemCallsABI+AMD64.asm b/src/libSystem/src/SystemCallsABI+AMD64.asm
index dd8fc9e8..dd8fc9e8 100644
--- a/dev/libSystem/src/SystemCallsABI+AMD64.asm
+++ b/src/libSystem/src/SystemCallsABI+AMD64.asm
diff --git a/dev/libSystem/src/Utils.cc b/src/libSystem/src/Utils.cc
index 9d0920e0..9d0920e0 100644
--- a/dev/libSystem/src/Utils.cc
+++ b/src/libSystem/src/Utils.cc
diff --git a/dev/libSystem/src/VerifyCalls.cc b/src/libSystem/src/VerifyCalls.cc
index 1c00612f..1c00612f 100644
--- a/dev/libSystem/src/VerifyCalls.cc
+++ b/src/libSystem/src/VerifyCalls.cc
diff --git a/dev/misc/.keep b/src/misc/.keep
index e69de29b..e69de29b 100644
--- a/dev/misc/.keep
+++ b/src/misc/.keep
diff --git a/dev/misc/BenchKit/Chronometer.h b/src/misc/BenchKit/Chronometer.h
index 8a1fa3ab..8a1fa3ab 100644
--- a/dev/misc/BenchKit/Chronometer.h
+++ b/src/misc/BenchKit/Chronometer.h
diff --git a/dev/misc/BenchKit/HWChronometer.h b/src/misc/BenchKit/HWChronometer.h
index 331f9a7d..331f9a7d 100644
--- a/dev/misc/BenchKit/HWChronometer.h
+++ b/src/misc/BenchKit/HWChronometer.h
diff --git a/dev/modules/ACPI/ACPI.h b/src/modules/ACPI/ACPI.h
index b5bf3b69..b5bf3b69 100644
--- a/dev/modules/ACPI/ACPI.h
+++ b/src/modules/ACPI/ACPI.h
diff --git a/dev/modules/ACPI/ACPIFactoryInterface.h b/src/modules/ACPI/ACPIFactoryInterface.h
index da91a62e..da91a62e 100644
--- a/dev/modules/ACPI/ACPIFactoryInterface.h
+++ b/src/modules/ACPI/ACPIFactoryInterface.h
diff --git a/dev/modules/AHCI/AHCI.h b/src/modules/AHCI/AHCI.h
index 3c6fecc5..3c6fecc5 100644
--- a/dev/modules/AHCI/AHCI.h
+++ b/src/modules/AHCI/AHCI.h
diff --git a/dev/modules/APM/APM.h b/src/modules/APM/APM.h
index d9b0621e..d9b0621e 100644
--- a/dev/modules/APM/APM.h
+++ b/src/modules/APM/APM.h
diff --git a/dev/modules/ATA/ATA.h b/src/modules/ATA/ATA.h
index a1213b40..a1213b40 100644
--- a/dev/modules/ATA/ATA.h
+++ b/src/modules/ATA/ATA.h
diff --git a/dev/modules/CoreGfx/CoreAccess.h b/src/modules/CoreGfx/CoreAccess.h
index 942a1ad5..942a1ad5 100644
--- a/dev/modules/CoreGfx/CoreAccess.h
+++ b/src/modules/CoreGfx/CoreAccess.h
diff --git a/dev/modules/CoreGfx/CoreGfx.h b/src/modules/CoreGfx/CoreGfx.h
index e1bfe462..e1bfe462 100644
--- a/dev/modules/CoreGfx/CoreGfx.h
+++ b/src/modules/CoreGfx/CoreGfx.h
diff --git a/dev/modules/CoreGfx/MathGfx.h b/src/modules/CoreGfx/MathGfx.h
index dbd732d3..dbd732d3 100644
--- a/dev/modules/CoreGfx/MathGfx.h
+++ b/src/modules/CoreGfx/MathGfx.h
diff --git a/dev/modules/CoreGfx/TextGfx.h b/src/modules/CoreGfx/TextGfx.h
index b5dcd9e5..b5dcd9e5 100644
--- a/dev/modules/CoreGfx/TextGfx.h
+++ b/src/modules/CoreGfx/TextGfx.h
diff --git a/dev/modules/GPRS/.keep b/src/modules/GPRS/.keep
index e69de29b..e69de29b 100644
--- a/dev/modules/GPRS/.keep
+++ b/src/modules/GPRS/.keep
diff --git a/dev/modules/HPET/Defines.h b/src/modules/HPET/Defines.h
index 56968a24..56968a24 100644
--- a/dev/modules/HPET/Defines.h
+++ b/src/modules/HPET/Defines.h
diff --git a/dev/modules/IEEE802/.gitkeep b/src/modules/IEEE802/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/modules/IEEE802/.gitkeep
+++ b/src/modules/IEEE802/.gitkeep
diff --git a/dev/modules/LTE/LTE.h b/src/modules/LTE/LTE.h
index 7cee2c8d..7cee2c8d 100644
--- a/dev/modules/LTE/LTE.h
+++ b/src/modules/LTE/LTE.h
diff --git a/dev/modules/MBCI/MBCI.h b/src/modules/MBCI/MBCI.h
index a96f8f3a..a96f8f3a 100644
--- a/dev/modules/MBCI/MBCI.h
+++ b/src/modules/MBCI/MBCI.h
diff --git a/dev/modules/NVME/NVME.h b/src/modules/NVME/NVME.h
index 9ad8a3ce..9ad8a3ce 100644
--- a/dev/modules/NVME/NVME.h
+++ b/src/modules/NVME/NVME.h
diff --git a/dev/modules/OHCI/.gitkeep b/src/modules/OHCI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/modules/OHCI/.gitkeep
+++ b/src/modules/OHCI/.gitkeep
diff --git a/dev/modules/Power/PowerFactory.h b/src/modules/Power/PowerFactory.h
index 2e349011..2e349011 100644
--- a/dev/modules/Power/PowerFactory.h
+++ b/src/modules/Power/PowerFactory.h
diff --git a/dev/modules/SCSI/.gitkeep b/src/modules/SCSI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/modules/SCSI/.gitkeep
+++ b/src/modules/SCSI/.gitkeep
diff --git a/dev/modules/SCSI/SCSI.h b/src/modules/SCSI/SCSI.h
index e0bc2517..e0bc2517 100644
--- a/dev/modules/SCSI/SCSI.h
+++ b/src/modules/SCSI/SCSI.h
diff --git a/dev/modules/WiFi/.gitkeep b/src/modules/WiFi/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/modules/WiFi/.gitkeep
+++ b/src/modules/WiFi/.gitkeep
diff --git a/dev/modules/XHCI/XHCI.h b/src/modules/XHCI/XHCI.h
index 40387c1e..40387c1e 100644
--- a/dev/modules/XHCI/XHCI.h
+++ b/src/modules/XHCI/XHCI.h
diff --git a/tools/chk.hefs.cc b/tools/chk.hefs.cc
index cb6bd0d6..41c04b0f 100644
--- a/tools/chk.hefs.cc
+++ b/tools/chk.hefs.cc
@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
 
   output_device.read(reinterpret_cast<char*>(&boot_node), sizeof(boot_node));
 
-  if (strncmp(boot_node.magic, kHeFSMagic, kHeFSMagicLen) != 0 || boot_node.sectorCount < 1 ||
+  if (strncmp(boot_node.magic, kOpenHeFSMagic, kOpenHeFSMagicLen) != 0 || boot_node.sectorCount < 1 ||
       boot_node.sectorSize < kMkFsSectorSz) {
     mkfs::console_out() << "hefs: error: Device is not an OpenHeFS disk: " << opt_disk << "\n";
     return EXIT_FAILURE;
diff --git a/tools/chk.hefs.json b/tools/chk.hefs.json
index 58918613..649c5e7f 100644
--- a/tools/chk.hefs.json
+++ b/tools/chk.hefs.json
@@ -9,8 +9,8 @@
     ],
     "output_name": "./dist/chk.hefs",
     "cpp_macros": [
-        "kFsckHeFSVersion=0x0100",
-        "kFsckHeFSVersionHighest=0x0100",
-        "kFsckHeFSVersionLowest=0x0100"
+        "kFsckOpenHeFSVersion=0x0100",
+        "kFsckOpenHeFSVersionHighest=0x0100",
+        "kFsckOpenHeFSVersionLowest=0x0100"
     ]
 }
\ No newline at end of file
diff --git a/tools/libmkfs/openhefs.h b/tools/libmkfs/openhefs.h
index 36d300f3..fcfd9d23 100644
--- a/tools/libmkfs/openhefs.h
+++ b/tools/libmkfs/openhefs.h
@@ -9,90 +9,90 @@
 #include <cstdint>
 #include <cstring>
 
-#define kHeFSVersion (0x0101)
-#define kHeFSMagic "OpenHeFS"
-#define kHeFSMagicLen (9U)
+#define kOpenHeFSVersion (0x0101)
+#define kOpenHeFSMagic "OpenHeFS"
+#define kOpenHeFSMagicLen (9U)
 
-#define kHeFSFileNameLen (256U)
-#define kHeFSPartNameLen (128U)
+#define kOpenHeFSFileNameLen (256U)
+#define kOpenHeFSPartNameLen (128U)
 
-#define kHeFSDefaultVolumeName u8"OpenHeFS Volume"
+#define kOpenHeFSDefaultVolumeName u8"OpenHeFS Volume"
 
 namespace mkfs::hefs {
 
 // Drive kinds
 enum {
-  kHeFSHardDrive         = 0xC0,  // Hard Drive
-  kHeFSSolidStateDrive   = 0xC1,  // Solid State Drive
-  kHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD
-  kHeFSMassStorageDevice = 0xCC,  // USB
-  kHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive
-  kHeFSFlashDrive        = 0xC6,
-  kHeFSUnknown           = 0xFF,  // Unknown device.
-  kHeFSDriveCount        = 8,
+  kOpenHeFSHardDrive         = 0xC0,  // Hard Drive
+  kOpenHeFSSolidStateDrive   = 0xC1,  // Solid State Drive
+  kOpenHeFSOpticalDrive      = 0x0C,  // Blu-Ray/DVD
+  kOpenHeFSMassStorageDevice = 0xCC,  // USB
+  kOpenHeFSScsiDrive         = 0xC4,  // SCSI Hard Drive
+  kOpenHeFSFlashDrive        = 0xC6,
+  kOpenHeFSUnknown           = 0xFF,  // Unknown device.
+  kOpenHeFSDriveCount        = 8,
 };
 
 // Disk status
 enum {
-  kHeFSStatusUnlocked = 0x18,
-  kHeFSStatusLocked,
-  kHeFSStatusError,
-  kHeFSStatusInvalid,
-  kHeFSStatusCount,
+  kOpenHeFSStatusUnlocked = 0x18,
+  kOpenHeFSStatusLocked,
+  kOpenHeFSStatusError,
+  kOpenHeFSStatusInvalid,
+  kOpenHeFSStatusCount,
 };
 
 // Encodings
 enum {
-  kHeFSEncodingFlagsUTF8 = 0x50,
-  kHeFSEncodingFlagsUTF16,
-  kHeFSEncodingFlagsUTF32,
-  kHeFSEncodingFlagsUTF16BE,
-  kHeFSEncodingFlagsUTF16LE,
-  kHeFSEncodingFlagsUTF32BE,
-  kHeFSEncodingFlagsUTF32LE,
-  kHeFSEncodingFlagsUTF8BE,
-  kHeFSEncodingFlagsUTF8LE,
-  kHeFSEncodingFlagsBinary,
-  kHeFSEncodingFlagsCount = 11,
-  kHeFSFlagsNone          = 0,
-  kHeFSFlagsReadOnly      = 0x100,
-  kHeFSFlagsHidden,
-  kHeFSFlagsSystem,
-  kHeFSFlagsArchive,
-  kHeFSFlagsDevice,
-  kHeFSFlagsCount = 7
+  kOpenHeFSEncodingFlagsUTF8 = 0x50,
+  kOpenHeFSEncodingFlagsUTF16,
+  kOpenHeFSEncodingFlagsUTF32,
+  kOpenHeFSEncodingFlagsUTF16BE,
+  kOpenHeFSEncodingFlagsUTF16LE,
+  kOpenHeFSEncodingFlagsUTF32BE,
+  kOpenHeFSEncodingFlagsUTF32LE,
+  kOpenHeFSEncodingFlagsUTF8BE,
+  kOpenHeFSEncodingFlagsUTF8LE,
+  kOpenHeFSEncodingFlagsBinary,
+  kOpenHeFSEncodingFlagsCount = 11,
+  kOpenHeFSFlagsNone          = 0,
+  kOpenHeFSFlagsReadOnly      = 0x100,
+  kOpenHeFSFlagsHidden,
+  kOpenHeFSFlagsSystem,
+  kOpenHeFSFlagsArchive,
+  kOpenHeFSFlagsDevice,
+  kOpenHeFSFlagsCount = 7
 };
 
 // Time type
 using ATime = std::uint64_t;
 
 // File kinds
-inline constexpr uint16_t kHeFSFileKindRegular      = 0x00;
-inline constexpr uint16_t kHeFSFileKindDirectory    = 0x01;
-inline constexpr uint16_t kHeFSFileKindBlock        = 0x02;
-inline constexpr uint16_t kHeFSFileKindCharacter    = 0x03;
-inline constexpr uint16_t kHeFSFileKindFIFO         = 0x04;
-inline constexpr uint16_t kHeFSFileKindSocket       = 0x05;
-inline constexpr uint16_t kHeFSFileKindSymbolicLink = 0x06;
-inline constexpr uint16_t kHeFSFileKindUnknown      = 0x07;
-inline constexpr uint16_t kHeFSFileKindCount        = 0x08;
+inline constexpr uint16_t kOpenHeFSFileKindRegular      = 0x00;
+inline constexpr uint16_t kOpenHeFSFileKindDirectory    = 0x01;
+inline constexpr uint16_t kOpenHeFSFileKindBlock        = 0x02;
+inline constexpr uint16_t kOpenHeFSFileKindCharacter    = 0x03;
+inline constexpr uint16_t kOpenHeFSFileKindFIFO         = 0x04;
+inline constexpr uint16_t kOpenHeFSFileKindSocket       = 0x05;
+inline constexpr uint16_t kOpenHeFSFileKindSymbolicLink = 0x06;
+inline constexpr uint16_t kOpenHeFSFileKindUnknown      = 0x07;
+inline constexpr uint16_t kOpenHeFSFileKindCount        = 0x08;
 
 // Red-black tree colors
 enum {
-  kHeFSInvalidColor = 0,
-  kHeFSRed          = 100,
-  kHeFSBlack,
-  kHeFSColorCount,
+  kOpenHeFSInvalidColor = 0,
+  kOpenHeFSRed          = 100,
+  kOpenHeFSBlack,
+  kOpenHeFSColorCount,
 };
 
 // Time constants
-inline constexpr ATime kHeFSTimeInvalid = 0x0000000000000000;
-inline constexpr ATime kHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;
+inline constexpr ATime kOpenHeFSTimeInvalid = 0x0000000000000000;
+inline constexpr ATime kOpenHeFSTimeMax     = 0xFFFFFFFFFFFFFFFF - 1;
 
 // Boot Node
 struct __attribute__((packed)) BootNode {
-  char          magic[kHeFSMagicLen]{};
-  char8_t       volumeName[kHeFSPartNameLen]{};
+  char          magic[kOpenHeFSMagicLen]{};
+  char8_t       volumeName[kOpenHeFSPartNameLen]{};
   std::uint32_t version{};
   std::uint64_t badSectors{};
   std::uint64_t sectorCount{};
diff --git a/tools/mk_app.py b/tools/mk_app.py
index 7f7cef17..90aa2df5 100755
--- a/tools/mk_app.py
+++ b/tools/mk_app.py
@@ -46,7 +46,7 @@ def create_directory_structure(base_path, project_name):
     manifest = {
         "compiler_path": "clang++",
         "compiler_std": "c++20",
-        "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"],
+        "headers_path": ["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/", "./"],
         "sources_path": [
             
         ],
diff --git a/tools/mk_fwrk.py b/tools/mk_fwrk.py
index b2ef99ff..d47e4609 100755
--- a/tools/mk_fwrk.py
+++ b/tools/mk_fwrk.py
@@ -52,7 +52,7 @@ def create_directory_structure(base_path_fwrk, project_file_name, project_name):
     manifest = {
         "compiler_path": "clang++",
         "compiler_std": "c++20",
-        "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"],
+        "headers_path": ["./", "../../../src/kernel", "../../../public/frameworks/", "../../../src/", "./"],
         "sources_path": [
 
         ],
diff --git a/tools/mkfs.hefs.cc b/tools/mkfs.hefs.cc
index 1324735d..507d9bab 100644
--- a/tools/mkfs.hefs.cc
+++ b/tools/mkfs.hefs.cc
@@ -12,7 +12,7 @@
 #include <fstream>
 #include <limits>
 
-static uint16_t kVersion       = kHeFSVersion;
+static uint16_t kVersion       = kOpenHeFSVersion;
 static uint16_t kNumericalBase = 10;
 
 static size_t        kDiskSize = mkfs::detail::gib_cast(4UL);
@@ -58,8 +58,8 @@ int main(int argc, char** argv) {
     for (char c : opt_L) kDiskLabel.push_back(static_cast<char8_t>(c));
   } else {
     kDiskLabel.clear();
-    for (size_t i = 0; i < kHeFSPartNameLen && kHeFSDefaultVolumeName[i] != u'\0'; ++i) {
-      kDiskLabel.push_back(static_cast<char8_t>(kHeFSDefaultVolumeName[i]));
+    for (size_t i = 0; i < kOpenHeFSPartNameLen && kOpenHeFSDefaultVolumeName[i] != u'\0'; ++i) {
+      kDiskLabel.push_back(static_cast<char8_t>(kOpenHeFSDefaultVolumeName[i]));
     }
   }
 
@@ -135,8 +135,8 @@ int main(int argc, char** argv) {
   std::memset(&boot_node, 0, sizeof(boot_node));
 
   boot_node.version     = kVersion;
-  boot_node.diskKind    = mkfs::hefs::kHeFSHardDrive;
-  boot_node.encoding    = mkfs::hefs::kHeFSEncodingFlagsUTF8;
+  boot_node.diskKind    = mkfs::hefs::kOpenHeFSHardDrive;
+  boot_node.encoding    = mkfs::hefs::kOpenHeFSEncodingFlagsUTF8;
   boot_node.diskSize    = kDiskSize;
   boot_node.sectorSize  = kDiskSectorSz;
   boot_node.sectorCount = kDiskSize / kDiskSectorSz;
@@ -147,18 +147,18 @@ int main(int argc, char** argv) {
   boot_node.startBlock  = static_cast<size_t>(start_block);
   boot_node.endBlock    = static_cast<size_t>(end_block);
   boot_node.indCount    = 0UL;
-  boot_node.diskStatus  = mkfs::hefs::kHeFSStatusUnlocked;
+  boot_node.diskStatus  = mkfs::hefs::kOpenHeFSStatusUnlocked;
 
-  static_assert(sizeof(boot_node.magic) >= kHeFSMagicLen,
-                "BootNode::magic too small to hold kHeFSMagicLen");
+  static_assert(sizeof(boot_node.magic) >= kOpenHeFSMagicLen,
+                "BootNode::magic too small to hold kOpenHeFSMagicLen");
 
   std::memset(boot_node.magic, 0, sizeof(boot_node.magic));
   size_t magic_copy =
-      (sizeof(boot_node.magic) < kHeFSMagicLen - 1) ? sizeof(boot_node.magic) : (kHeFSMagicLen - 1);
-  std::memcpy(boot_node.magic, kHeFSMagic, magic_copy);
+      (sizeof(boot_node.magic) < kOpenHeFSMagicLen - 1) ? sizeof(boot_node.magic) : (kOpenHeFSMagicLen - 1);
+  std::memcpy(boot_node.magic, kOpenHeFSMagic, magic_copy);
   boot_node.magic[magic_copy] = 0;
 
-  constexpr size_t vol_slots = kHeFSPartNameLen;
+  constexpr size_t vol_slots = kOpenHeFSPartNameLen;
 
   std::memset(boot_node.volumeName, 0, sizeof(boot_node.volumeName));