6 files changed, 14 insertions, 14 deletions
diff --git a/src/boot/amd64-ci.make b/src/boot/amd64-ci.make
index 28017bf3..1d3fcce0 100644
--- a/src/boot/amd64-ci.make
+++ b/src/boot/amd64-ci.make
@@ -69,8 +69,8 @@ FLAG_GNU=-fshort-wchar -Wall -Wpedantic -Wextra -Werror -D__EFI_x86_64__ -mno-re
 			-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DEBUG_MACRO) $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
                         -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_API__ -DBOOTZ_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
 
-BOOTLOADER=ne_bootz
-KERNEL=ne_kernel
+BOOTLOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
 SYSCHK=chk.efi
 BOOTNET=net.efi
 SCIKIT=libSystem.dll
@@ -130,7 +130,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/src/boot/amd64-desktop.make b/src/boot/amd64-desktop.make
index 35904c89..e842742f 100644
--- a/src/boot/amd64-desktop.make
+++ b/src/boot/amd64-desktop.make
@@ -71,8 +71,8 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -D__nekernel_allow_non_nekernel_pe -Wall
 			-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
                         -std=c++20 -DBOOTZ_GPT_SUPPORT -D__HAVE_NE_API__ -DBOOTZ_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT -Wl,--disable-reloc-section
 
-BOOTLOADER=ne_bootz
-KERNEL=ne_kernel
+BOOTLOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
 SYSCHK=chk.efi
 BOOTNET=net.efi
 MEMTEST=memtest.efi
@@ -92,7 +92,7 @@ all: compile-amd64
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o src/$(BOOTLOADER)
 	$(COPY) src/$(BOOTLOADER) src/root/EFI/BOOT/BOOTX64.EFI
 	$(COPY) src/$(BOOTLOADER) src/root/EFI/BOOT/BOOTZ.EFI
-	$(COPY) ../kernel/$(KERNEL) src/root/$(KERNEL)
+	$(COPY) ../kernel/$(KERNEL_IMG) src/root/$(KERNEL_IMG)
 	$(COPY) ./modules/SysChk/$(SYSCHK) src/root/$(SYSCHK)
 	$(COPY) ./modules/BootNet/$(BOOTNET) src/root/$(BOOTNET)
 	$(COPY) ./modules/MemoryTest/$(MEMTEST) src/root/$(MEMTEST)
@@ -146,7 +146,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/src/boot/arm64-desktop.make b/src/boot/arm64-desktop.make
index 55004175..d74f775c 100644
--- a/src/boot/arm64-desktop.make
+++ b/src/boot/arm64-desktop.make
@@ -47,8 +47,8 @@ FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-
 			 -target aarch64-unknown-windows \
 				-std=c++20 -DBOOTZ_EPM_SUPPORT -D__nekernel_allow_non_nekernel_pe -DBOOTZ_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTZ_STANDALONE__ -D__NEKERNEL__ -D__BOOTZ__ -D__HAVE_NE_API__ -D__NE__ -I../ -I../kernel
 
-BOOT_LOADER=ne_bootz
-KERNEL=ne_kernel
+BOOT_LOADER=bootzldr.exe
+KERNEL_IMG=neoskrnl.exe
 SYSCHK=chk.efi
 STARTUP=startup.efi
 
@@ -62,7 +62,7 @@ all: compile
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) /out:src/$(BOOT_LOADER)
 	$(COPY) src/$(BOOT_LOADER) src/root/EFI/BOOT/BOOTAA64.EFI
 	$(COPY) src/$(BOOT_LOADER) src/root/EFI/BOOT/BootZ.EFI
-	$(COPY) ../kernel/$(KERNEL) src/root/$(KERNEL)
+	$(COPY) ../kernel/$(KERNEL_IMG) src/root/$(KERNEL_IMG)
 	$(COPY) ./modules/SysChk/$(SYSCHK) src/root/$(SYSCHK)
 	$(COPY) src/$(BOOT_LOADER) src/root/$(BOOT_LOADER)
 
@@ -94,7 +94,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGAARCH64_QEMU_EFI.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=ne_bootz ne_kernel OVMF.fd
+EXECUTABLES=bootzldr.exe neoskrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/src/boot/modules/BootNet/README.md b/src/boot/modules/BootNet/README.md
index 9c013d6f..fb5e71aa 100644
--- a/src/boot/modules/BootNet/README.md
+++ b/src/boot/modules/BootNet/README.md
@@ -1,5 +1,5 @@
 # BootNet
 
-This module network boots a copy of `ne_kernel` via its NetBoot protocol.
+This module network boots a copy of `neoskrnl.exe` via its NetBoot protocol.
 
 This is for EFI modules only, as the NeBoot firmware already supports it.
diff --git a/src/boot/src/HEL/ARM64/BootEFI.cpp b/src/boot/src/HEL/ARM64/BootEFI.cpp
index a92b9a62..2cfacc22 100644
--- a/src/boot/src/HEL/ARM64/BootEFI.cpp
+++ b/src/boot/src/HEL/ARM64/BootEFI.cpp
@@ -124,7 +124,7 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa
 
   kHandoverHeader->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
-  Boot::BootFileReader reader_kernel(L"ne_kernel", image_handle);
+  Boot::BootFileReader reader_kernel(L"neoskrnl.exe", image_handle);
 
   reader_kernel.ReadAll(0);
 
diff --git a/src/boot/src/boot_rsrc.rsrc b/src/boot/src/boot_rsrc.rsrc
index b0c86e51..2c4e469f 100644
--- a/src/boot/src/boot_rsrc.rsrc
+++ b/src/boot/src/boot_rsrc.rsrc
@@ -13,7 +13,7 @@ BEGIN
       VALUE "FileVersion", BOOTLOADER_VERSION
       VALUE "InternalName", "bootz"
       VALUE "LegalCopyright", "Copyright (C) 2024-2026, Amlal El Mahrouss licensed under the Apache 2.0 license."
-      VALUE "OriginalFilename", "ne_bootz"
+      VALUE "OriginalFilename", "bootzldr.exe"
       VALUE "ProductName", "bootz"
       VALUE "ProductVersion", BOOTLOADER_VERSION
     END