Match the changes in OpenNE, (without reusing it)

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

82 files changed, 223 insertions, 223 deletions

diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h
index 5a537448..81f0796a 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/Boot/BootKit/BootKit.h
@@ -218,7 +218,7 @@ namespace Boot
 
 		~BDiskFormatFactory() = default;
 
-		ZKA_COPY_DELETE(BDiskFormatFactory);
+		NE_COPY_DELETE(BDiskFormatFactory);
 
 		/// @brief Format disk using partition name and blob_list.
 		/// @param Partition part_name the target partition name.
@@ -332,7 +332,7 @@ namespace Boot
 		{
 			fb_init();
 
-			FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
+			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 			EFI::ThrowError(L"Drive-Too-Tiny", L"Can't format a NeFS partition here.");
 			return false;
 		}
diff --git a/dev/Boot/BootKit/Device.h b/dev/Boot/BootKit/Device.h
index bbb0ce89..753d9d35 100644
--- a/dev/Boot/BootKit/Device.h
+++ b/dev/Boot/BootKit/Device.h
@@ -18,7 +18,7 @@ public:
 	explicit Device() = default;
 	virtual ~Device() = default;
 
-	ZKA_MOVE_DEFAULT(Device);
+	NE_MOVE_DEFAULT(Device);
 
 	struct Trait
 	{
diff --git a/dev/Boot/BootKit/HW/ATA.h b/dev/Boot/BootKit/HW/ATA.h
index c58bbd61..397f96b4 100644
--- a/dev/Boot/BootKit/HW/ATA.h
+++ b/dev/Boot/BootKit/HW/ATA.h
@@ -23,7 +23,7 @@ public:
 	explicit BootDeviceATA() noexcept;
 	~BootDeviceATA() = default;
 
-	ZKA_COPY_DELETE(BootDeviceATA);
+	NE_COPY_DELETE(BootDeviceATA);
 
 	enum
 	{
diff --git a/dev/Boot/BootKit/HW/SATA.h b/dev/Boot/BootKit/HW/SATA.h
index a7ece124..1f1d70a2 100644
--- a/dev/Boot/BootKit/HW/SATA.h
+++ b/dev/Boot/BootKit/HW/SATA.h
@@ -15,7 +15,7 @@ public:
 	explicit BootDeviceSATA() noexcept;
 	~BootDeviceSATA() = default;
 
-	ZKA_COPY_DEFAULT(BootDeviceSATA);
+	NE_COPY_DEFAULT(BootDeviceSATA);
 
 	struct SATATrait final
 	{
diff --git a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
index ce980b7b..61fd48dd 100644
--- a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_DISK_HEIGHT 110

-#define ZKA_DISK_WIDTH 110

+#define NE_DISK_HEIGHT 110

+#define NE_DISK_WIDTH 110

 

 // array size is 36300

 static const unsigned int zka_disk[]  = {

diff --git a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
index bdc0bb99..4ede8a65 100644
--- a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_HAS_DISK_HEIGHT 110

-#define ZKA_HAS_DISK_WIDTH 110

+#define NE_HAS_DISK_HEIGHT 110

+#define NE_HAS_DISK_WIDTH 110

 

 // array size is 36300

 static const unsigned int zka_has_disk[]  = {

diff --git a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
index 31689e63..f89abad0 100644
--- a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_NO_DISK_HEIGHT 110
-#define ZKA_NO_DISK_WIDTH 110
+#define NE_NO_DISK_HEIGHT 110
+#define NE_NO_DISK_WIDTH 110
 
 // array size is 36300
 static const unsigned int zka_no_disk[]  = {
diff --git a/dev/Boot/Mod/NetBoot/NetBoot.cc b/dev/Boot/Mod/NetBoot/NetBoot.cc
index 18251e69..cd2db5d2 100644
--- a/dev/Boot/Mod/NetBoot/NetBoot.cc
+++ b/dev/Boot/Mod/NetBoot/NetBoot.cc
@@ -12,7 +12,7 @@
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 	return kEfiFail;
 #else
 	return kEfiOk;
diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json
index a19f3cbf..e02f7f13 100644
--- a/dev/Boot/Mod/NetBoot/build.json
+++ b/dev/Boot/Mod/NetBoot/build.json
@@ -16,7 +16,7 @@
   "cpp_macros": [
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
-    "__ZKA_AMD64__",
+    "__NE_AMD64__",
     "kNetBootVersionHighest=0x0100",
     "kNetBootVersionLowest=0x0100",
     "kNetBootVersion=0x0100"
diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S
index b5795450..f825c5a9 100644
--- a/dev/Boot/Mod/SysChk/Boot.S
+++ b/dev/Boot/Mod/SysChk/Boot.S
@@ -7,7 +7,7 @@
 ;; * 	========================================================
 ;; */
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 .code64
 .intel_syntax noprefix
 #endif
diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc
index 0297b177..d655325e 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/Boot/Mod/SysChk/Module.cc
@@ -23,7 +23,7 @@
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
 
 	if (partition_factory.IsPartitionValid())
diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/Boot/Mod/SysChk/amd64.json
index e1e1b818..0fdaec50 100644
--- a/dev/Boot/Mod/SysChk/amd64.json
+++ b/dev/Boot/Mod/SysChk/amd64.json
@@ -17,7 +17,7 @@
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
     "__BOOTLDR_STANDALONE__",
-    "__ZKA_AMD64__",
+    "__NE_AMD64__",
     "kChkVersionHighest=0x0100",
     "kChkVersionLowest=0x0100",
     "kChkVersion=0x0100"
diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/Boot/Mod/SysChk/arm64.json
index 0e107e28..59cb6189 100644
--- a/dev/Boot/Mod/SysChk/arm64.json
+++ b/dev/Boot/Mod/SysChk/arm64.json
@@ -18,7 +18,7 @@
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
     "__BOOTLDR_STANDALONE__",
-    "__ZKA_ARM64__",
+    "__NE_ARM64__",
     "kChkVersionHighest=0x0100",
     "kChkVersionLowest=0x0100",
     "kChkVersion=0x0100"
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index 73d5a0cc..a8081b71 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/Boot/amd64-desktop.make
@@ -21,7 +21,7 @@ EMU=qemu-system-x86_64  -net none
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"NeOS\""
+NE_MODEL=-DkMachineModel="\"NeOS\""
 endif
 
 BIOS=OVMF.fd
@@ -44,7 +44,7 @@ REM_FLAG=-f
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__ZBAOSLDR__ \
 			-DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I../ -c -nostdlib -fno-rtti -fno-exceptions \
-                        -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT
+                        -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
 
 BOOTLOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -75,7 +75,7 @@ endif
 .PHONY: compile-amd64
 compile-amd64:
 	$(WINDRES) src/BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/AMD64/*.cc) \
 	$(wildcard src/HEL/AMD64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/arm64-desktop.make b/dev/Boot/arm64-desktop.make
index 16341b21..d5ac561a 100644
--- a/dev/Boot/arm64-desktop.make
+++ b/dev/Boot/arm64-desktop.make
@@ -19,7 +19,7 @@ EMU=qemu-system-aarch64
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"ZKA\""
+NE_MODEL=-DkMachineModel="\"ZKA\""
 endif
 
 BIOS=OVMF.fd
@@ -43,9 +43,9 @@ REM=rm
 REM_FLAG=-f
 
 FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
+FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
 
 BOOT_LOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -73,7 +73,7 @@ endif
 .PHONY: compile
 compile:
 	$(RESCMD)
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/ARM64/*.cc) \
 	$(wildcard src/HEL/ARM64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/arm64-mobile.make b/dev/Boot/arm64-mobile.make
index 9ca37b89..2b6e0e2b 100644
--- a/dev/Boot/arm64-mobile.make
+++ b/dev/Boot/arm64-mobile.make
@@ -19,7 +19,7 @@ EMU=qemu-system-aarch64
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"ZKA\""
+NE_MODEL=-DkMachineModel="\"ZKA\""
 endif
 
 BIOS=OVMF.fd
@@ -44,9 +44,9 @@ REM=rm
 REM_FLAG=-f
 
 FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
+FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
 
 BOOT_LOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -74,7 +74,7 @@ endif
 .PHONY: compile
 compile:
 	$(RESCMD)
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/ARM64/*.cc) \
 	$(wildcard src/HEL/ARM64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc
index 4b7dfdfb..ddfa1018 100644
--- a/dev/Boot/src/BootThread.cc
+++ b/dev/Boot/src/BootThread.cc
@@ -47,21 +47,21 @@ namespace Boot
 			if (!header_ptr || !opt_header_ptr)
 				return;
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 			if (header_ptr->mMachine != kPeMachineAMD64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
 				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 			if (header_ptr->mMachine != kPeMachineARM64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
 				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
-#endif // __ZKA_AMD64__ || __ZKA_ARM64__
+#endif // __NE_AMD64__ || __NE_ARM64__
 
 			if (opt_header_ptr->mSubsystem != kZKASubsystem)
 			{
@@ -119,7 +119,7 @@ namespace Boot
 					if (handover_struc->HandoverMagic != kHandoverMagic &&
 						handover_struc->HandoverType != HEL::kTypeKernel)
 					{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 						if (handover_struc->HandoverArch != HEL::kArchAMD64)
 						{
 							fb_render_string("BootZ: Not an handover header, bad CPU...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
@@ -127,7 +127,7 @@ namespace Boot
 						}
 #endif
 
-#ifdef __ZKA_ARM64__
+#ifdef __NE_ARM64__
 						if (handover_struc->HandoverArch != HEL::kArchARM64)
 						{
 							fb_render_string("BootZ: Not an handover header, bad CPU...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
diff --git a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
index 3243e482..f8aa38d9 100644
--- a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
@@ -145,7 +145,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	FB::fb_clear_video();
 
-	FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2);
+	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
 
 	fb_clear();
 
@@ -186,7 +186,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	for (; struct_ptr[lookup_index].Kind != EfiMemoryType::EfiConventionalMemory; ++lookup_index)
 	{
-		ZKA_UNUSED(0);
+		NE_UNUSED(0);
 	}
 
 	kDefaultMemoryMap = lookup_index;
@@ -247,7 +247,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 			FB::fb_clear_video();
 
-			FBDrawBitMapInRegion(zka_has_disk, ZKA_HAS_DISK_WIDTH, ZKA_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_HAS_DISK_HEIGHT) / 2);
+			FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2);
 
 			fb_clear();
 		}
@@ -306,7 +306,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 	else
 	{
 		fb_init();
-		FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
+		FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 
 		EFI::Stop();
 	}
diff --git a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
index 71777528..f7e9d9bc 100644
--- a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
+++ b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __ZKA_COREBOOT__
+#ifdef __NE_COREBOOT__
 
 .section .boot_hdr
 .align 4
@@ -37,4 +37,4 @@ bootloader_start:
     bl      bootloader_main             
     ret                                 
 
-#endif // __ZKA_COREBOOT__
\ No newline at end of file
+#endif // __NE_COREBOOT__
\ No newline at end of file
diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
index 0e53c99d..adc5cf40 100644
--- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
@@ -142,7 +142,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	FB::fb_clear_video();
 
-	FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2);
+	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
 
 	fb_clear();
 
diff --git a/dev/Kernel/ArchKit/ArchKit.h b/dev/Kernel/ArchKit/ArchKit.h
index 7a0fbbcf..8c52af95 100644
--- a/dev/Kernel/ArchKit/ArchKit.h
+++ b/dev/Kernel/ArchKit/ArchKit.h
@@ -12,13 +12,13 @@
 
 #include <FirmwareKit/Handover.h>
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 #include <HALKit/AMD64/Paging.h>
 #include <HALKit/AMD64/Hypervisor.h>
 #include <HALKit/AMD64/Processor.h>
-#elif defined(__ZKA_POWER64__)
+#elif defined(__NE_POWER64__)
 #include <HALKit/POWER/Processor.h>
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 #include <HALKit/ARM64/Processor.h>
 #else
 #error !!! unknown architecture !!!
diff --git a/dev/Kernel/CompilerKit/Detail.h b/dev/Kernel/CompilerKit/Detail.h
index 29620aae..ecc50360 100644
--- a/dev/Kernel/CompilerKit/Detail.h
+++ b/dev/Kernel/CompilerKit/Detail.h
@@ -10,18 +10,18 @@
 #include <NewKit/Defines.h>
 #endif // ifdef __NEOSKRNL__
 
-#define ZKA_COPY_DELETE(KLASS)               \
+#define NE_COPY_DELETE(KLASS)               \
 	KLASS& operator=(const KLASS&) = delete; \
 	KLASS(const KLASS&)			   = delete;
 
-#define ZKA_COPY_DEFAULT(KLASS)               \
+#define NE_COPY_DEFAULT(KLASS)               \
 	KLASS& operator=(const KLASS&) = default; \
 	KLASS(const KLASS&)			   = default;
 
-#define ZKA_MOVE_DELETE(KLASS)          \
+#define NE_MOVE_DELETE(KLASS)          \
 	KLASS& operator=(KLASS&&) = delete; \
 	KLASS(KLASS&&)			  = delete;
 
-#define ZKA_MOVE_DEFAULT(KLASS)          \
+#define NE_MOVE_DEFAULT(KLASS)          \
 	KLASS& operator=(KLASS&&) = default; \
 	KLASS(KLASS&&)			  = default;
diff --git a/dev/Kernel/FSKit/IndexableProperty.h b/dev/Kernel/FSKit/IndexableProperty.h
index 9192994f..6a01fcaa 100644
--- a/dev/Kernel/FSKit/IndexableProperty.h
+++ b/dev/Kernel/FSKit/IndexableProperty.h
@@ -38,7 +38,7 @@ namespace Kernel
 
 			~IndexableProperty() override = default;
 
-			ZKA_COPY_DEFAULT(IndexableProperty);
+			NE_COPY_DEFAULT(IndexableProperty);
 
 		public:
 			IndexProperty& Leak() noexcept;
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h
index fc2351de..82cce783 100644
--- a/dev/Kernel/FSKit/NeFS.h
+++ b/dev/Kernel/FSKit/NeFS.h
@@ -262,7 +262,7 @@ namespace Kernel
 		~NeFileSystemParser()		  = default;
 
 	public:
-		ZKA_COPY_DEFAULT(NeFileSystemParser);
+		NE_COPY_DEFAULT(NeFileSystemParser);
 
 	public:
 		/// @brief Creates a new fork inside the NeFS  partition.
@@ -356,7 +356,7 @@ namespace Kernel
 
 		~NeFileSystemJournal() = default;
 
-		ZKA_COPY_DEFAULT(NeFileSystemJournal);
+		NE_COPY_DEFAULT(NeFileSystemJournal);
 
 		Bool CreateJournal(NeFileSystemParser* parser)
 		{
diff --git a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h
index b30511f6..4f4288b6 100644
--- a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h
+++ b/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h
@@ -23,7 +23,7 @@ namespace Firmware::Detail::CoreBoot
 		const UInt32 fRevision;		// firmware revision
 		const UInt32 fStartAddress; // start address (master/slave(s) thread)
 
-#ifdef ZKA_IS_EXTENDED_COREBOOT
+#ifdef NE_IS_EXTENDED_COREBOOT
 		const UIntPtr fMasterStructure;		   // master structure for MP/PM and device tree and such (ARM)
 		const UIntPtr fMasterStructureVersion; // master structure version.
 #endif
diff --git a/dev/Kernel/FirmwareKit/EPM.h b/dev/Kernel/FirmwareKit/EPM.h
index 244a44b8..b35e4f49 100644
--- a/dev/Kernel/FirmwareKit/EPM.h
+++ b/dev/Kernel/FirmwareKit/EPM.h
@@ -38,10 +38,10 @@
 /* @brief Invalid magic for EPM */
 #define kEPMMagicError "EPM??"
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 #define kEPMMagic kEPMMagic86
 #else
-#ifdef __ZKA_ARM64__
+#ifdef __NE_ARM64__
 #define kEPMMagic kEPMMagicARM
 #else
 #define kEPMMagic kEPMMagicError
diff --git a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm b/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
index 75a2b537..4776a155 100644
--- a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
+++ b/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
@@ -14,8 +14,8 @@
 %define kInterruptId 50
 
 %macro IntExp 1
-global __ZKA_INT_%1
-__ZKA_INT_%1:
+global __NE_INT_%1
+__NE_INT_%1:
     cld
 
     mov al, 0x20
@@ -32,8 +32,8 @@ __ZKA_INT_%1:
 %endmacro
 
 %macro IntNormal 1
-global __ZKA_INT_%1
-__ZKA_INT_%1:
+global __NE_INT_%1
+__NE_INT_%1:
     cld
 
     mov al, 0x20
@@ -60,7 +60,7 @@ extern idt_handle_breakpoint
 
 section .text
 
-__ZKA_INT_0:
+__NE_INT_0:
     cld
 
     mov al, 0x20
@@ -70,7 +70,7 @@ __ZKA_INT_0:
 
     o64 iret
 
-__ZKA_INT_1:
+__NE_INT_1:
     cld
 
     mov al, 0x20
@@ -84,7 +84,7 @@ __ZKA_INT_1:
 
     o64 iret
 
-__ZKA_INT_2:
+__NE_INT_2:
     cld
 
     mov al, 0x20
@@ -99,7 +99,7 @@ __ZKA_INT_2:
     o64 iret
 
 ;; @brief Triggers a breakpoint and freeze the process. RIP is also fetched.
-__ZKA_INT_3:
+__NE_INT_3:
     cld
 
     mov al, 0x20
@@ -113,7 +113,7 @@ __ZKA_INT_3:
 
     o64 iret
 
-__ZKA_INT_4:
+__NE_INT_4:
     cld
 
     mov al, 0x20
@@ -128,7 +128,7 @@ __ZKA_INT_4:
 
     o64 iret
 
-__ZKA_INT_5:
+__NE_INT_5:
     cld
 
     mov al, 0x20
@@ -139,7 +139,7 @@ __ZKA_INT_5:
     o64 iret
 
 ;; Invalid opcode interrupt
-__ZKA_INT_6:
+__NE_INT_6:
     cld
 
     mov al, 0x20
@@ -153,7 +153,7 @@ __ZKA_INT_6:
 
     o64 iret
 
-__ZKA_INT_7:
+__NE_INT_7:
     cld
 
     mov al, 0x20
@@ -168,7 +168,7 @@ __ZKA_INT_7:
     o64 iret
 
 ;; Invalid opcode interrupt
-__ZKA_INT_8:
+__NE_INT_8:
     cld
 
     mov al, 0x20
@@ -189,7 +189,7 @@ IntExp   11
 
 IntExp 12
 
-__ZKA_INT_13:
+__NE_INT_13:
     cld
 
     mov al, 0x20
@@ -204,7 +204,7 @@ __ZKA_INT_13:
     
     o64 iret
 
-__ZKA_INT_14:
+__NE_INT_14:
     cld
 
     mov al, 0x20
@@ -241,7 +241,7 @@ IntNormal 31
 
 [extern idt_handle_scheduler]
 
-__ZKA_INT_32:
+__NE_INT_32:
     cld
 
     mov al, 0x20
@@ -281,7 +281,7 @@ IntNormal 49
 [extern hal_system_call_enter]
 [extern hal_kernel_call_enter]
 
-__ZKA_INT_50:
+__NE_INT_50:
     cld
 
     mov al, 0x20
@@ -301,7 +301,7 @@ __ZKA_INT_50:
 
     o64 iret
 
-__ZKA_INT_51:
+__NE_INT_51:
     cld
 
     mov al, 0x20
@@ -404,6 +404,6 @@ section .data
 kInterruptVectorTable:
     %assign i 0
     %rep 256
-        dq __ZKA_INT_%+i
+        dq __NE_INT_%+i
     %assign i i+1
     %endrep
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
index e982714d..dbac3e72 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
@@ -68,7 +68,7 @@ EXTERN_C void hal_init_platform(
 	STATIC CONST auto kGDTEntriesCount = 6;
 
 	/* GDT, mostly descriptors for user and kernel segments. */
-	STATIC Kernel::HAL::Detail::ZKA_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = {
+	STATIC Kernel::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = {
 		{.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0},   // Null entry
 		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code
 		{.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data
@@ -80,7 +80,7 @@ EXTERN_C void hal_init_platform(
 	Kernel::HAL::RegisterGDT gdt_reg;
 
 	gdt_reg.Base  = reinterpret_cast<Kernel::UIntPtr>(kGDTArray);
-	gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::ZKA_GDT_ENTRY) * kGDTEntriesCount) - 1;
+	gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1;
 
 	//! GDT will load hal_read_init after it successfully loads the segments.
 	Kernel::HAL::GDTLoader gdt_loader;
diff --git a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
index 97bf07f8..149fdceb 100644
--- a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
+++ b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
@@ -17,7 +17,7 @@ namespace Kernel::HAL
 	/***********************************************************************************/
 	/// \brief Page store type.
 	/***********************************************************************************/
-	struct ZKA_PAGE_STORE final
+	struct NE_PAGE_STORE final
 	{
 		struct
 		{
@@ -43,9 +43,9 @@ namespace Kernel::HAL
 			return pte && pte->User;
 		}
 
-		static ZKA_PAGE_STORE& The()
+		static NE_PAGE_STORE& The()
 		{
-			static ZKA_PAGE_STORE the;
+			static NE_PAGE_STORE the;
 			return the;
 		}
 	};
@@ -62,7 +62,7 @@ namespace Kernel::HAL
 		kcout << (pte->User ? "User" : "Not User") << endl;
 	}
 
-	STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, ZKA_PTE* pt_entry, ZKA_PDE* pd_entry);
+	STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, NE_PTE* pt_entry, NE_PDE* pd_entry);
 
 	/***********************************************************************************/
 	/// @brief Maps or allocates a page from virtual_address.
@@ -83,7 +83,7 @@ namespace Kernel::HAL
 
 		UInt64 cr3 = (UInt64)hal_read_cr3();
 
-		ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The();
+		NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
 
 		// Extract the indices from the virtual address
 		UInt64 pml4_index = ((UIntPtr)virtual_address >> 39) & cPmlIndexMask;
@@ -118,7 +118,7 @@ namespace Kernel::HAL
 		UInt64 pt_entry = (pt_base + pt_index * cPmlEntrySize);
 
 		// Lastly, grab the pte entry.
-		ZKA_PDE* pde_struct = reinterpret_cast<ZKA_PDE*>(pt_base);
+		NE_PDE* pde_struct = reinterpret_cast<NE_PDE*>(pt_base);
 
 		return mmi_map_page_table_entry(virtual_address, flags, pde_struct->fEntries[pt_entry], pde_struct);
 	}
@@ -127,7 +127,7 @@ namespace Kernel::HAL
 	/// @brief Maps flags for a specific pte.
 	/// @internal Internal function.
 	/***********************************************************************************/
-	STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, ZKA_PTE* pt_entry, ZKA_PDE* pd_entry)
+	STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, NE_PTE* pt_entry, NE_PDE* pd_entry)
 	{
 		if (!pt_entry)
 			return 1;
@@ -153,7 +153,7 @@ namespace Kernel::HAL
 
 		mmi_page_status(pt_entry);
 
-		ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The();
+		NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
 
 		// Update Internal store.
 
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Device.cc b/dev/Kernel/HALKit/AMD64/PCI/Device.cc
index d02c7e22..1f9f420a 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Device.cc
+++ b/dev/Kernel/HALKit/AMD64/PCI/Device.cc
@@ -7,7 +7,7 @@
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/PCI/Device.h>
 
-Kernel::UInt ZKA_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
+Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
 {
 	Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
 						  ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
@@ -19,7 +19,7 @@ Kernel::UInt ZKA_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort
 	return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData);
 }
 
-void ZKA_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
+void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun)
 {
 	Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) |
 						  ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) |
@@ -45,7 +45,7 @@ namespace Kernel::PCI
 
 	UInt Device::Read(UInt bar, Size sz)
 	{
-		ZKA_PCISetCfgTarget(bar, fBus, fDevice, fFunction);
+		NE_PCISetCfgTarget(bar, fBus, fDevice, fFunction);
 
 		if (sz == 4)
 			return HAL::rt_in32((UShort)PciConfigKind::ConfigData + (bar & 3));
@@ -59,7 +59,7 @@ namespace Kernel::PCI
 
 	void Device::Write(UInt bar, UIntPtr data, Size sz)
 	{
-		ZKA_PCISetCfgTarget(bar, fBus, fDevice, fFunction);
+		NE_PCISetCfgTarget(bar, fBus, fDevice, fFunction);
 
 		if (sz == 4)
 			HAL::rt_out32((UShort)PciConfigKind::ConfigData + (fBar & 3), (UInt)data);
@@ -71,37 +71,37 @@ namespace Kernel::PCI
 
 	UShort Device::DeviceId()
 	{
-		return (UShort)(ZKA_PCIReadRaw(0x0 >> 16, fBus, fDevice, fFunction));
+		return (UShort)(NE_PCIReadRaw(0x0 >> 16, fBus, fDevice, fFunction));
 	}
 
 	UShort Device::VendorId()
 	{
-		return (UShort)(ZKA_PCIReadRaw(0x0, fBus, fDevice, fFunction) >> 16);
+		return (UShort)(NE_PCIReadRaw(0x0, fBus, fDevice, fFunction) >> 16);
 	}
 
 	UShort Device::InterfaceId()
 	{
-		return (UShort)(ZKA_PCIReadRaw(0x0, fBus, fDevice, fFunction) >> 16);
+		return (UShort)(NE_PCIReadRaw(0x0, fBus, fDevice, fFunction) >> 16);
 	}
 
 	UChar Device::Class()
 	{
-		return (UChar)(ZKA_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 24);
+		return (UChar)(NE_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 24);
 	}
 
 	UChar Device::Subclass()
 	{
-		return (UChar)(ZKA_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 16);
+		return (UChar)(NE_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 16);
 	}
 
 	UChar Device::ProgIf()
 	{
-		return (UChar)(ZKA_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 8);
+		return (UChar)(NE_PCIReadRaw(0x08, fBus, fDevice, fFunction) >> 8);
 	}
 
 	UChar Device::HeaderType()
 	{
-		return (UChar)(ZKA_PCIReadRaw(0xC, fBus, fDevice, fFunction) >> 16);
+		return (UChar)(NE_PCIReadRaw(0xC, fBus, fDevice, fFunction) >> 16);
 	}
 
 	void Device::EnableMmio(UInt32 bar_in)
@@ -118,7 +118,7 @@ namespace Kernel::PCI
 
 	UIntPtr Device::Bar(UInt32 bar_in)
 	{
-		UInt32 bar = ZKA_PCIReadRaw(bar_in, fBus, fDevice, fFunction);
+		UInt32 bar = NE_PCIReadRaw(bar_in, fBus, fDevice, fFunction);
 		return bar;
 	}
 
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc
index f0289cdf..1cbdf1ba 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc
+++ b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc
@@ -11,11 +11,11 @@ namespace Kernel::PCI
 	Iterator::Iterator(const Types::PciDeviceKind& type)
 	{
 		// probe devices.
-		for (int bus = 0; bus < ZKA_BUS_COUNT; ++bus)
+		for (int bus = 0; bus < NE_BUS_COUNT; ++bus)
 		{
-			for (int device = 0; device < ZKA_DEVICE_COUNT; ++device)
+			for (int device = 0; device < NE_DEVICE_COUNT; ++device)
 			{
-				for (int function = 0; function < ZKA_FUNCTION_COUNT; ++function)
+				for (int function = 0; function < NE_FUNCTION_COUNT; ++function)
 				{
 					auto bar = 0x00;
 
diff --git a/dev/Kernel/HALKit/AMD64/Paging.h b/dev/Kernel/HALKit/AMD64/Paging.h
index e58d2466..abba54b1 100644
--- a/dev/Kernel/HALKit/AMD64/Paging.h
+++ b/dev/Kernel/HALKit/AMD64/Paging.h
@@ -42,7 +42,7 @@ EXTERN_C Kernel::VoidPtr hal_read_cr3(); // @brief Page table.
 namespace Kernel::HAL
 {
 	/// @brief Final page entry (Not PML, PDPT)
-	struct PACKED ZKA_PTE final
+	struct PACKED NE_PTE final
 	{
 		UInt64 Present : 1;
 		UInt64 Wr : 1;
@@ -83,9 +83,9 @@ namespace Kernel::HAL
 		}
 	} // namespace Detail
 
-	struct ZKA_PDE final
+	struct NE_PDE final
 	{
-		ZKA_PTE* ALIGN(kPageAlign) fEntries[kPageMax];
+		NE_PTE* ALIGN(kPageAlign) fEntries[kPageMax];
 	};
 
 	auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr;
@@ -94,6 +94,6 @@ namespace Kernel::HAL
 
 namespace Kernel
 {
-	typedef HAL::ZKA_PTE PTE;
-	typedef HAL::ZKA_PDE PDE;
+	typedef HAL::NE_PTE PTE;
+	typedef HAL::NE_PDE PDE;
 } // namespace Kernel
diff --git a/dev/Kernel/HALKit/AMD64/Processor.h b/dev/Kernel/HALKit/AMD64/Processor.h
index 311d2738..fdd872d9 100644
--- a/dev/Kernel/HALKit/AMD64/Processor.h
+++ b/dev/Kernel/HALKit/AMD64/Processor.h
@@ -260,7 +260,7 @@ namespace Kernel::HAL
 	namespace Detail
 	{
 		/* @brief TSS struct. */
-		struct ZKA_TSS final
+		struct NE_TSS final
 		{
 			UInt32 fReserved1;
 			UInt64 fRsp0;
@@ -283,7 +283,7 @@ namespace Kernel::HAL
 		  @brief Global descriptor table entry, either null, code or data.
 		*/
 
-		struct PACKED ZKA_GDT_ENTRY final
+		struct PACKED NE_GDT_ENTRY final
 		{
 			UInt16 fLimitLow;
 			UInt16 fBaseLow;
@@ -304,7 +304,7 @@ namespace Kernel::HAL
 
 		~APICController() = default;
 
-		ZKA_COPY_DEFAULT(APICController);
+		NE_COPY_DEFAULT(APICController);
 
 	public:
 		UInt32 Read(UInt32 reg) noexcept;
diff --git a/dev/Kernel/HALKit/AMD64/Storage/SATA.cc b/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
index a3b8992f..5db4dfc8 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/SATA.cc
@@ -81,7 +81,7 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented)
 
 	PCI::Iterator iterator(Types::PciDeviceKind::MassStorageController);
 
-	for (SizeT device_index = 0; device_index < ZKA_BUS_COUNT; ++device_index)
+	for (SizeT device_index = 0; device_index < NE_BUS_COUNT; ++device_index)
 	{
 		kPCIDevice = iterator[device_index].Leak(); // And then leak the reference.
 
diff --git a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc
index 0991fd37..d3c4f985 100644
--- a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc
+++ b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc
@@ -15,7 +15,7 @@ namespace Kernel::HAL
 	typedef UInt32 PageTableIndex;
 
 	/// \brief Page store type.
-	struct ZKA_PAGE_STORE final
+	struct NE_PAGE_STORE final
 	{
 		struct
 		{
@@ -26,9 +26,9 @@ namespace Kernel::HAL
 
 		Bool fStoreOp{No}; // Store operation in progress.
 
-		static ZKA_PAGE_STORE& The()
+		static NE_PAGE_STORE& The()
 		{
-			static ZKA_PAGE_STORE the;
+			static NE_PAGE_STORE the;
 			return the;
 		}
 	};
@@ -51,7 +51,7 @@ namespace Kernel::HAL
 			!flags)
 			return 0;
 
-		ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The();
+		NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
 
 		while (page_store.fStoreOp)
 			;
@@ -71,7 +71,7 @@ namespace Kernel::HAL
 	/// @internal Internal function.
 	STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, PTE* pt_entry)
 	{
-		ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The();
+		NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
 
 		// Update Internal store.
 
diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
index ff1dd448..87a6123a 100644
--- a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
+++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
@@ -12,13 +12,13 @@ namespace Kernel
 	/// Wakes up thread from the hang state.
 	Void mp_wakeup_thread(HAL::StackFrame* stack)
 	{
-		ZKA_UNUSED(stack);
+		NE_UNUSED(stack);
 	}
 
 	/// @brief makes the thread sleep on a loop.
 	/// hooks and hangs thread to prevent code from executing.
 	Void mp_hang_thread(HAL::StackFrame* stack)
 	{
-		ZKA_UNUSED(stack);
+		NE_UNUSED(stack);
 	}
 } // namespace Kernel
diff --git a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc
index 6b4d7ab4..30e7cef0 100644
--- a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc
+++ b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef ZKA_USE_MBCI_FLASH
+#ifdef NE_USE_MBCI_FLASH
 
 #include <NewKit/Defines.h>
 #include <ArchKit/ArchKit.h>
@@ -81,4 +81,4 @@ namespace Kernel
 	}
 } // namespace Kernel
 
-#endif // if ZKA_USE_MBCI_FLASH
+#endif // if NE_USE_MBCI_FLASH
diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h
index 0f02ecb1..d51e8d4d 100644
--- a/dev/Kernel/KernelKit/DebugOutput.h
+++ b/dev/Kernel/KernelKit/DebugOutput.h
@@ -35,7 +35,7 @@ namespace Kernel
 	inline TerminalDevice hex_number(const Long& x);
 
 	// @brief Emulates a VT100 terminal.
-	class TerminalDevice final ZKA_DEVICE<const Char*>
+	class TerminalDevice final NE_DEVICE<const Char*>
 	{
 	public:
 		TerminalDevice(void (*print)(const Char*), void (*gets)(const Char*))
@@ -52,7 +52,7 @@ namespace Kernel
 			return ("TerminalDevice");
 		}
 
-		ZKA_COPY_DEFAULT(TerminalDevice);
+		NE_COPY_DEFAULT(TerminalDevice);
 
 		STATIC TerminalDevice The() noexcept;
 	};
diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/Kernel/KernelKit/DeviceMgr.h
index 9e867561..c6c2bb32 100644
--- a/dev/Kernel/KernelKit/DeviceMgr.h
+++ b/dev/Kernel/KernelKit/DeviceMgr.h
@@ -9,7 +9,7 @@
  Revision History:
 
 	 31/01/24: Add kDeviceCnt (amlel)
-		15/11/24: Add ZKA_DEVICE macro, to inherit from device object.
+		15/11/24: Add NE_DEVICE macro, to inherit from device object.
 
  ------------------------------------------- */
 
@@ -24,7 +24,7 @@
 
 #define kDeviceMgrRootDirPath "/Devices/"
 
-#define ZKA_DEVICE : public ::Kernel::IDeviceObject
+#define NE_DEVICE : public ::Kernel::IDeviceObject
 
 // Last Rev: Wed, Apr  3, 2024  9:09:41 AM
 
diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/Kernel/KernelKit/DriveMgr.h
index e28e7cb7..e8e6b95f 100644
--- a/dev/Kernel/KernelKit/DriveMgr.h
+++ b/dev/Kernel/KernelKit/DriveMgr.h
@@ -89,7 +89,7 @@ namespace Kernel
 		explicit MountpointInterface() = default;
 		~MountpointInterface()		   = default;
 
-		ZKA_COPY_DEFAULT(MountpointInterface);
+		NE_COPY_DEFAULT(MountpointInterface);
 
 	public:
 		DriveTrait& A()
diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h
index 942ff392..b3430557 100644
--- a/dev/Kernel/KernelKit/FileMgr.h
+++ b/dev/Kernel/KernelKit/FileMgr.h
@@ -87,7 +87,7 @@ namespace Kernel
 		virtual ~IFilesystemMgr() = default;
 
 	public:
-		ZKA_COPY_DEFAULT(IFilesystemMgr);
+		NE_COPY_DEFAULT(IFilesystemMgr);
 
 	public:
 		/// @brief Mounts a new filesystem into an active state.
@@ -153,7 +153,7 @@ namespace Kernel
 		~NeFileSystemMgr() override;
 
 	public:
-		ZKA_COPY_DEFAULT(NeFileSystemMgr);
+		NE_COPY_DEFAULT(NeFileSystemMgr);
 
 	public:
 		NodePtr Create(const Char* path) override;
diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/Kernel/KernelKit/HardwareThreadScheduler.h
index 56fc57ff..c805768b 100644
--- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h
+++ b/dev/Kernel/KernelKit/HardwareThreadScheduler.h
@@ -51,7 +51,7 @@ namespace Kernel
 		~HardwareThread();
 
 	public:
-		ZKA_COPY_DEFAULT(HardwareThread)
+		NE_COPY_DEFAULT(HardwareThread)
 
 	public:
 		operator bool();
@@ -97,7 +97,7 @@ namespace Kernel
 	public:
 		explicit HardwareThreadScheduler();
 		~HardwareThreadScheduler();
-		ZKA_COPY_DEFAULT(HardwareThreadScheduler);
+		NE_COPY_DEFAULT(HardwareThreadScheduler);
 
 	public:
 		HAL::StackFramePtr Leak() noexcept;
diff --git a/dev/Kernel/KernelKit/IDylibObject.h b/dev/Kernel/KernelKit/IDylibObject.h
index a7602be6..d3be6432 100644
--- a/dev/Kernel/KernelKit/IDylibObject.h
+++ b/dev/Kernel/KernelKit/IDylibObject.h
@@ -12,7 +12,7 @@
 #include <NewKit/Defines.h>
 #include <CompilerKit/CompilerKit.h>
 
-#define ZKA_DLL_OBJECT : public IDylibObject
+#define NE_DLL_OBJECT : public IDylibObject
 
 namespace Kernel
 {
@@ -34,7 +34,7 @@ namespace Kernel
 			}
 		};
 
-		ZKA_COPY_DEFAULT(IDylibObject);
+		NE_COPY_DEFAULT(IDylibObject);
 
 		virtual DLL_TRAITS** GetAddressOf() = 0;
 		virtual DLL_TRAITS*	 Get()			= 0;
diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/Kernel/KernelKit/IPEFDylibObject.h
index 68493c86..14b4fd62 100644
--- a/dev/Kernel/KernelKit/IPEFDylibObject.h
+++ b/dev/Kernel/KernelKit/IPEFDylibObject.h
@@ -22,14 +22,14 @@ namespace Kernel
 	 * @brief Shared Library class
 	 * Load library from this class
 	 */
-	class IPEFDylibObject final ZKA_DLL_OBJECT
+	class IPEFDylibObject final NE_DLL_OBJECT
 	{
 	public:
 		explicit IPEFDylibObject() = default;
 		~IPEFDylibObject()		   = default;
 
 	public:
-		ZKA_COPY_DEFAULT(IPEFDylibObject);
+		NE_COPY_DEFAULT(IPEFDylibObject);
 
 	private:
 		DLL_TRAITS* fMounted{nullptr};
diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h
index c2c9a595..1cccb2b3 100644
--- a/dev/Kernel/KernelKit/LoaderInterface.h
+++ b/dev/Kernel/KernelKit/LoaderInterface.h
@@ -21,7 +21,7 @@ namespace Kernel
 		explicit LoaderInterface() = default;
 		virtual ~LoaderInterface() = default;
 
-		ZKA_COPY_DEFAULT(LoaderInterface);
+		NE_COPY_DEFAULT(LoaderInterface);
 
 	public:
 		virtual _Output ErrorOr<VoidPtr> GetBlob()												= 0;
diff --git a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
index 7eb5b405..a6fc8c79 100644
--- a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -20,7 +20,7 @@ namespace Kernel
 	{
 		switch (sizeof(T))
 		{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 		case 4:
 			return HAL::rt_in32(fPorts[index].Leak());
 		case 2:
@@ -39,7 +39,7 @@ namespace Kernel
 	{
 		switch (sizeof(T))
 		{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 		case 4:
 			HAL::rt_out32(fPorts[index].Leak(), value);
 		case 2:
diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/Kernel/KernelKit/PCI/Iterator.h
index 012d5f00..d5044c1e 100644
--- a/dev/Kernel/KernelKit/PCI/Iterator.h
+++ b/dev/Kernel/KernelKit/PCI/Iterator.h
@@ -13,9 +13,9 @@
 #include <NewKit/Defines.h>
 #include <NewKit/Ref.h>
 
-#define ZKA_BUS_COUNT	   (256)
-#define ZKA_DEVICE_COUNT   (33)
-#define ZKA_FUNCTION_COUNT (8)
+#define NE_BUS_COUNT	   (256)
+#define NE_DEVICE_COUNT   (33)
+#define NE_FUNCTION_COUNT (8)
 
 namespace Kernel::PCI
 {
@@ -36,7 +36,7 @@ namespace Kernel::PCI
 		Ref<PCI::Device> operator[](const Size& sz);
 
 	private:
-		Array<PCI::Device, ZKA_BUS_COUNT> fDevices;
+		Array<PCI::Device, NE_BUS_COUNT> fDevices;
 	};
 } // namespace Kernel::PCI
 
diff --git a/dev/Kernel/KernelKit/PEFCodeMgr.h b/dev/Kernel/KernelKit/PEFCodeMgr.h
index 25fb7f9b..f6772346 100644
--- a/dev/Kernel/KernelKit/PEFCodeMgr.h
+++ b/dev/Kernel/KernelKit/PEFCodeMgr.h
@@ -35,7 +35,7 @@ namespace Kernel
 		~PEFLoader() override;
 
 	public:
-		ZKA_COPY_DEFAULT(PEFLoader);
+		NE_COPY_DEFAULT(PEFLoader);
 
 	public:
 		const Char* Path() override;
diff --git a/dev/Kernel/KernelKit/Semaphore.h b/dev/Kernel/KernelKit/Semaphore.h
index 7d149027..67b4b540 100644
--- a/dev/Kernel/KernelKit/Semaphore.h
+++ b/dev/Kernel/KernelKit/Semaphore.h
@@ -35,7 +35,7 @@ namespace Kernel
 		bool LockOrWait(UserProcess& process, TimerInterface* timer);
 
 	public:
-		ZKA_COPY_DEFAULT(Semaphore);
+		NE_COPY_DEFAULT(Semaphore);
 
 	private:
 		UserProcessRef fLockingProcess;
diff --git a/dev/Kernel/KernelKit/Timer.h b/dev/Kernel/KernelKit/Timer.h
index 2fa2dfa6..d7b38157 100644
--- a/dev/Kernel/KernelKit/Timer.h
+++ b/dev/Kernel/KernelKit/Timer.h
@@ -22,7 +22,7 @@ namespace Kernel
 		virtual ~TimerInterface() = default;
 
 	public:
-		ZKA_COPY_DEFAULT(TimerInterface);
+		NE_COPY_DEFAULT(TimerInterface);
 
 	public:
 		virtual BOOL Wait() noexcept;
@@ -35,7 +35,7 @@ namespace Kernel
 		~SoftwareTimer() override;
 
 	public:
-		ZKA_COPY_DEFAULT(SoftwareTimer);
+		NE_COPY_DEFAULT(SoftwareTimer);
 
 	public:
 		BOOL Wait() noexcept override;
@@ -52,7 +52,7 @@ namespace Kernel
 		~HardwareTimer() override;
 
 	public:
-		ZKA_COPY_DEFAULT(HardwareTimer);
+		NE_COPY_DEFAULT(HardwareTimer);
 
 	public:
 		BOOL Wait() noexcept override;
diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h
index 2fb832d4..67a4c105 100644
--- a/dev/Kernel/KernelKit/User.h
+++ b/dev/Kernel/KernelKit/User.h
@@ -50,7 +50,7 @@ namespace Kernel
 		~User();
 
 	public:
-		ZKA_COPY_DEFAULT(User);
+		NE_COPY_DEFAULT(User);
 
 	public:
 		bool operator==(const User& lhs);
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h
index 013f903e..a08278f2 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.h
+++ b/dev/Kernel/KernelKit/UserProcessScheduler.h
@@ -153,7 +153,7 @@ namespace Kernel
 		~UserProcess();
 
 	public:
-		ZKA_COPY_DEFAULT(UserProcess);
+		NE_COPY_DEFAULT(UserProcess);
 
 	public:
 		Char			   Name[kProcessNameLen] = {"Process"};
@@ -261,7 +261,7 @@ namespace Kernel
 		explicit UserProcessTeam();
 		~UserProcessTeam() = default;
 
-		ZKA_COPY_DEFAULT(UserProcessTeam);
+		NE_COPY_DEFAULT(UserProcessTeam);
 
 		Array<UserProcess, kSchedProcessLimitPerTeam>& AsArray();
 		Ref<UserProcess>&							   AsRef();
@@ -288,7 +288,7 @@ namespace Kernel
 		explicit UserProcessScheduler()	 = default;
 		~UserProcessScheduler() override = default;
 
-		ZKA_COPY_DEFAULT(UserProcessScheduler)
+		NE_COPY_DEFAULT(UserProcessScheduler)
 
 			 operator bool();
 		bool operator!();
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.inl b/dev/Kernel/KernelKit/UserProcessScheduler.inl
index 6f1f3f4a..be6025d5 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.inl
+++ b/dev/Kernel/KernelKit/UserProcessScheduler.inl
@@ -28,7 +28,7 @@ namespace Kernel
 			{
 				this->UsedMemory -= entry->MemoryEntrySize;
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 				auto pd = hal_read_cr3();
 				hal_write_cr3(this->VMRegister);
 
diff --git a/dev/Kernel/NewKit/Json.h b/dev/Kernel/NewKit/Json.h
index 250bc716..104f62aa 100644
--- a/dev/Kernel/NewKit/Json.h
+++ b/dev/Kernel/NewKit/Json.h
@@ -42,7 +42,7 @@ namespace Kernel
 
 		~JSON() = default;
 
-		ZKA_COPY_DEFAULT(JSON);
+		NE_COPY_DEFAULT(JSON);
 
 		const Bool& IsUndefined()
 		{
diff --git a/dev/Kernel/NewKit/KString.h b/dev/Kernel/NewKit/KString.h
index 350623d7..ee7d6b95 100644
--- a/dev/Kernel/NewKit/KString.h
+++ b/dev/Kernel/NewKit/KString.h
@@ -50,7 +50,7 @@ namespace Kernel
 			}
 		}
 
-		ZKA_COPY_DEFAULT(KString);
+		NE_COPY_DEFAULT(KString);
 
 		Char*		Data();
 		const Char* CData() const;
diff --git a/dev/Kernel/NewKit/Macros.h b/dev/Kernel/NewKit/Macros.h
index 236201be..02005988 100644
--- a/dev/Kernel/NewKit/Macros.h
+++ b/dev/Kernel/NewKit/Macros.h
@@ -54,9 +54,9 @@
 #define ATTRIBUTE(X) __attribute__((X))
 #endif // #ifndef ATTRIBUTE
 
-#ifndef __ZKA_VER__
-#define __ZKA_VER__ (2024)
-#endif // !__ZKA_VER__
+#ifndef __NE_VER__
+#define __NE_VER__ (2024)
+#endif // !__NE_VER__
 
 #ifndef EXTERN
 #define EXTERN extern
@@ -114,19 +114,19 @@
 #define CONST const
 
 #define STRINGIFY(X)  #X
-#define ZKA_UNUSED(X) ((Kernel::Void)X)
+#define NE_UNUSED(X) ((Kernel::Void)X)
 
 #ifndef RGB
 #define RGB(R, G, B) (Kernel::UInt32)(R | G << 0x8 | B << 0x10)
 #endif // !RGB
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 #define dbg_break_point() asm volatile("int $3")
 #else
 #define dbg_break_point() ((void)0)
 #endif
 
-#define rtl_deduce_endianess(address, value)                    \
+#define RTL_ENDIAN(address, value)                    \
 	(((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \
 		 ? (Kernel::Endian::kEndianBig)                         \
 		 : (Kernel::Endian::kEndianLittle))
diff --git a/dev/Kernel/NewKit/MutableArray.h b/dev/Kernel/NewKit/MutableArray.h
index 36159212..ef315193 100644
--- a/dev/Kernel/NewKit/MutableArray.h
+++ b/dev/Kernel/NewKit/MutableArray.h
@@ -164,7 +164,7 @@ namespace Kernel
 		explicit MutableArray() = default;
 		virtual ~MutableArray() = default;
 
-		ZKA_COPY_DEFAULT(MutableArray)
+		NE_COPY_DEFAULT(MutableArray)
 
 	public:
 		Boolean Add(const T val)
diff --git a/dev/Kernel/NewKit/Variant.h b/dev/Kernel/NewKit/Variant.h
index c603773f..be54af71 100644
--- a/dev/Kernel/NewKit/Variant.h
+++ b/dev/Kernel/NewKit/Variant.h
@@ -28,7 +28,7 @@ namespace Kernel
 		explicit Variant() = delete;
 
 	public:
-		ZKA_COPY_DEFAULT(Variant);
+		NE_COPY_DEFAULT(Variant);
 
 		~Variant() = default;
 
diff --git a/dev/Kernel/StorageKit/AHCI.h b/dev/Kernel/StorageKit/AHCI.h
index 5641898a..a0182273 100644
--- a/dev/Kernel/StorageKit/AHCI.h
+++ b/dev/Kernel/StorageKit/AHCI.h
@@ -12,7 +12,7 @@
 
 namespace Kernel
 {
-	class AHCIDeviceInterface ZKA_DEVICE<MountpointInterface*>
+	class AHCIDeviceInterface NE_DEVICE<MountpointInterface*>
 	{
 	public:
 		explicit AHCIDeviceInterface(void (*Out)(MountpointInterface* outpacket),
diff --git a/dev/Kernel/StorageKit/NVME.h b/dev/Kernel/StorageKit/NVME.h
index f4a8393a..f2a780dc 100644
--- a/dev/Kernel/StorageKit/NVME.h
+++ b/dev/Kernel/StorageKit/NVME.h
@@ -11,7 +11,7 @@
 
 namespace Kernel
 {
-	class NVMEDeviceInterface final ZKA_DEVICE<MountpointInterface*>
+	class NVMEDeviceInterface final NE_DEVICE<MountpointInterface*>
 	{
 	public:
 		explicit NVMEDeviceInterface(Void (*out)(MountpointInterface* out_packet),
@@ -21,7 +21,7 @@ namespace Kernel
 		~NVMEDeviceInterface() override;
 
 	public:
-		ZKA_COPY_DEFAULT(NVMEDeviceInterface);
+		NE_COPY_DEFAULT(NVMEDeviceInterface);
 
 		const Char* Name() const override;
 
diff --git a/dev/Kernel/SystemKit/SwapDisk.h b/dev/Kernel/SystemKit/SwapDisk.h
index 05f7b2d5..8464a1ab 100644
--- a/dev/Kernel/SystemKit/SwapDisk.h
+++ b/dev/Kernel/SystemKit/SwapDisk.h
@@ -27,7 +27,7 @@ namespace Kernel
 		explicit SwapDisk() = default;
 		~SwapDisk()			= default;
 
-		ZKA_COPY_DEFAULT(SwapDisk);
+		NE_COPY_DEFAULT(SwapDisk);
 
 		BOOL			  Write(const Char* fork_name, const SizeT fork_name_len, SWAP_DISK_HEADER* data, const SizeT data_len);
 		SWAP_DISK_HEADER* Read(const Char* fork_name, const SizeT fork_name_len, const SizeT data_len);
diff --git a/dev/Kernel/amd64-desktop.make b/dev/Kernel/amd64-desktop.make
index 023195d5..3e8040c0 100644
--- a/dev/Kernel/amd64-desktop.make
+++ b/dev/Kernel/amd64-desktop.make
@@ -5,7 +5,7 @@
 
 CXX			= x86_64-w64-mingw32-g++
 LD			= x86_64-w64-mingw32-ld
-CCFLAGS		= -fshort-wchar -c -D__ZKA_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions -std=c++20 -D__ZKA_SUPPORT_NX__ -O0 -I../Vendor -D__FSKIT_INCLUDES_NEFS__ -D__NEOSKRNL__ -D__HAVE_ZKA_APIS__ -D__FREESTANDING__ -D__ZKA_VIRTUAL_MEMORY_SUPPORT__ -D__ZKA_AUTO_FORMAT__ -D__ZKA__ -I./ -I../ -I../zba
+CCFLAGS		= -fshort-wchar -c -D__NE_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions -std=c++20 -D__NE_SUPPORT_NX__ -O0 -I../Vendor -D__FSKIT_INCLUDES_NEFS__ -D__NEOSKRNL__ -D__HAVE_NE_APIS__ -D__FREESTANDING__ -D__NE_VIRTUAL_MEMORY_SUPPORT__ -D__NE_AUTO_FORMAT__ -D__NE__ -I./ -I../ -I../zba
 
 ASM 		= nasm
 
diff --git a/dev/Kernel/arm64-desktop.make b/dev/Kernel/arm64-desktop.make
index 71443e9f..1b3521d5 100644
--- a/dev/Kernel/arm64-desktop.make
+++ b/dev/Kernel/arm64-desktop.make
@@ -5,9 +5,9 @@
 
 CC			= clang++
 LD			= lld-link
-CCFLAGS		= -fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
+CCFLAGS		= -fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -O3 -D__NEOSKRNL__ -D__ZKA_MINIMAL_OS__ -D__ZKA_NO_BUILTIN__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../
+				-std=c++20 -O3 -D__NEOSKRNL__ -D__NE_MINIMAL_OS__ -D__NE_NO_BUILTIN__ -D__HAVE_NE_APIS__ -D__NE__ -I../
 
 ASM 		= clang++
 
diff --git a/dev/Kernel/src/BitMapMgr.cc b/dev/Kernel/src/BitMapMgr.cc
index c232fa4f..1e9c3827 100644
--- a/dev/Kernel/src/BitMapMgr.cc
+++ b/dev/Kernel/src/BitMapMgr.cc
@@ -6,9 +6,9 @@
 
 #include <ArchKit/ArchKit.h>
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 #include <HALKit/AMD64/Paging.h>
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 #include <HALKit/ARM64/Paging.h>
 #endif
 
@@ -35,7 +35,7 @@ namespace Kernel
 				explicit IBitMapProxy() = default;
 				~IBitMapProxy()			= default;
 
-				ZKA_COPY_DELETE(IBitMapProxy);
+				NE_COPY_DELETE(IBitMapProxy);
 
 				auto IsBitMap(VoidPtr page_ptr) -> Bool
 				{
diff --git a/dev/Kernel/src/CxxAbi-AMD64.cc b/dev/Kernel/src/CxxAbi-AMD64.cc
index 9065ece5..fa300316 100644
--- a/dev/Kernel/src/CxxAbi-AMD64.cc
+++ b/dev/Kernel/src/CxxAbi-AMD64.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/CxxAbi.h>
@@ -87,4 +87,4 @@ namespace cxxabiv1
 	}
 } // namespace cxxabiv1
 
-#endif // ifdef __ZKA_AMD64__
+#endif // ifdef __NE_AMD64__
diff --git a/dev/Kernel/src/CxxAbi-ARM64.cc b/dev/Kernel/src/CxxAbi-ARM64.cc
index 127e12c6..2535e0a7 100644
--- a/dev/Kernel/src/CxxAbi-ARM64.cc
+++ b/dev/Kernel/src/CxxAbi-ARM64.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __ZKA_ARM64__
+#ifdef __NE_ARM64__
 
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/CxxAbi.h>
@@ -89,19 +89,19 @@ EXTERN_C Kernel::Void _purecall(void* self)
 
 EXTERN_C Kernel::Void _Init_thread_footer(Kernel::Int* thread_obj)
 {
-	ZKA_UNUSED(thread_obj);
+	NE_UNUSED(thread_obj);
 }
 
 EXTERN_C Kernel::Void _Init_thread_epoch(Kernel::Void)
 {
-	ZKA_UNUSED(0);
+	NE_UNUSED(0);
 }
 
 EXTERN_C Kernel::Void _Init_thread_header(Kernel::Int* thread_obj)
 {
-	ZKA_UNUSED(0);
+	NE_UNUSED(0);
 }
 
 EXTERN_C Kernel::Int _tls_index = 0UL;
 
-#endif // ifdef __ZKA_ARM64__
+#endif // ifdef __NE_ARM64__
diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc
index e405cc96..3ac3d69a 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/Kernel/src/DriveMgr.cc
@@ -113,7 +113,7 @@ namespace Kernel
 		return "AHCI";
 	}
 #endif
-#ifdef __ZKA_MINIMAL_OS__
+#ifdef __NE_MINIMAL_OS__
 	const Char* io_drv_kind(Void)
 	{
 		return "Not Loaded";
@@ -124,7 +124,7 @@ namespace Kernel
 	/// @param pckt the packet to read.
 	Void io_drv_unimplemented(DriveTrait::DrivePacket pckt) noexcept
 	{
-		ZKA_UNUSED(pckt);
+		NE_UNUSED(pckt);
 	}
 
 	/// @brief Makes a new drive.
diff --git a/dev/Kernel/src/FS/NeFS+FileMgr.cc b/dev/Kernel/src/FS/NeFS+FileMgr.cc
index ebf03078..f1661938 100644
--- a/dev/Kernel/src/FS/NeFS+FileMgr.cc
+++ b/dev/Kernel/src/FS/NeFS+FileMgr.cc
@@ -7,7 +7,7 @@
 #include <KernelKit/FileMgr.h>
 #include <KernelKit/MemoryMgr.h>
 
-#ifndef __ZKA_MINIMAL_OS__
+#ifndef __NE_MINIMAL_OS__
 #ifdef __FSKIT_INCLUDES_NEFS__
 
 /// @brief NeFS File manager.
@@ -166,7 +166,7 @@ namespace Kernel
 		if (!data)
 			return;
 
-		ZKA_UNUSED(flags);
+		NE_UNUSED(flags);
 
 		if ((reinterpret_cast<NFS_CATALOG_STRUCT*>(node))->Kind == kNeFSCatalogKindFile)
 			mParser->WriteCatalog(reinterpret_cast<NFS_CATALOG_STRUCT*>(node)->Name, (flags & kFileFlagRsrc ? true : false), data, size,
@@ -184,7 +184,7 @@ namespace Kernel
 		if (!sz)
 			return nullptr;
 
-		ZKA_UNUSED(flags);
+		NE_UNUSED(flags);
 
 		if ((reinterpret_cast<NFS_CATALOG_STRUCT*>(node))->Kind == kNeFSCatalogKindFile)
 			return mParser->ReadCatalog(reinterpret_cast<NFS_CATALOG_STRUCT*>(node), (flags & kFileFlagRsrc ? true : false), sz,
@@ -242,4 +242,4 @@ namespace Kernel
 } // namespace Kernel
 
 #endif // ifdef __FSKIT_INCLUDES_NEFS__
-#endif // ifndef __ZKA_MINIMAL_OS__
+#endif // ifndef __NE_MINIMAL_OS__
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index ecfafab4..2b62710c 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -24,7 +24,7 @@
 
 using namespace Kernel;
 
-#ifdef __ZKA_NO_BUILTIN__
+#ifdef __NE_NO_BUILTIN__
 /***********************************************************************************/
 /**
 	Define those external symbols, to make the editor shutup
@@ -452,7 +452,7 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char*
 /// @return If it was sucessful, see err_global_get().
 bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLba, _Input const Int32 flags, const Char* part_name)
 {
-#ifdef ZKA_EPM_SUPPORT
+#ifdef NE_EPM_SUPPORT
 	if (*part_name == 0 ||
 		endLba == 0)
 		return false;
@@ -609,7 +609,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
 
 		drive->fInput(&drive->fPacket);
 	}
-#endif // ZKA_EPM_SUPPORT
+#endif // NE_EPM_SUPPORT
 
 	return false;
 }
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index 7168453d..d4a9e126 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -24,7 +24,7 @@
 #include <CFKit/Property.h>
 #include <KernelKit/Timer.h>
 
-#ifdef __ZKA_AUTO_FORMAT__
+#ifdef __NE_AUTO_FORMAT__
 namespace Kernel::Detail
 {
 	/// @brief Filesystem auto formatter, additional checks are also done by the class.
@@ -85,18 +85,18 @@ namespace Kernel::Detail
 			mNeFS = nullptr;
 		}
 
-		ZKA_COPY_DEFAULT(NeFilesystemInstaller);
+		NE_COPY_DEFAULT(NeFilesystemInstaller);
 	};
 } // namespace Kernel::Detail
-#endif // ifdef __ZKA_AUTO_FORMAT__
+#endif // ifdef __NE_AUTO_FORMAT__
 
 /// @brief Kernel entrypoint.
 /// @param Void
 /// @return Void
 EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len)
 {
-#ifdef __ZKA_AUTO_FORMAT__
+#ifdef __NE_AUTO_FORMAT__
 	Kernel::NeFS::fs_init_nefs();
 	Kernel::Detail::NeFilesystemInstaller installer{};
-#endif // __ZKA_AUTO_FORMAT__
+#endif // __NE_AUTO_FORMAT__
 }
diff --git a/dev/Kernel/src/Network/IPCMsg.cc b/dev/Kernel/src/Network/IPCMsg.cc
index ef888ed6..46c96900 100644
--- a/dev/Kernel/src/Network/IPCMsg.cc
+++ b/dev/Kernel/src/Network/IPCMsg.cc
@@ -14,7 +14,7 @@ namespace Kernel
 	/// @brief The internal sanitize function.
 	Bool ipc_int_sanitize_packet(IPC_MSG* pckt)
 	{
-		auto endian = rtl_deduce_endianess(pckt, ((Char*)pckt)[0]);
+		auto endian = RTL_ENDIAN(pckt, ((Char*)pckt)[0]);
 
 		switch (endian)
 		{
@@ -83,7 +83,7 @@ namespace Kernel
 
 		if (*pckt_in)
 		{
-			const auto endianess = rtl_deduce_endianess((*pckt_in), ((Char*)(*pckt_in))[0]);
+			const auto endianess = RTL_ENDIAN((*pckt_in), ((Char*)(*pckt_in))[0]);
 
 			(*pckt_in)->IpcHeaderMagic = kIPCHeaderMagic;
 
diff --git a/dev/Kernel/src/New+Delete.cc b/dev/Kernel/src/New+Delete.cc
index 87efeb57..f9b92b23 100644
--- a/dev/Kernel/src/New+Delete.cc
+++ b/dev/Kernel/src/New+Delete.cc
@@ -44,7 +44,7 @@ void operator delete(void* ptr, size_t sz)
 	if (ptr == nullptr)
 		return;
 
-	ZKA_UNUSED(sz);
+	NE_UNUSED(sz);
 
 	Kernel::mm_delete_heap(ptr);
 }
diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc
index b512f2ed..a1d527cf 100644
--- a/dev/Kernel/src/PEFCodeMgr.cc
+++ b/dev/Kernel/src/PEFCodeMgr.cc
@@ -27,15 +27,15 @@ namespace Kernel
 		/***********************************************************************************/
 		UInt32 ldr_get_platform(void) noexcept
 		{
-#if defined(__ZKA_32X0__)
+#if defined(__NE_32X0__)
 			return kPefArch32x0;
-#elif defined(__ZKA_64X0__)
+#elif defined(__NE_64X0__)
 			return kPefArch64x0;
-#elif defined(__ZKA_AMD64__)
+#elif defined(__NE_AMD64__)
 			return kPefArchAMD64;
-#elif defined(__ZKA_PPC64__)
+#elif defined(__NE_PPC64__)
 			return kPefArchPowerPC;
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 			return kPefArchARM64;
 #else
 			return kPefArchInvalid;
diff --git a/dev/Kernel/src/PageMgr.cc b/dev/Kernel/src/PageMgr.cc
index 9ba0ed4a..1a73fdcb 100644
--- a/dev/Kernel/src/PageMgr.cc
+++ b/dev/Kernel/src/PageMgr.cc
@@ -7,11 +7,11 @@
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/PageMgr.h>
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 #include <HALKit/AMD64/Paging.h>
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 #include <HALKit/ARM64/Paging.h>
-#endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__)
+#endif // ifdef __NE_AMD64__ || defined(__NE_ARM64__)
 
 namespace Kernel
 {
@@ -34,9 +34,9 @@ namespace Kernel
 	/// @param VirtAddr
 	Void PageMgr::FlushTLB()
 	{
-#ifndef __ZKA_MINIMAL_OS__
+#ifndef __NE_MINIMAL_OS__
 		hal_flush_tlb();
-#endif // !__ZKA_MINIMAL_OS__
+#endif // !__NE_MINIMAL_OS__
 	}
 
 	/// @brief Reclaim freed page.
diff --git a/dev/Kernel/src/Pmm.cc b/dev/Kernel/src/Pmm.cc
index ffe58a26..8a719e1f 100644
--- a/dev/Kernel/src/Pmm.cc
+++ b/dev/Kernel/src/Pmm.cc
@@ -7,13 +7,13 @@
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/Pmm.h>
 
-#if defined(__ZKA_ARM64__)
+#if defined(__NE_ARM64__)
 #include <HALKit/ARM64/Processor.h>
-#endif // defined(__ZKA_ARM64__)
+#endif // defined(__NE_ARM64__)
 
-#if defined(__ZKA_AMD64__)
+#if defined(__NE_AMD64__)
 #include <HALKit/AMD64/Processor.h>
-#endif // defined(__ZKA_AMD64__)
+#endif // defined(__NE_AMD64__)
 
 namespace Kernel
 {
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc
index 9626296f..7758dbb2 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/Kernel/src/UserProcessScheduler.cc
@@ -107,7 +107,7 @@ namespace Kernel
 
 	ErrorOr<VoidPtr> UserProcess::New(const SizeT& sz, const SizeT& pad_amount)
 	{
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 		auto vm_register = hal_read_cr3();
 		hal_write_cr3(this->VMRegister);
 
@@ -207,7 +207,7 @@ namespace Kernel
 
 		auto memory_heap_list = this->ProcessMemoryHeap;
 
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 		auto pd = hal_read_cr3();
 		hal_write_cr3(this->VMRegister);
 #endif
@@ -220,7 +220,7 @@ namespace Kernel
 				MUST_PASS(mm_delete_heap(memory_heap_list->MemoryEntry));
 			}
 
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 			hal_write_cr3(pd);
 #endif
 
@@ -298,7 +298,7 @@ namespace Kernel
 
 		rt_copy_memory(reinterpret_cast<VoidPtr>(const_cast<Char*>(name)), process.Name, rt_string_len(name));
 
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 		process.VMRegister = new PDE();
 
 		if (!process.VMRegister)
@@ -312,7 +312,7 @@ namespace Kernel
 		flags |= HAL::kMMFlagsUser;
 
 		HAL::mm_map_page((VoidPtr)process.VMRegister, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
 
 		process.StackFrame = new HAL::StackFrame();
 
@@ -322,13 +322,13 @@ namespace Kernel
 			return kErrorProcessFault;
 		}
 
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 		flags = HAL::kMMFlagsPresent;
 		flags |= HAL::kMMFlagsWr;
 		flags |= HAL::kMMFlagsUser;
 
 		HAL::mm_map_page((VoidPtr)process.StackFrame, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
 
 		// React according to process kind.
 		switch (process.Kind)
@@ -351,13 +351,13 @@ namespace Kernel
 			return kErrorProcessFault;
 		}
 
-#ifdef __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#ifdef __NE_VIRTUAL_MEMORY_SUPPORT__
 		flags = HAL::kMMFlagsPresent;
 		flags |= HAL::kMMFlagsWr;
 		flags |= HAL::kMMFlagsUser;
 
 		HAL::mm_map_page((VoidPtr)process.StackReserve, flags);
-#endif // __ZKA_VIRTUAL_MEMORY_SUPPORT__
+#endif // __NE_VIRTUAL_MEMORY_SUPPORT__
 
 		process.ProcessParentTeam = &mTeam;
 
diff --git a/dev/Kernel/src/Utils.cc b/dev/Kernel/src/Utils.cc
index c5a82305..07e57aef 100644
--- a/dev/Kernel/src/Utils.cc
+++ b/dev/Kernel/src/Utils.cc
@@ -161,7 +161,7 @@ namespace Kernel
 
 	Bool rt_to_string(Char* str, UInt64 base, Int32 limit)
 	{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 		auto i = 0;
 
 		auto final_number = base;
diff --git a/dev/Mod/CoreGfx/AccessibilityMgr.h b/dev/Mod/CoreGfx/AccessibilityMgr.h
index 5d153ac8..6916984b 100644
--- a/dev/Mod/CoreGfx/AccessibilityMgr.h
+++ b/dev/Mod/CoreGfx/AccessibilityMgr.h
@@ -24,7 +24,7 @@ namespace FB
 		~UIAccessibilty()		  = default;
 
 	public:
-		ZKA_COPY_DELETE(UIAccessibilty);
+		NE_COPY_DELETE(UIAccessibilty);
 
 		static Int64 Width() noexcept
 		{
diff --git a/dev/Mod/CoreGfx/FBMgr.h b/dev/Mod/CoreGfx/FBMgr.h
index 955855f0..670a0525 100644
--- a/dev/Mod/CoreGfx/FBMgr.h
+++ b/dev/Mod/CoreGfx/FBMgr.h
@@ -16,7 +16,7 @@
 
 #define fb_clear() kCGCursor = 0
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 /// @brief Performs Alpha drawing on the framebuffer.
 #define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y)        \
 	for (Kernel::SizeT i = base_x; i < (width + base_x); ++i)                \
@@ -127,7 +127,7 @@
 #define FBDrawInRegion(_Clr, height, width, base_x, base_y)
 #define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y)
 #define FBDrawInRegionA(_Clr, height, width, base_x, base_y)
-#endif // __ZKA_AMD64__
+#endif // __NE_AMD64__
 
 #ifndef GFX_MGR_ACCESSIBILITY_H
 #include <Mod/CoreGfx/AccessibilityMgr.h>
diff --git a/dev/Mod/CoreGfx/MathMgr.h b/dev/Mod/CoreGfx/MathMgr.h
index 87f674df..7e85c0dc 100644
--- a/dev/Mod/CoreGfx/MathMgr.h
+++ b/dev/Mod/CoreGfx/MathMgr.h
@@ -11,7 +11,7 @@
 
 namespace UI
 {
-#ifdef ZKA_GFX_MGR_USE_DOUBLE
+#ifdef NE_GFX_MGR_USE_DOUBLE
 	typedef double fb_real_t;
 #else
 	typedef float fb_real_t;
diff --git a/dev/Mod/MFlash/MFlash.h b/dev/Mod/MFlash/MFlash.h
index 05cfb2c8..026c6102 100644
--- a/dev/Mod/MFlash/MFlash.h
+++ b/dev/Mod/MFlash/MFlash.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#ifdef ZKA_USE_MBCI_FLASH
+#ifdef NE_USE_MBCI_FLASH
 
 #include <NewKit/Defines.h>
 
@@ -18,4 +18,4 @@ Kernel::Void drv_enable_at(Kernel::Int32 slot);
 
 Kernel::Void drv_disable_at(Kernel::Int32 slot);
 
-#endif // ifdef ZKA_USE_MBCI_FLASH
+#endif // ifdef NE_USE_MBCI_FLASH
diff --git a/dev/Mod/NVME/NVME.h b/dev/Mod/NVME/NVME.h
index e42a609b..2fb098a0 100644
--- a/dev/Mod/NVME/NVME.h
+++ b/dev/Mod/NVME/NVME.h
@@ -5,7 +5,7 @@
 	Revision History:
 
 	??/??/24: Added file (amlel)
-	23 Jul 24: Update filename to Defines.h and using ZKA_ALIGN_NVME for NVME structs. (amlel)
+	23 Jul 24: Update filename to Defines.h and using NE_ALIGN_NVME for NVME structs. (amlel)
 
 ------------------------------------------- */
 
@@ -17,11 +17,11 @@
 /// @file NVME.h
 /// @brief NVME driver.
 
-#define ZKA_ALIGN_NVME ATTRIBUTE(aligned(sizeof(Kernel::UInt32)))
+#define NE_ALIGN_NVME ATTRIBUTE(aligned(sizeof(Kernel::UInt32)))
 
 namespace Kernel
 {
-	struct ZKA_ALIGN_NVME HAL_NVME_BAR_0 final
+	struct NE_ALIGN_NVME HAL_NVME_BAR_0 final
 	{
 		UInt32 fCapabilities;
 		UInt32 fVersion;
@@ -34,7 +34,7 @@ namespace Kernel
 		UInt32 fAdminCompletionQueue;
 	};
 
-	struct ZKA_ALIGN_NVME HAL_NVME_QUEUE final
+	struct NE_ALIGN_NVME HAL_NVME_QUEUE final
 	{
 		UInt32 fOpcode;
 		UInt32 fNSID;