Merge branch 'dev' of github.com:nekernel-org/necti into dev

79 files changed, 27 insertions, 27 deletions

diff --git a/CODEOWNERS b/CODEOWNERS
index f728d8b..b3c1711 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,7 @@
 # CompilerKit is managed by Amlal, this can be owned by someone else though.

 

-/dev/CompilerKit/ @amlel-el-mahrouss

-/dev/LibC++/ @amlel-el-mahrouss

-/dev/DebuggerKit @amlel-el-mahrouss

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

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

+/src/DebuggerKit @amlel-el-mahrouss

 

 # LibC++, and DebuggerKit needs ownership.

diff --git a/compile_flags.txt b/compile_flags.txt
index 2583106..b40bbf0 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -1,8 +1,8 @@
 -std=c++20
--Idev/
--Idev/src/
--Idev/CompilerKit/Detail
--Isdk/
+-Isrc/
+-Isrc/src/
+-Isrc/CompilerKit/Detail
+-Ivendor/
 -I./
 -DCK_USE_STRUCTS
 -xc++
diff --git a/docs/md/SPECIFICATION_CC.md b/docs/md/SPECIFICATION_COMPILERKIT.md
index 681cfde..681cfde 100644
--- a/docs/md/SPECIFICATION_CC.md
+++ b/docs/md/SPECIFICATION_COMPILERKIT.md
diff --git a/dev/.keep b/src/.keep
index e69de29..e69de29 100644
--- a/dev/.keep
+++ b/src/.keep
diff --git a/dev/CompilerKit/AE.h b/src/CompilerKit/AE.h
index 7b6d9b4..7b6d9b4 100644
--- a/dev/CompilerKit/AE.h
+++ b/src/CompilerKit/AE.h
diff --git a/dev/CompilerKit/Compiler.h b/src/CompilerKit/Compiler.h
index 1f24370..1f24370 100644
--- a/dev/CompilerKit/Compiler.h
+++ b/src/CompilerKit/Compiler.h
diff --git a/dev/CompilerKit/Defines.h b/src/CompilerKit/Defines.h
index d036767..d036767 100644
--- a/dev/CompilerKit/Defines.h
+++ b/src/CompilerKit/Defines.h
diff --git a/dev/CompilerKit/ErrorID.h b/src/CompilerKit/ErrorID.h
index 35039ab..35039ab 100644
--- a/dev/CompilerKit/ErrorID.h
+++ b/src/CompilerKit/ErrorID.h
diff --git a/dev/CompilerKit/ErrorOr.h b/src/CompilerKit/ErrorOr.h
index ac42c19..ac42c19 100644
--- a/dev/CompilerKit/ErrorOr.h
+++ b/src/CompilerKit/ErrorOr.h
diff --git a/dev/CompilerKit/Frontend.h b/src/CompilerKit/Frontend.h
index df70048..df70048 100644
--- a/dev/CompilerKit/Frontend.h
+++ b/src/CompilerKit/Frontend.h
diff --git a/dev/CompilerKit/Macros.h b/src/CompilerKit/Macros.h
index 6cef758..6cef758 100644
--- a/dev/CompilerKit/Macros.h
+++ b/src/CompilerKit/Macros.h
diff --git a/dev/CompilerKit/PEF.h b/src/CompilerKit/PEF.h
index edf8f5d..edf8f5d 100644
--- a/dev/CompilerKit/PEF.h
+++ b/src/CompilerKit/PEF.h
diff --git a/dev/CompilerKit/Ref.h b/src/CompilerKit/Ref.h
index 66ed60f..66ed60f 100644
--- a/dev/CompilerKit/Ref.h
+++ b/src/CompilerKit/Ref.h
diff --git a/dev/CompilerKit/StringKit.h b/src/CompilerKit/StringKit.h
index eb7ccc3..eb7ccc3 100644
--- a/dev/CompilerKit/StringKit.h
+++ b/src/CompilerKit/StringKit.h
diff --git a/dev/CompilerKit/UUID.h b/src/CompilerKit/UUID.h
index 98733fd..98733fd 100644
--- a/dev/CompilerKit/UUID.h
+++ b/src/CompilerKit/UUID.h
diff --git a/dev/CompilerKit/Version.h b/src/CompilerKit/Version.h
index efd174c..efd174c 100644
--- a/dev/CompilerKit/Version.h
+++ b/src/CompilerKit/Version.h
diff --git a/dev/CompilerKit/XCOFF.h b/src/CompilerKit/XCOFF.h
index a61949a..a61949a 100644
--- a/dev/CompilerKit/XCOFF.h
+++ b/src/CompilerKit/XCOFF.h
diff --git a/dev/CompilerKit/ck-osx-san.json b/src/CompilerKit/ck-osx-san.json
index df1c36b..df1c36b 100644
--- a/dev/CompilerKit/ck-osx-san.json
+++ b/src/CompilerKit/ck-osx-san.json
diff --git a/dev/CompilerKit/ck-osx.json b/src/CompilerKit/ck-osx.json
index cab0221..cab0221 100644
--- a/dev/CompilerKit/ck-osx.json
+++ b/src/CompilerKit/ck-osx.json
diff --git a/dev/CompilerKit/ck-posix.json b/src/CompilerKit/ck-posix.json
index b748f7a..b748f7a 100644
--- a/dev/CompilerKit/ck-posix.json
+++ b/src/CompilerKit/ck-posix.json
diff --git a/dev/CompilerKit/impl/32x0.h b/src/CompilerKit/impl/32x0.h
index 1ad13ee..1ad13ee 100644
--- a/dev/CompilerKit/impl/32x0.h
+++ b/src/CompilerKit/impl/32x0.h
diff --git a/dev/CompilerKit/impl/64x0.h b/src/CompilerKit/impl/64x0.h
index ce2ae89..ce2ae89 100644
--- a/dev/CompilerKit/impl/64x0.h
+++ b/src/CompilerKit/impl/64x0.h
diff --git a/dev/CompilerKit/impl/Aarch64.h b/src/CompilerKit/impl/Aarch64.h
index c1e9c77..c1e9c77 100644
--- a/dev/CompilerKit/impl/Aarch64.h
+++ b/src/CompilerKit/impl/Aarch64.h
diff --git a/dev/CompilerKit/impl/PowerPC.h b/src/CompilerKit/impl/PowerPC.h
index 7c7f67c..7c7f67c 100644
--- a/dev/CompilerKit/impl/PowerPC.h
+++ b/src/CompilerKit/impl/PowerPC.h
diff --git a/dev/CompilerKit/impl/X64.h b/src/CompilerKit/impl/X64.h
index ccbcf13..ccbcf13 100644
--- a/dev/CompilerKit/impl/X64.h
+++ b/src/CompilerKit/impl/X64.h
diff --git a/dev/CompilerKit/src/AssemblyFactory.cc b/src/CompilerKit/src/AssemblyFactory.cc
index 5c606e9..5c606e9 100644
--- a/dev/CompilerKit/src/AssemblyFactory.cc
+++ b/src/CompilerKit/src/AssemblyFactory.cc
diff --git a/dev/CompilerKit/src/Backend/Assembler32x0.cc b/src/CompilerKit/src/Backend/Assembler32x0.cc
index 6ffaa6e..6ffaa6e 100644
--- a/dev/CompilerKit/src/Backend/Assembler32x0.cc
+++ b/src/CompilerKit/src/Backend/Assembler32x0.cc
diff --git a/dev/CompilerKit/src/Backend/Assembler64x0.cc b/src/CompilerKit/src/Backend/Assembler64x0.cc
index f9052d2..f9052d2 100644
--- a/dev/CompilerKit/src/Backend/Assembler64x0.cc
+++ b/src/CompilerKit/src/Backend/Assembler64x0.cc
diff --git a/dev/CompilerKit/src/Backend/AssemblerAMD64.cc b/src/CompilerKit/src/Backend/AssemblerAMD64.cc
index 8c7e21c..8c7e21c 100644
--- a/dev/CompilerKit/src/Backend/AssemblerAMD64.cc
+++ b/src/CompilerKit/src/Backend/AssemblerAMD64.cc
diff --git a/dev/CompilerKit/src/Backend/AssemblerARM64.cc b/src/CompilerKit/src/Backend/AssemblerARM64.cc
index 4961e61..4961e61 100644
--- a/dev/CompilerKit/src/Backend/AssemblerARM64.cc
+++ b/src/CompilerKit/src/Backend/AssemblerARM64.cc
diff --git a/dev/CompilerKit/src/Backend/AssemblerPowerPC.cc b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc
index b4f14ea..b4f14ea 100644
--- a/dev/CompilerKit/src/Backend/AssemblerPowerPC.cc
+++ b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc
diff --git a/dev/CompilerKit/src/Frontend.cc b/src/CompilerKit/src/Frontend.cc
index baac34e..baac34e 100644
--- a/dev/CompilerKit/src/Frontend.cc
+++ b/src/CompilerKit/src/Frontend.cc
diff --git a/dev/CompilerKit/src/Frontend/CCompiler64x0.cc b/src/CompilerKit/src/Frontend/CCompiler64x0.cc
index f07fcb0..bed4ddd 100644
--- a/dev/CompilerKit/src/Frontend/CCompiler64x0.cc
+++ b/src/CompilerKit/src/Frontend/CCompiler64x0.cc
@@ -1188,7 +1188,7 @@ class AssemblyCCInterface final CK_ASSEMBLY_INTERFACE {
 #include <CompilerKit/Version.h>
 
 #define kPrintF printf
-#define kSplashCxx() kPrintF(kWhite "NE C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
+#define kSplashCxx() kPrintF(kWhite "NeCTI C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
 
 static void cc_print_help() {
   kSplashCxx();
diff --git a/dev/CompilerKit/src/Frontend/CCompilerARM64.cc b/src/CompilerKit/src/Frontend/CCompilerARM64.cc
index c5b1fb8..ea39a31 100644
--- a/dev/CompilerKit/src/Frontend/CCompilerARM64.cc
+++ b/src/CompilerKit/src/Frontend/CCompilerARM64.cc
@@ -1187,7 +1187,7 @@ class AssemblyCCInterface final CK_ASSEMBLY_INTERFACE {
 #include <CompilerKit/Version.h>
 
 #define kPrintF printf
-#define kSplashCxx() kPrintF(kWhite "NE C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
+#define kSplashCxx() kPrintF(kWhite "NeCTI C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
 
 static void cc_print_help() {
   kSplashCxx();
diff --git a/dev/CompilerKit/src/Frontend/CCompilerPower64.cc b/src/CompilerKit/src/Frontend/CCompilerPower64.cc
index ccc5cf8..ccc5cf8 100644
--- a/dev/CompilerKit/src/Frontend/CCompilerPower64.cc
+++ b/src/CompilerKit/src/Frontend/CCompilerPower64.cc
diff --git a/dev/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
index d715a3a..d715a3a 100644
--- a/dev/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
+++ b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
diff --git a/dev/CompilerKit/src/Linker/DynamicLinker64PEF.cc b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc
index 8a503ed..176a608 100644
--- a/dev/CompilerKit/src/Linker/DynamicLinker64PEF.cc
+++ b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc
@@ -67,8 +67,8 @@ static CompilerKit::STLString kLinkerStart = kPefStart;
 static std::vector<CompilerKit::STLString>    kObjectList;
 static std::vector<Detail::DynamicLinkerBlob> kObjectBytes;
 
-///	@brief NE 64-bit Linker.
-/// @note This linker is made for PEF executable, thus NE based OSes.
+///	@brief NeCTI 64-bit Linker.
+/// @note This linker is made for PEF executable, thus NeCTI based OSes.
 NECTI_MODULE(DynamicLinker64PEF) {
   bool is_executable = true;
 
diff --git a/dev/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc b/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc
index ed53782..ed53782 100644
--- a/dev/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc
+++ b/src/CompilerKit/src/Macro/CPlusPlusPreprocessor.cc
diff --git a/dev/CompilerKit/src/StringKit.cc b/src/CompilerKit/src/StringKit.cc
index d612947..d612947 100644
--- a/dev/CompilerKit/src/StringKit.cc
+++ b/src/CompilerKit/src/StringKit.cc
diff --git a/dev/CompilerKit/utils/AsmUtils.h b/src/CompilerKit/utils/AsmUtils.h
index 897fcbe..897fcbe 100644
--- a/dev/CompilerKit/utils/AsmUtils.h
+++ b/src/CompilerKit/utils/AsmUtils.h
diff --git a/dev/CompilerKit/utils/CompilerUtils.h b/src/CompilerKit/utils/CompilerUtils.h
index 1b086ee..1b086ee 100644
--- a/dev/CompilerKit/utils/CompilerUtils.h
+++ b/src/CompilerKit/utils/CompilerUtils.h
diff --git a/dev/CompilerKit/utils/DylibHelpers.h b/src/CompilerKit/utils/DylibHelpers.h
index ab58fc7..ab58fc7 100644
--- a/dev/CompilerKit/utils/DylibHelpers.h
+++ b/src/CompilerKit/utils/DylibHelpers.h
diff --git a/dev/DebuggerKit/CommonCLI.inl b/src/DebuggerKit/CommonCLI.inl
index e06a9b9..e06a9b9 100644
--- a/dev/DebuggerKit/CommonCLI.inl
+++ b/src/DebuggerKit/CommonCLI.inl
diff --git a/dev/DebuggerKit/DebuggerContract.h b/src/DebuggerKit/DebuggerContract.h
index 2114041..2114041 100644
--- a/dev/DebuggerKit/DebuggerContract.h
+++ b/src/DebuggerKit/DebuggerContract.h
diff --git a/dev/DebuggerKit/NeKernelContract.h b/src/DebuggerKit/NeKernelContract.h
index d048303..d048303 100644
--- a/dev/DebuggerKit/NeKernelContract.h
+++ b/src/DebuggerKit/NeKernelContract.h
diff --git a/dev/DebuggerKit/POSIXMachContract.h b/src/DebuggerKit/POSIXMachContract.h
index 5bd4ba8..5bd4ba8 100644
--- a/dev/DebuggerKit/POSIXMachContract.h
+++ b/src/DebuggerKit/POSIXMachContract.h
diff --git a/dev/DebuggerKit/Platform.h b/src/DebuggerKit/Platform.h
index f878845..f878845 100644
--- a/dev/DebuggerKit/Platform.h
+++ b/src/DebuggerKit/Platform.h
diff --git a/dev/DebuggerKit/Version.h b/src/DebuggerKit/Version.h
index 8f3168a..8f3168a 100644
--- a/dev/DebuggerKit/Version.h
+++ b/src/DebuggerKit/Version.h
diff --git a/dev/DebuggerKit/dk-nekernel.json b/src/DebuggerKit/dk-nekernel.json
index 9c3d311..9c3d311 100644
--- a/dev/DebuggerKit/dk-nekernel.json
+++ b/src/DebuggerKit/dk-nekernel.json
diff --git a/dev/DebuggerKit/dk-osx.json b/src/DebuggerKit/dk-osx.json
index c220756..c220756 100644
--- a/dev/DebuggerKit/dk-osx.json
+++ b/src/DebuggerKit/dk-osx.json
diff --git a/dev/DebuggerKit/src/NeKernelContract.cc b/src/DebuggerKit/src/NeKernelContract.cc
index 38f327d..38f327d 100644
--- a/dev/DebuggerKit/src/NeKernelContract.cc
+++ b/src/DebuggerKit/src/NeKernelContract.cc
diff --git a/dev/DebuggerKit/src/NeKernelContractCLI.cc b/src/DebuggerKit/src/NeKernelContractCLI.cc
index fc13a53..fc13a53 100644
--- a/dev/DebuggerKit/src/NeKernelContractCLI.cc
+++ b/src/DebuggerKit/src/NeKernelContractCLI.cc
diff --git a/dev/DebuggerKit/src/POSIXMachContractCLI.cc b/src/DebuggerKit/src/POSIXMachContractCLI.cc
index 77fe844..77fe844 100644
--- a/dev/DebuggerKit/src/POSIXMachContractCLI.cc
+++ b/src/DebuggerKit/src/POSIXMachContractCLI.cc
diff --git a/dev/LibC++/.gitignore b/src/LibC++/.gitignore
index 5fa1170..5fa1170 100644
--- a/dev/LibC++/.gitignore
+++ b/src/LibC++/.gitignore
diff --git a/dev/LibC++/__abi+unreachable.cc b/src/LibC++/__abi+unreachable.cc
index 1fc9830..1fc9830 100644
--- a/dev/LibC++/__abi+unreachable.cc
+++ b/src/LibC++/__abi+unreachable.cc
diff --git a/dev/LibC++/__abi.h b/src/LibC++/__abi.h
index 70afae5..70afae5 100644
--- a/dev/LibC++/__abi.h
+++ b/src/LibC++/__abi.h
diff --git a/dev/LibC++/__power64.inc b/src/LibC++/__power64.inc
index c06863a..c06863a 100644
--- a/dev/LibC++/__power64.inc
+++ b/src/LibC++/__power64.inc
diff --git a/dev/LibC++/base_alloc.h b/src/LibC++/base_alloc.h
index ea5b5b2..ea5b5b2 100644
--- a/dev/LibC++/base_alloc.h
+++ b/src/LibC++/base_alloc.h
diff --git a/dev/LibC++/base_exception.h b/src/LibC++/base_exception.h
index 8747688..8747688 100644
--- a/dev/LibC++/base_exception.h
+++ b/src/LibC++/base_exception.h
diff --git a/dev/LibC++/base_math.h b/src/LibC++/base_math.h
index 60b260e..60b260e 100644
--- a/dev/LibC++/base_math.h
+++ b/src/LibC++/base_math.h
diff --git a/dev/LibC++/base_process.h b/src/LibC++/base_process.h
index f9b0596..f9b0596 100644
--- a/dev/LibC++/base_process.h
+++ b/src/LibC++/base_process.h
diff --git a/dev/LibC++/defines.h b/src/LibC++/defines.h
index b8ef10c..b8ef10c 100644
--- a/dev/LibC++/defines.h
+++ b/src/LibC++/defines.h
diff --git a/dev/LibC++/filesystem.h b/src/LibC++/filesystem.h
index 807ab0d..807ab0d 100644
--- a/dev/LibC++/filesystem.h
+++ b/src/LibC++/filesystem.h
diff --git a/dev/LibC++/make_hdrs.sh b/src/LibC++/make_hdrs.sh
index 5e8907e..5e8907e 100755
--- a/dev/LibC++/make_hdrs.sh
+++ b/src/LibC++/make_hdrs.sh
diff --git a/dev/LibC++/new.cc b/src/LibC++/new.cc
index 85ae82e..85ae82e 100644
--- a/dev/LibC++/new.cc
+++ b/src/LibC++/new.cc
diff --git a/dev/LibC++/new.h b/src/LibC++/new.h
index 37e2a26..37e2a26 100644
--- a/dev/LibC++/new.h
+++ b/src/LibC++/new.h
diff --git a/dev/LibC++/utility.h b/src/LibC++/utility.h
index 62096f5..62096f5 100644
--- a/dev/LibC++/utility.h
+++ b/src/LibC++/utility.h
diff --git a/dev/ThirdParty/Dialogs.h b/src/ThirdParty/Dialogs.h
index 7e0b5eb..7264e20 100644
--- a/dev/ThirdParty/Dialogs.h
+++ b/src/ThirdParty/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/tools/asm.json b/tools/asm.json
index a2d9b72..e322800 100644
--- a/tools/asm.json
+++ b/tools/asm.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/CompilerKit", "../dev/", "../dev/CompilerKit/src/Detail"],
+  "headers_path": ["../src/CompilerKit", "../src/", "../src/CompilerKit/src/Detail"],
   "sources_path": ["asm.cc"],
   "output_name": "asm",
   "compiler_flags": ["-L/usr/lib", "-lCompilerKit"],
diff --git a/tools/cppdrv.cc b/tools/cppdrv.cc
index 4d6f7cf..2cccf2b 100644
--- a/tools/cppdrv.cc
+++ b/tools/cppdrv.cc
@@ -5,7 +5,7 @@
 ======================================== */
 
 /// @file cxxdrv.cc
-/// @brief NE frontend preprocessor.
+/// @brief NeCTI frontend preprocessor.
 
 #include <CompilerKit/Defines.h>
 #include <CompilerKit/ErrorID.h>
diff --git a/tools/cppdrv.json b/tools/cppdrv.json
index a5c9eb9..6bef999 100644
--- a/tools/cppdrv.json
+++ b/tools/cppdrv.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/CompilerKit", "../dev/", "../dev/CompilerKit/src/Detail"],
+  "headers_path": ["../src/CompilerKit", "../src/", "../src/CompilerKit/src/Detail"],
   "sources_path": ["cppdrv.cc"],
   "output_name": "cppdrv",
   "compiler_flags": ["-L/usr/local/lib", "-lCompilerKit"],
diff --git a/tools/dbg.cc b/tools/dbg.cc
index 854351e..a54c59e 100644
--- a/tools/dbg.cc
+++ b/tools/dbg.cc
@@ -7,7 +7,7 @@
 #include <CompilerKit/Defines.h>
 
 /// @file dbg.cc
-/// @brief NE debugger.
+/// @brief NeCTI debugger.
 
 CK_IMPORT_C Int32 DebuggerMachPOSIX(Int32 argc, Char const* argv[]);
 
diff --git a/tools/dbg.json b/tools/dbg.json
index c5efa43..50feaf3 100644
--- a/tools/dbg.json
+++ b/tools/dbg.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/CompilerKit", "../dev/", "../dev/CompilerKit/src/Detail"],
+  "headers_path": ["../src/CompilerKit", "../src/", "../src/CompilerKit/src/Detail"],
   "sources_path": ["dbg.cc"],
   "output_name": "dbg",
   "compiler_flags": ["-L/usr/lib", "-lDebuggerKit"],
diff --git a/tools/kdbg.json b/tools/kdbg.json
index 68527e8..6828cef 100644
--- a/tools/kdbg.json
+++ b/tools/kdbg.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/CompilerKit", "../dev/", "../dev/CompilerKit/src/Detail"],
+  "headers_path": ["../src/CompilerKit", "../src/", "../src/CompilerKit/src/Detail"],
   "sources_path": ["kdbg.cc"],
   "output_name": "kdbg",
   "compiler_flags": ["-L/usr/lib", "-lDebuggerKit"],
diff --git a/tools/ld64.json b/tools/ld64.json
index 3b02678..b509926 100644
--- a/tools/ld64.json
+++ b/tools/ld64.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/CompilerKit", "../dev/", "../dev/CompilerKit/src/Detail"],
+  "headers_path": ["../src/CompilerKit", "../src/", "../src/CompilerKit/src/Detail"],
   "sources_path": ["ld64.cc"],
   "output_name": "ld64",
   "compiler_flags": ["-L/usr/lib", "-lCompilerKit"],
diff --git a/tools/pef-amd64-cxxdrv.cc b/tools/pef-amd64-cxxdrv.cc
index e1187e8..3fc41fe 100644
--- a/tools/pef-amd64-cxxdrv.cc
+++ b/tools/pef-amd64-cxxdrv.cc
@@ -5,7 +5,7 @@
 ======================================== */
 
 /// @file cxxdrv.cc
-/// @brief NE C++ frontend compiler.
+/// @brief NeCTI C++ frontend compiler.
 
 #include <CompilerKit/Defines.h>
 #include <CompilerKit/ErrorID.h>
diff --git a/tools/pef-amd64-cxxdrv.json b/tools/pef-amd64-cxxdrv.json
index 4815035..9d1f360 100644
--- a/tools/pef-amd64-cxxdrv.json
+++ b/tools/pef-amd64-cxxdrv.json
@@ -2,9 +2,9 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": [
-    "../dev/CompilerKit",
-    "../dev/",
-    "../dev/CompilerKit/src/Detail"
+    "../src/CompilerKit",
+    "../src/",
+    "../src/CompilerKit/src/Detail"
   ],
   "sources_path": [
     "pef-amd64-cxxdrv.cc"
diff --git a/tools/pef-arm64-cdrv.cc b/tools/pef-arm64-cdrv.cc
index b7d8ed1..0a4a9af 100644
--- a/tools/pef-arm64-cdrv.cc
+++ b/tools/pef-arm64-cdrv.cc
@@ -5,7 +5,7 @@
 ======================================== */
 
 /// @file cxxdrv.cc
-/// @brief NE C++ frontend compiler.
+/// @brief NeCTI C++ frontend compiler.
 
 #include <CompilerKit/Defines.h>
 #include <CompilerKit/ErrorID.h>
diff --git a/tools/pef-arm64-cdrv.json b/tools/pef-arm64-cdrv.json
index b2f3548..f7186e3 100644
--- a/tools/pef-arm64-cdrv.json
+++ b/tools/pef-arm64-cdrv.json
@@ -2,9 +2,9 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": [
-    "../dev/CompilerKit",
-    "../dev/",
-    "../dev/CompilerKit/src/Detail"
+    "../src/CompilerKit",
+    "../src/",
+    "../src/CompilerKit/src/Detail"
   ],
   "sources_path": [
     "pef-arm64-cdrv.cc"