9 files changed, 18 insertions, 20 deletions
diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make
index 2ea68f41..6134e79c 100644
--- a/dev/boot/amd64-ci.make
+++ b/dev/boot/amd64-ci.make
@@ -72,9 +72,9 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__
                         -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=bootz.exe
-KERNEL=neoskrnl.exe
-SYSCHK=syschk.sys
-NETBOOT=bootnet.sys
+KERNEL=vkrnl.exe
+SYSCHK=chk.sys
+NETBOOT=net.sys
 SCIKIT=libuser.dylib
 
 .PHONY: invalid-recipe
@@ -132,7 +132,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=bootz.exe neoskrnl.exe OVMF.fd
+EXECUTABLES=bootz.exe vkrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make
index b982d870..6a8cb3f9 100644
--- a/dev/boot/amd64-desktop.make
+++ b/dev/boot/amd64-desktop.make
@@ -72,9 +72,9 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__
                         -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=bootz.exe
-KERNEL=neoskrnl.exe
-SYSCHK=syschk.sys
-NETBOOT=bootnet.sys
+KERNEL=vkrnl.exe
+SYSCHK=chk.sys
+NETBOOT=net.sys
 SCIKIT=libuser.dylib
 
 .PHONY: invalid-recipe
@@ -138,7 +138,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=bootz.exe neoskrnl.exe OVMF.fd
+EXECUTABLES=bootz.exe vkrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/dev/boot/arm64-desktop.make b/dev/boot/arm64-desktop.make
index 20f77e6e..376ae622 100644
--- a/dev/boot/arm64-desktop.make
+++ b/dev/boot/arm64-desktop.make
@@ -48,8 +48,8 @@ FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-
 				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTZ_STANDALONE__ -D__NEOSKRNL__ -D__BOOTZ__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../kernel
 
 BOOT_LOADER=bootz.exe
-KERNEL=neoskrnl.exe
-SYSCHK=syschk.sys
+KERNEL=vkrnl.exe
+SYSCHK=chk.sys
 STARTUP=startup.sys
 
 .PHONY: invalid-recipe
@@ -94,7 +94,7 @@ efi:
 	$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGAARCH64_QEMU_EFI.fd -O OVMF.fd
 
 BINS=*.bin
-EXECUTABLES=bootz.exe neoskrnl.exe OVMF.fd
+EXECUTABLES=bootz.exe vkrnl.exe OVMF.fd
 
 TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
 
diff --git a/dev/boot/modules/BootNet/amd64.json b/dev/boot/modules/BootNet/amd64.json
index 95124574..6a87600b 100644
--- a/dev/boot/modules/BootNet/amd64.json
+++ b/dev/boot/modules/BootNet/amd64.json
@@ -3,7 +3,7 @@
   "compiler_std": "c++20",
   "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"],
-  "output_name": "bootnet.sys",
+  "output_name": "net.sys",
   "compiler_flags": [
     "-nostdlib",
     "-std=c++20",
diff --git a/dev/boot/modules/SysChk/amd64.json b/dev/boot/modules/SysChk/amd64.json
index 7f013b39..f7d979ac 100644
--- a/dev/boot/modules/SysChk/amd64.json
+++ b/dev/boot/modules/SysChk/amd64.json
@@ -3,7 +3,7 @@
   "compiler_std": "c++20",
   "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"],
-  "output_name": "syschk.sys",
+  "output_name": "chk.sys",
   "compiler_flags": [
     "-nostdlib",
     "-std=c++20",
diff --git a/dev/boot/modules/SysChk/arm64.json b/dev/boot/modules/SysChk/arm64.json
index 502c75cd..9d4ebcf9 100644
--- a/dev/boot/modules/SysChk/arm64.json
+++ b/dev/boot/modules/SysChk/arm64.json
@@ -3,7 +3,7 @@
   "compiler_std": "c++20",
   "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"],
-  "output_name": "syschk.sys",
+  "output_name": "chk.sys",
   "compiler_flags": [
     "-ffreestanding",
     "-nostdlib",
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 5532f6c0..fba3d227 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -207,7 +207,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 	// ------------------------------------------ //
 
 #if defined(__ATA_PIO__)
-	Boot::BootFileReader reader_syschk(L"syschk.sys", image_handle);
+	Boot::BootFileReader reader_syschk(L"chk.sys", image_handle);
 	reader_syschk.ReadAll(0);
 
 	Boot::BootThread* syschk_thread = nullptr;
@@ -266,7 +266,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 	// Assign to global 'kHandoverHeader'.
 
-	WideChar kernel_path[256U] = L"neoskrnl.exe";
+	WideChar kernel_path[256U] = L"vkrnl.exe";
 	UInt32	 kernel_path_sz	   = 256U;
 
 	if (ST->RuntimeServices->GetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, nullptr, &kernel_path_sz, kernel_path) != kEfiOk)
@@ -310,7 +310,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 		Boot::Stop();
 	}
 
-	Boot::BootFileReader reader_netboot(L"bootnet.sys", image_handle);
+	Boot::BootFileReader reader_netboot(L"net.sys", image_handle);
 	reader_netboot.ReadAll(0);
 
 	Boot::BootThread* netboot_thread = nullptr;
diff --git a/dev/boot/src/HEL/ARM64/BootEFI.cc b/dev/boot/src/HEL/ARM64/BootEFI.cc
index c1c4bec5..5016214f 100644
--- a/dev/boot/src/HEL/ARM64/BootEFI.cc
+++ b/dev/boot/src/HEL/ARM64/BootEFI.cc
@@ -196,7 +196,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	// Assign to global 'kHandoverHeader'.
 
-	Boot::BootFileReader reader_kernel(L"neoskrnl.exe", image_handle);
+	Boot::BootFileReader reader_kernel(L"vkrnl.exe", image_handle);
 
 	reader_kernel.ReadAll(0);
 
diff --git a/dev/boot/src/Root/EFI/STARTUP.NSH b/dev/boot/src/Root/EFI/STARTUP.NSH
deleted file mode 100644
index 2cf25f23..00000000
--- a/dev/boot/src/Root/EFI/STARTUP.NSH
+++ /dev/null
@@ -1,2 +0,0 @@
-fs0:
-BOOT\BOOTAA64.EFI