3 files changed, 14 insertions, 14 deletions
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
index b8df12a0..da8e6107 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
@@ -36,7 +36,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
 
       BootBlockType* bootBlock = (BootBlockType*)buf;
 
-      bootBlock->Version = kEPMHCore;
+      bootBlock->Version = kEPMNewOS;
       bootBlock->NumBlocks = kEPMMaxBlks;
 
       for (SizeT i = 0; i < kEPMNameLength; i++) {
@@ -63,7 +63,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
         partBlock->Fs[i] = fsName[i];
       }
 
-      partBlock->Magic = kEPMHCore;
+      partBlock->Magic = kEPMNewOS;
 
       char* partName = "System HD";
       int partNameLength = 10;
@@ -84,7 +84,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
         swapBlock->Fs[i] = fsName[i];
       }
 
-      swapBlock->Magic = kEPMHCore;
+      swapBlock->Magic = kEPMNewOS;
 
       partName = "Swap HD";
       partNameLength = 8;
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootString.cxx b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
index 52633fe2..1c6b528e 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
@@ -17,8 +17,8 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
-                      const HCore::SizeT len) {
+NewOS::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
+                      const NewOS::SizeT len) {
   if (!dest || !src) return 0;
 
   SizeT index = 0UL;
@@ -29,10 +29,10 @@ HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
   return index;
 }
 
-HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
+NewOS::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
   if (!ptr) return 0;
 
-  HCore::SizeT cnt = 0;
+  NewOS::SizeT cnt = 0;
 
   while (*ptr != (CharacterTypeUTF16)0) {
     ++ptr;
@@ -42,11 +42,11 @@ HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
   return cnt;
 }
 
-HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
-                     const HCore::SizeT len) {
+NewOS::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
+                     const NewOS::SizeT len) {
   if (!src) return 0;
 
-  HCore::SizeT cnt = 0UL;
+  NewOS::SizeT cnt = 0UL;
 
   while (*src != 0) {
     if (cnt > len) break;
@@ -60,11 +60,11 @@ HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
   return cnt;
 }
 
-HCore::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
-                     const HCore::SizeT len) {
+NewOS::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
+                     const NewOS::SizeT len) {
   if (!src) return 0;
 
-  HCore::SizeT cnt = 0UL;
+  NewOS::SizeT cnt = 0UL;
 
   while (*src != 0) {
     if (cnt > len) break;
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 35c473ec..9e2dbca6 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -26,7 +26,7 @@ REM=rm
 REM_FLAG=-f
 
 FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -mgeneral-regs-only -mno-red-zone -D__KERNEL__ -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -D__BOOTLOADER__ -I./ 
+FLAG_GNU=-fshort-wchar -mgeneral-regs-only -mno-red-zone -D__KERNEL__ -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./ 
 
 .PHONY: invalid-recipe
 invalid-recipe: