10 files changed, 12 insertions, 12 deletions
diff --git a/dev/boot/modules/BootNet/BootNet.h b/dev/boot/modules/BootNet/BootNet.h
index 0b319387..3e876d09 100644
--- a/dev/boot/modules/BootNet/BootNet.h
+++ b/dev/boot/modules/BootNet/BootNet.h
@@ -9,4 +9,4 @@
 
 #pragma once
 
-#include <FirmwareKit/CoreBoot/BootNet.h>
+#include <FirmwareKit/NeBoot/BootNet.h>
diff --git a/dev/boot/src/HEL/ARM64/BootCB.S b/dev/boot/src/HEL/ARM64/BootCB.S
index 3b0e1737..d52c1dcf 100644
--- a/dev/boot/src/HEL/ARM64/BootCB.S
+++ b/dev/boot/src/HEL/ARM64/BootCB.S
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __NE_COREBOOT__
+#ifdef __NE_NEBOOT__
 
 .section .boot_hdr
 .align 4
@@ -37,4 +37,4 @@ bootloader_start:
     bl      bootloader_main             
     ret                                 
 
-#endif // __NE_COREBOOT__
-\ No newline at end of file
+#endif // __NE_NEBOOT__
+\ No newline at end of file
diff --git a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h b/dev/kernel/FirmwareKit/NeBoot/BootNet.h
index 3ed11363..3ed11363 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h
+++ b/dev/kernel/FirmwareKit/NeBoot/BootNet.h
diff --git a/dev/kernel/FirmwareKit/CoreBoot/NS.h b/dev/kernel/FirmwareKit/NeBoot/NS.h
index 06197fcd..a4d6a251 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/NS.h
+++ b/dev/kernel/FirmwareKit/NeBoot/NS.h
@@ -6,5 +6,5 @@
 
 #pragma once
 
-#include <FirmwareKit/CoreBoot/BootNet.h>
-#include <FirmwareKit/CoreBoot/CoreBoot.h>
-\ No newline at end of file
+#include <FirmwareKit/NeBoot/BootNet.h>
+#include <FirmwareKit/NeBoot/NeBoot.h>
+\ No newline at end of file
diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h
index 9e756a70..621b3b64 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
+++ b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h
@@ -8,14 +8,14 @@
 
 #include <NeKit/Defines.h>
 
-namespace Firmware::Detail::CoreBoot {
+namespace Firmware::Detail::NeBoot {
 using namespace Kernel;
 
-struct COREBOOT_LINEAR_EXEC;
+struct NEBOOT_LINEAR_EXEC;
 
 /// @brief Linear Executable Header
 /// @author Amlal El Mahrouss
-struct ATTRIBUTE(aligned(4)) COREBOOT_LINEAR_EXEC {
+struct ATTRIBUTE(aligned(4)) NEBOOT_LINEAR_EXEC {
   const Char   fMagic[2];      // magic number
   const Char   fName[10];      // operating system name
   const UInt32 fRevision;      // firmware revision
@@ -31,4 +31,4 @@ struct ATTRIBUTE(aligned(4)) COREBOOT_LINEAR_EXEC {
   UIntPtr fMBCIStructureVersion;  // MBCI structure version.
 #endif
 };
-}  // namespace Firmware::Detail::CoreBoot
+}  // namespace Firmware::Detail::NeBoot
diff --git a/dev/kernel/amd64-ci.make b/dev/kernel/amd64-ci.make
index 81b72b93..f21efca4 100644
--- a/dev/kernel/amd64-ci.make
+++ b/dev/kernel/amd64-ci.make
@@ -42,7 +42,7 @@ error:
 	@echo "=== ERROR ==="
 	@echo "=> Use a specific target."
 
-MOVEALL=./MoveAll.X64.sh
+MOVEALL=./move-all-x64.sh
 WINDRES=x86_64-w64-mingw32-windres
 
 .PHONY: nekernel-amd64-epm
diff --git a/dev/kernel/amd64-desktop.make b/dev/kernel/amd64-desktop.make
index 2874d31c..36b0f18e 100644
--- a/dev/kernel/amd64-desktop.make
+++ b/dev/kernel/amd64-desktop.make
@@ -44,7 +44,7 @@ error:
 	@echo "=== ERROR ==="
 	@echo "=> Use a specific target."
 
-MOVEALL=./MoveAll.X64.sh
+MOVEALL=./move-all-x64.sh
 WINDRES=x86_64-w64-mingw32-windres
 
 .PHONY: nekernel-amd64-epm
diff --git a/dev/kernel/arm64-desktop.make b/dev/kernel/arm64-desktop.make
index 423391af..e83e1db8 100644
--- a/dev/kernel/arm64-desktop.make
+++ b/dev/kernel/arm64-desktop.make
@@ -30,7 +30,7 @@ error:
 	@echo "=== ERROR ==="
 	@echo "=> Use a specific target."
 
-MOVEALL=./MoveAll.ARM64.sh
+MOVEALL=./move-all-aarch64.sh
 
 .PHONY: nekernel-arm64-epm
 nekernel-arm64-epm: clean
diff --git a/dev/kernel/MoveAll.ARM64.sh b/dev/kernel/move-all-aarch64.sh
index 35e0909e..35e0909e 100755
--- a/dev/kernel/MoveAll.ARM64.sh
+++ b/dev/kernel/move-all-aarch64.sh
diff --git a/dev/kernel/MoveAll.X64.sh b/dev/kernel/move-all-x64.sh
index 1c135d06..1c135d06 100755
--- a/dev/kernel/MoveAll.X64.sh
+++ b/dev/kernel/move-all-x64.sh