40 files changed, 123 insertions, 123 deletions

diff --git a/dev/crt/base_alloc.hxx b/dev/LibC++/base_alloc.hxx
index 94f2b25..51ed861 100644
--- a/dev/crt/base_alloc.hxx
+++ b/dev/LibC++/base_alloc.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
+#include <LibC++/defines.hxx>
 
 namespace std::base_alloc
 {
diff --git a/dev/crt/base_exception.hxx b/dev/LibC++/base_exception.hxx
index b4cfe99..9efe209 100644
--- a/dev/crt/base_exception.hxx
+++ b/dev/LibC++/base_exception.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
-#include <crt/exit.hxx>
+#include <LibC++/defines.hxx>
+#include <LibC++/exit.hxx>
 
 namespace std
 {
diff --git a/dev/crt/defines.hxx b/dev/LibC++/defines.hxx
index 57b2ea3..c65b254 100644
--- a/dev/crt/defines.hxx
+++ b/dev/LibC++/defines.hxx
@@ -34,7 +34,7 @@ typedef char*  caddr_t;
 #endif // !null
 
 #ifdef __GNUC__
-#include <crt/alloca.hxx>
+#include <LibC++/alloca.hxx>
 #elif defined(__NDK__)
 #define __alloca(sz) __ndk_alloca(sz)
 #endif
@@ -94,8 +94,8 @@ typedef union double_cast {
 
 #ifdef __STD_CXX__
 
-#include <crt/base_exception.hxx>
-#include <crt/base_alloc.hxx>
+#include <LibC++/base_exception.hxx>
+#include <LibC++/base_alloc.hxx>
 
 #endif // ifdef __STD_CXX__
 
diff --git a/dev/crt/exit.hxx b/dev/LibC++/exit.hxx
index 0878e43..0878e43 100644
--- a/dev/crt/exit.hxx
+++ b/dev/LibC++/exit.hxx
diff --git a/dev/crt/math.hxx b/dev/LibC++/math.hxx
index 57ae16d..b6cd6a8 100644
--- a/dev/crt/math.hxx
+++ b/dev/LibC++/math.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <crt/defines.hxx>
+#include <LibC++/defines.hxx>
 
 /// @file Math.hxx
 /// @brief Math functions.
diff --git a/dev/crt/power64.inc b/dev/LibC++/power64.inc
index 23013c1..33523a3 100644
--- a/dev/crt/power64.inc
+++ b/dev/LibC++/power64.inc
@@ -1,8 +1,8 @@
-# Path: SDK/__ndk_power.inc
+# Path: LibC++/power.inc
 # Language: NDK POWER Assembly support for GNU.
 # Build Date: 2024-6-4
 
-%ifdef __CODETOOLS__
+%ifdef __NDK__
 
 %define lda li
 %define sta stw
diff --git a/dev/ndk/AAL/Asm.hxx b/dev/ToolchainKit/AAL/Asm.hxx
index 07ece9d..5de4d3d 100644
--- a/dev/ndk/AAL/Asm.hxx
+++ b/dev/ToolchainKit/AAL/Asm.hxx
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <ndk/Macros.hxx>
-#include <ndk/Defines.hxx>
-#include <ndk/NFC/String.hxx>
+#include <ToolchainKit/Macros.hxx>
+#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/NFC/String.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndk/AAL/CPU/32x0.hxx b/dev/ToolchainKit/AAL/CPU/32x0.hxx
index 4e4b0e1..11ce4af 100644
--- a/dev/ndk/AAL/CPU/32x0.hxx
+++ b/dev/ToolchainKit/AAL/CPU/32x0.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 // @brief 32x0 support.
 // @file CPU/32x0.hpp
diff --git a/dev/ndk/AAL/CPU/64x0.hxx b/dev/ToolchainKit/AAL/CPU/64x0.hxx
index c60c017..a822a5c 100644
--- a/dev/ndk/AAL/CPU/64x0.hxx
+++ b/dev/ToolchainKit/AAL/CPU/64x0.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 #include <vector>
 
 // @brief 64x0 support.
diff --git a/dev/ndk/AAL/CPU/amd64.hxx b/dev/ToolchainKit/AAL/CPU/amd64.hxx
index 84b127a..fe9a06f 100644
--- a/dev/ndk/AAL/CPU/amd64.hxx
+++ b/dev/ToolchainKit/AAL/CPU/amd64.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 // @brief AMD64 support.
 // @file CPU/amd64.hpp
diff --git a/dev/ndk/AAL/CPU/arm64.hxx b/dev/ToolchainKit/AAL/CPU/arm64.hxx
index c5b33c0..dbb6565 100644
--- a/dev/ndk/AAL/CPU/arm64.hxx
+++ b/dev/ToolchainKit/AAL/CPU/arm64.hxx
@@ -6,7 +6,7 @@ Copyright ZKA Web Services Co
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 /// @brief ARM64 encoding support.
 /// @file CPU/arm64.hpp
diff --git a/dev/ndk/AAL/CPU/power64.hxx b/dev/ToolchainKit/AAL/CPU/power64.hxx
index 391c3c2..391c3c2 100644
--- a/dev/ndk/AAL/CPU/power64.hxx
+++ b/dev/ToolchainKit/AAL/CPU/power64.hxx
diff --git a/dev/ndk/Defines.hxx b/dev/ToolchainKit/Defines.hxx
index 3a08584..3a08584 100644
--- a/dev/ndk/Defines.hxx
+++ b/dev/ToolchainKit/Defines.hxx
diff --git a/dev/ndk/Macros.hxx b/dev/ToolchainKit/Macros.hxx
index 4d56331..4d56331 100644
--- a/dev/ndk/Macros.hxx
+++ b/dev/ToolchainKit/Macros.hxx
diff --git a/dev/ndk/NFC/AE.hxx b/dev/ToolchainKit/NFC/AE.hxx
index 78c1ef2..5b8cd21 100644
--- a/dev/ndk/NFC/AE.hxx
+++ b/dev/ToolchainKit/NFC/AE.hxx
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 #define kAEMag0 'A'
 #define kAEMag1 'E'
diff --git a/dev/ndk/NFC/ErrorID.hxx b/dev/ToolchainKit/NFC/ErrorID.hxx
index 443595d..0557617 100644
--- a/dev/ndk/NFC/ErrorID.hxx
+++ b/dev/ToolchainKit/NFC/ErrorID.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
-#include <ndk/NFC/ErrorOr.hxx>
+#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/NFC/ErrorOr.hxx>
 
 #define NDK_EXEC_ERROR	   -30
 #define NDK_FILE_NOT_FOUND -31
diff --git a/dev/ndk/NFC/ErrorOr.hxx b/dev/ToolchainKit/NFC/ErrorOr.hxx
index 90851fe..3f2b448 100644
--- a/dev/ndk/NFC/ErrorOr.hxx
+++ b/dev/ToolchainKit/NFC/ErrorOr.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
-#include <ndk/NFC/Ref.hxx>
+#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/NFC/Ref.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndk/NFC/PEF.hxx b/dev/ToolchainKit/NFC/PEF.hxx
index 097ceae..d04dd85 100644
--- a/dev/ndk/NFC/PEF.hxx
+++ b/dev/ToolchainKit/NFC/PEF.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 // @file PEF.hpp
 // @brief Preferred Executable Format
diff --git a/dev/ndk/NFC/Ref.hxx b/dev/ToolchainKit/NFC/Ref.hxx
index d64b9c8..830f6c8 100644
--- a/dev/ndk/NFC/Ref.hxx
+++ b/dev/ToolchainKit/NFC/Ref.hxx
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndk/NFC/String.hxx b/dev/ToolchainKit/NFC/String.hxx
index 261b5e5..78d6019 100644
--- a/dev/ndk/NFC/String.hxx
+++ b/dev/ToolchainKit/NFC/String.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndk/Defines.hxx>
-#include <ndk/NFC/ErrorOr.hxx>
+#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/NFC/ErrorOr.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndk/NFC/XCOFF.hxx b/dev/ToolchainKit/NFC/XCOFF.hxx
index e25d8f2..20b279a 100644
--- a/dev/ndk/NFC/XCOFF.hxx
+++ b/dev/ToolchainKit/NFC/XCOFF.hxx
@@ -14,7 +14,7 @@
 #ifndef __XCOFF__
 #define __XCOFF__
 
-#include <ndk/Defines.hxx>
+#include <ToolchainKit/Defines.hxx>
 
 #define kXCOFF64Magic 0x01F7
 
diff --git a/dev/ndk/Parser.hxx b/dev/ToolchainKit/Parser.hxx
index b3715fa..7d61825 100644
--- a/dev/ndk/Parser.hxx
+++ b/dev/ToolchainKit/Parser.hxx
@@ -6,22 +6,22 @@
 
 #pragma once
 
-#include <ndk/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
 #include <vector>
 
 namespace NDK
 {
-	inline auto cInvalidLang = "?";
+	inline auto kInvalidFrontend = "No Language";
 
 	/// @brief Compiler backend, implements a frontend, such as C, C++...
 	/// See Toolchain, for some examples.
-	class CompilerBackend
+	class ICompilerFrontend
 	{
 	public:
-		explicit CompilerBackend() = default;
-		virtual ~CompilerBackend() = default;
+		explicit ICompilerFrontend() = default;
+		virtual ~ICompilerFrontend() = default;
 
-		NDK_COPY_DEFAULT(CompilerBackend);
+		NDK_COPY_DEFAULT(ICompilerFrontend);
 
 		// NOTE: cast this to your user defined ast.
 		typedef void* AstType;
@@ -34,12 +34,12 @@ namespace NDK
 		//! @brief What language are we dealing with?
 		virtual const char* Language()
 		{
-			return cInvalidLang;
+			return kInvalidFrontend;
 		}
 
 		virtual bool IsValid()
 		{
-			return strcmp(this->Language(), cInvalidLang);
+			return strcmp(this->Language(), kInvalidFrontend);
 		}
 	};
 
diff --git a/dev/ndk/ReadMe.md b/dev/ToolchainKit/ReadMe.md
index c0b764d..c0b764d 100644
--- a/dev/ndk/ReadMe.md
+++ b/dev/ToolchainKit/ReadMe.md
diff --git a/dev/ndk/UUID.hxx b/dev/ToolchainKit/UUID.hxx
index 00b153b..00b153b 100644
--- a/dev/ndk/UUID.hxx
+++ b/dev/ToolchainKit/UUID.hxx
diff --git a/dev/ndk/Version.hxx b/dev/ToolchainKit/Version.hxx
index dae1b45..dae1b45 100644
--- a/dev/ndk/Version.hxx
+++ b/dev/ToolchainKit/Version.hxx
diff --git a/dev/ndk/src/Assembler32x0.cxx b/dev/ToolchainKit/src/Assembler32x0.cxx
index 6fc40c2..b691e6a 100644
--- a/dev/ndk/src/Assembler32x0.cxx
+++ b/dev/ToolchainKit/src/Assembler32x0.cxx
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_32x0__ 1
 
-#include <ndk/AAL/CPU/32x0.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/NFC/AE.hxx>
-#include <ndk/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/32x0.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
 
 /////////////////////
 
diff --git a/dev/ndk/src/Assembler64x0.cxx b/dev/ToolchainKit/src/Assembler64x0.cxx
index 9a0f111..d0c581b 100644
--- a/dev/ndk/src/Assembler64x0.cxx
+++ b/dev/ToolchainKit/src/Assembler64x0.cxx
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_64x0__ 1
 
-#include <ndk/AAL/CPU/64x0.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/NFC/AE.hxx>
-#include <ndk/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/64x0.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/dev/ndk/src/AssemblerAMD64.cxx b/dev/ToolchainKit/src/AssemblerAMD64.cxx
index 06e8cab..ae8ba2f 100644
--- a/dev/ndk/src/AssemblerAMD64.cxx
+++ b/dev/ToolchainKit/src/AssemblerAMD64.cxx
@@ -27,10 +27,10 @@
 #define kAssemblerPragmaSymStr "#"
 #define kAssemblerPragmaSym	   '#'
 
-#include <ndk/AAL/CPU/amd64.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/NFC/AE.hxx>
-#include <ndk/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/amd64.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
 #include <algorithm>
 #include <cstdlib>
 #include <filesystem>
diff --git a/dev/ndk/src/AssemblerPower.cxx b/dev/ToolchainKit/src/AssemblerPower.cxx
index 3462be8..fbcbe98 100644
--- a/dev/ndk/src/AssemblerPower.cxx
+++ b/dev/ToolchainKit/src/AssemblerPower.cxx
@@ -17,12 +17,12 @@
 
 #define __ASM_NEED_PPC__ 1
 
-#include <ndk/NFC/ErrorID.hxx>
-#include <ndk/AAL/CPU/power64.hxx>
-#include <ndk/NFC/PEF.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/NFC/AE.hxx>
-#include <ndk/Version.hxx>
+#include <ToolchainKit/NFC/ErrorID.hxx>
+#include <ToolchainKit/AAL/CPU/power64.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/Version.hxx>
 #include <filesystem>
 #include <algorithm>
 #include <iostream>
diff --git a/dev/ndk/src/AssemblyFactory.cxx b/dev/ToolchainKit/src/AssemblyFactory.cxx
index 903e05b..0d47a06 100644
--- a/dev/ndk/src/AssemblyFactory.cxx
+++ b/dev/ToolchainKit/src/AssemblyFactory.cxx
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <ndk/AAL/Asm.hxx>
-#include <ndk/NFC/ErrorID.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/NFC/ErrorID.hxx>
 
 /**
  * @file AssemblyFactory.cxx
diff --git a/dev/ndk/src/CCompiler64x0.cxx b/dev/ToolchainKit/src/CCompiler64x0.cxx
index 9bc6ec7..ae8e5b8 100644
--- a/dev/ndk/src/CCompiler64x0.cxx
+++ b/dev/ToolchainKit/src/CCompiler64x0.cxx
@@ -10,9 +10,9 @@
 /// BUGS: 0
 /// TODO: none
 
-#include <ndk/AAL/CPU/64x0.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/64x0.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/UUID.hxx>
 #include <filesystem>
 #include <cstdio>
 #include <fstream>
@@ -142,13 +142,13 @@ static bool						kIfFound	 = false;
 static size_t					kBracesCount = 0UL;
 
 /* @brief C compiler backend for C */
-class CompilerBackend64x0 final : public NDK::CompilerBackend
+class CompilerFrontend64x0 final : public NDK::ICompilerFrontend
 {
 public:
-	explicit CompilerBackend64x0()	= default;
-	~CompilerBackend64x0() override = default;
+	explicit CompilerFrontend64x0()	 = default;
+	~CompilerFrontend64x0() override = default;
 
-	NDK_COPY_DEFAULT(CompilerBackend64x0);
+	NDK_COPY_DEFAULT(CompilerFrontend64x0);
 
 	std::string Check(const char* text, const char* file);
 	bool		Compile(const std::string text, const std::string file) override;
@@ -159,7 +159,7 @@ public:
 	}
 };
 
-static CompilerBackend64x0*				 kCompilerBackend = nullptr;
+static CompilerFrontend64x0*			 kCompilerFrontend = nullptr;
 static std::vector<detail::CompilerType> kCompilerVariables;
 static std::vector<std::string>			 kCompilerFunctions;
 static std::vector<detail::CompilerType> kCompilerTypes;
@@ -201,7 +201,7 @@ namespace detail
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-bool CompilerBackend64x0::Compile(const std::string text, const std::string file)
+bool CompilerFrontend64x0::Compile(const std::string text, const std::string file)
 {
 	std::string textBuffer = text;
 
@@ -747,7 +747,7 @@ bool CompilerBackend64x0::Compile(const std::string text, const std::string file
 static bool		   kShouldHaveBraces = false;
 static std::string kFnName;
 
-std::string CompilerBackend64x0::Check(const char* text, const char* file)
+std::string CompilerFrontend64x0::Check(const char* text, const char* file)
 {
 	std::string err_str;
 	std::string ln = text;
@@ -1313,7 +1313,7 @@ public:
 		if (arch != AssemblyCCInterface::Arch())
 			return -1;
 
-		if (kCompilerBackend == nullptr)
+		if (kCompilerFrontend == nullptr)
 			return -1;
 
 		/* @brief copy contents wihtout extension */
@@ -1354,10 +1354,10 @@ public:
 
 		while (std::getline(src_fp, line_src))
 		{
-			if (auto err = kCompilerBackend->Check(line_src.c_str(), src.data());
+			if (auto err = kCompilerFrontend->Check(line_src.c_str(), src.data());
 				err.empty())
 			{
-				kCompilerBackend->Compile(line_src, src.data());
+				kCompilerFrontend->Compile(line_src, src.data());
 			}
 			else
 			{
@@ -1506,8 +1506,8 @@ NDK_MODULE(NewOSCompilerCLang64x0)
 	bool skip = false;
 
 	kFactory.Mount(new AssemblyCCInterface());
-	kMachine		 = NDK::AssemblyFactory::kArch64x0;
-	kCompilerBackend = new CompilerBackend64x0();
+	kMachine		  = NDK::AssemblyFactory::kArch64x0;
+	kCompilerFrontend = new CompilerFrontend64x0();
 
 	for (auto index = 1UL; index < argc; ++index)
 	{
@@ -1542,8 +1542,8 @@ NDK_MODULE(NewOSCompilerCLang64x0)
 
 			if (strcmp(argv[index], "/dialect") == 0)
 			{
-				if (kCompilerBackend)
-					std::cout << kCompilerBackend->Language() << "\n";
+				if (kCompilerFrontend)
+					std::cout << kCompilerFrontend->Language() << "\n";
 
 				return kExitOK;
 			}
diff --git a/dev/ndk/src/CCompilerPower64.cxx b/dev/ToolchainKit/src/CCompilerPower64.cxx
index 61e86f5..ad98987 100644
--- a/dev/ndk/src/CCompilerPower64.cxx
+++ b/dev/ToolchainKit/src/CCompilerPower64.cxx
@@ -7,9 +7,9 @@
  * 	========================================================
  */
 
-#include <ndk/AAL/CPU/power64.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/power64.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/UUID.hxx>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -133,13 +133,13 @@ static bool						kIfFound	 = false;
 static size_t					kBracesCount = 0UL;
 
 /* @brief C compiler backend for C */
-class CompilerBackendPower64 final : public NDK::CompilerBackend
+class CompilerFrontendPower64 final : public NDK::ICompilerFrontend
 {
 public:
-	explicit CompilerBackendPower64()  = default;
-	~CompilerBackendPower64() override = default;
+	explicit CompilerFrontendPower64()	= default;
+	~CompilerFrontendPower64() override = default;
 
-	NDK_COPY_DEFAULT(CompilerBackendPower64);
+	NDK_COPY_DEFAULT(CompilerFrontendPower64);
 
 	std::string Check(const char* text, const char* file);
 	bool		Compile(const std::string text, const std::string file) override;
@@ -150,7 +150,7 @@ public:
 	}
 };
 
-static CompilerBackendPower64*			 kCompilerBackend = nullptr;
+static CompilerFrontendPower64*			 kCompilerFrontend = nullptr;
 static std::vector<detail::CompilerType> kCompilerVariables;
 static std::vector<std::string>			 kCompilerFunctions;
 static std::vector<detail::CompilerType> kCompilerTypes;
@@ -192,7 +192,7 @@ namespace detail
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-bool CompilerBackendPower64::Compile(const std::string text, const std::string file)
+bool CompilerFrontendPower64::Compile(const std::string text, const std::string file)
 {
 	std::string textBuffer = text;
 
@@ -770,7 +770,7 @@ bool CompilerBackendPower64::Compile(const std::string text, const std::string f
 static bool		   kShouldHaveBraces = false;
 static std::string kFnName;
 
-std::string CompilerBackendPower64::Check(const char* text, const char* file)
+std::string CompilerFrontendPower64::Check(const char* text, const char* file)
 {
 	std::string err_str;
 	std::string ln = text;
@@ -1336,7 +1336,7 @@ public:
 		if (arch != AssemblyMountpointCLang::Arch())
 			return -1;
 
-		if (kCompilerBackend == nullptr)
+		if (kCompilerFrontend == nullptr)
 			return -1;
 
 		/* @brief copy contents wihtout extension */
@@ -1377,10 +1377,10 @@ public:
 
 		while (std::getline(src_fp, line_src))
 		{
-			if (auto err = kCompilerBackend->Check(line_src.c_str(), src.data());
+			if (auto err = kCompilerFrontend->Check(line_src.c_str(), src.data());
 				err.empty())
 			{
-				kCompilerBackend->Compile(line_src, src.data());
+				kCompilerFrontend->Compile(line_src, src.data());
 			}
 			else
 			{
@@ -1526,8 +1526,8 @@ NDK_MODULE(NewOSCompilerCLangPowerPC)
 	bool skip = false;
 
 	kFactory.Mount(new AssemblyMountpointCLang());
-	kMachine		 = NDK::AssemblyFactory::kArchPowerPC;
-	kCompilerBackend = new CompilerBackendPower64();
+	kMachine		  = NDK::AssemblyFactory::kArchPowerPC;
+	kCompilerFrontend = new CompilerFrontendPower64();
 
 	for (auto index = 1UL; index < argc; ++index)
 	{
@@ -1562,8 +1562,8 @@ NDK_MODULE(NewOSCompilerCLangPowerPC)
 
 			if (strcmp(argv[index], "-dialect") == 0)
 			{
-				if (kCompilerBackend)
-					std::cout << kCompilerBackend->Language() << "\n";
+				if (kCompilerFrontend)
+					std::cout << kCompilerFrontend->Language() << "\n";
 
 				return kExitOK;
 			}
diff --git a/dev/ndk/src/CPlusPlusCompilerAMD64.cxx b/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cxx
index f6b4f9e..35f83c7 100644
--- a/dev/ndk/src/CPlusPlusCompilerAMD64.cxx
+++ b/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cxx
@@ -20,9 +20,9 @@
 
 // extern_segment, @MLAutoRelease { ... }, fn foo() -> auto { ... }
 
-#include <ndk/AAL/CPU/amd64.hxx>
-#include <ndk/Parser.hxx>
-#include <ndk/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/amd64.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/UUID.hxx>
 
 /* ZKA C++ Compiler driver */
 /* This is part of the NDK. */
@@ -135,13 +135,13 @@ static bool						kInBraces	 = false;
 static size_t					kBracesCount = 0UL;
 
 /* @brief C++ compiler backend for the ZKA C++ driver */
-class CompilerBackendCPlusPlus final : public NDK::CompilerBackend
+class CompilerFrontendCPlusPlus final : public NDK::ICompilerFrontend
 {
 public:
-	explicit CompilerBackendCPlusPlus()	 = default;
-	~CompilerBackendCPlusPlus() override = default;
+	explicit CompilerFrontendCPlusPlus()  = default;
+	~CompilerFrontendCPlusPlus() override = default;
 
-	NDK_COPY_DEFAULT(CompilerBackendCPlusPlus);
+	NDK_COPY_DEFAULT(CompilerFrontendCPlusPlus);
 
 	bool Compile(const std::string text, const std::string file) override;
 
@@ -150,7 +150,7 @@ public:
 
 /// @internal compiler variables
 
-static CompilerBackendCPlusPlus* kCompilerBackend = nullptr;
+static CompilerFrontendCPlusPlus* kCompilerFrontend = nullptr;
 
 static std::vector<std::string> kRegisterMap;
 
@@ -186,7 +186,7 @@ static size_t kLevelFunction = 0UL;
 
 /// detail namespaces
 
-const char* CompilerBackendCPlusPlus::Language()
+const char* CompilerFrontendCPlusPlus::Language()
 {
 	return "ZKA C++";
 }
@@ -198,8 +198,8 @@ const char* CompilerBackendCPlusPlus::Language()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-bool CompilerBackendCPlusPlus::Compile(const std::string text,
-									   const std::string file)
+bool CompilerFrontendCPlusPlus::Compile(const std::string text,
+										const std::string file)
 {
 	if (text.empty())
 		return false;
@@ -758,7 +758,7 @@ public:
 		if (arch != AssemblyCPlusPlusInterface::Arch())
 			return -1;
 
-		if (kCompilerBackend == nullptr)
+		if (kCompilerFrontend == nullptr)
 			return -1;
 
 		/* @brief copy contents wihtout extension */
@@ -809,7 +809,7 @@ public:
 
 		while (std::getline(src_fp, line_source))
 		{
-			kCompilerBackend->Compile(line_source, src);
+			kCompilerFrontend->Compile(line_source, src);
 		}
 
 		for (auto& ast_generated : kState.fSyntaxTree->fLeafList)
@@ -909,7 +909,7 @@ NDK_MODULE(CompilerCPlusPlusX8664)
 	kKeywords.push_back({.keyword_name = "<=", .keyword_kind = NDK::eKeywordKindLessEq});
 
 	kFactory.Mount(new AssemblyCPlusPlusInterface());
-	kCompilerBackend = new CompilerBackendCPlusPlus();
+	kCompilerFrontend = new CompilerFrontendCPlusPlus();
 
 	for (auto index = 1UL; index < argc; ++index)
 	{
@@ -943,8 +943,8 @@ NDK_MODULE(CompilerCPlusPlusX8664)
 
 			if (strcmp(argv[index], "/cl:c++-dialect") == 0)
 			{
-				if (kCompilerBackend)
-					std::cout << kCompilerBackend->Language() << "\n";
+				if (kCompilerFrontend)
+					std::cout << kCompilerFrontend->Language() << "\n";
 
 				return kExitOK;
 			}
diff --git a/dev/ndk/src/CPlusPlusCompilerPreProcessor.cxx b/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cxx
index 35eaa97..802f8cb 100644
--- a/dev/ndk/src/CPlusPlusCompilerPreProcessor.cxx
+++ b/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cxx
@@ -9,8 +9,8 @@
 
 /// BUGS: 0
 
-#include <ndk/Parser.hxx>
-#include <ndk/NFC/ErrorID.hxx>
+#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/NFC/ErrorID.hxx>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/dev/ndk/src/Detail/AsmUtils.hxx b/dev/ToolchainKit/src/Detail/AsmUtils.hxx
index 7bded86..c401181 100644
--- a/dev/ndk/src/Detail/AsmUtils.hxx
+++ b/dev/ToolchainKit/src/Detail/AsmUtils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <ndk/AAL/Asm.hxx>
-#include <ndk/Parser.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/Parser.hxx>
 
 using namespace NDK;
 
diff --git a/dev/ndk/src/Detail/ClUtils.hxx b/dev/ToolchainKit/src/Detail/ClUtils.hxx
index 9df0bbb..b9e7e80 100644
--- a/dev/ndk/src/Detail/ClUtils.hxx
+++ b/dev/ToolchainKit/src/Detail/ClUtils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <ndk/AAL/Asm.hxx>
-#include <ndk/Parser.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/Parser.hxx>
 
 #define kZero64Section ".zero64"
 #define kCode64Section ".code64"
diff --git a/dev/ndk/src/Detail/ReadMe.md b/dev/ToolchainKit/src/Detail/ReadMe.md
index e9d0a2c..e9d0a2c 100644
--- a/dev/ndk/src/Detail/ReadMe.md
+++ b/dev/ToolchainKit/src/Detail/ReadMe.md
diff --git a/dev/ndk/src/IdlCompiler.cxx b/dev/ToolchainKit/src/IdlCompiler.cxx
index dd351e9..8bdaa1e 100644
--- a/dev/ndk/src/IdlCompiler.cxx
+++ b/dev/ToolchainKit/src/IdlCompiler.cxx
@@ -7,20 +7,20 @@
 
 ------------------------------------------- */
 
-#include <ndk/NFC/ErrorID.hxx>
+#include <ToolchainKit/NFC/ErrorID.hxx>
 
 //! Assembler Kit
-#include <ndk/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
 
 //! Preferred Executable Format
-#include <ndk/NFC/PEF.hxx>
-#include <ndk/UUID.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/UUID.hxx>
 
 //! Dist version
-#include <ndk/Version.hxx>
+#include <ToolchainKit/Version.hxx>
 
 //! Advanced Executable Object Format
-#include <ndk/NFC/AE.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
 
 /***
 	@brief IDL compiler maih.
diff --git a/dev/ndk/src/Linker.cxx b/dev/ToolchainKit/src/Linker.cxx
index 683f2d6..9a39935 100644
--- a/dev/ndk/src/Linker.cxx
+++ b/dev/ToolchainKit/src/Linker.cxx
@@ -16,19 +16,19 @@
 /// @note Do not look up for anything with .code64/.data64/.zero64!
 /// It will be loaded when program will start up!
 
-#include <ndk/NFC/ErrorID.hxx>
+#include <ToolchainKit/NFC/ErrorID.hxx>
 
 //! Assembler Kit
-#include <ndk/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.hxx>
 
 //! Preferred Executable Format
-#include <ndk/NFC/PEF.hxx>
-#include <ndk/UUID.hxx>
+#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/UUID.hxx>
 //! Dist version
-#include <ndk/Version.hxx>
+#include <ToolchainKit/Version.hxx>
 
 //! Advanced Executable Object Format
-#include <ndk/NFC/AE.hxx>
+#include <ToolchainKit/NFC/AE.hxx>
 
 #define kLinkerVersion "ZKA Linker Driver %s, (c) ZKA Web Services Co 2024, all rights reserved.\n"
 
diff --git a/dev/ndk/src/String.cxx b/dev/ToolchainKit/src/String.cxx
index f04267d..004e79c 100644
--- a/dev/ndk/src/String.cxx
+++ b/dev/ToolchainKit/src/String.cxx
@@ -18,7 +18,7 @@
  *
  */
 
-#include <ndk/NFC/String.hxx>
+#include <ToolchainKit/NFC/String.hxx>
 
 namespace NDK
 {