META: BUMPING.

Signed-off-by: Amlal <amlalelmahrouss@icloud.com>

33 files changed, 57 insertions, 58 deletions

diff --git a/dev/BootLoader/BootKit/BitManip.h b/dev/BootLoader/BootKit/BitManip.h
index 7146d266..3b5ea540 100644
--- a/dev/BootLoader/BootKit/BitManip.h
+++ b/dev/BootLoader/BootKit/BitManip.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/BootKit.h b/dev/BootLoader/BootKit/BootKit.h
index c489262d..395ac2d7 100644
--- a/dev/BootLoader/BootKit/BootKit.h
+++ b/dev/BootLoader/BootKit/BootKit.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/Device.h b/dev/BootLoader/BootKit/Device.h
index cbe08ab8..03e913bd 100644
--- a/dev/BootLoader/BootKit/Device.h
+++ b/dev/BootLoader/BootKit/Device.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/EPM.h b/dev/BootLoader/BootKit/EPM.h
index 24ebbab9..1956144e 100644
--- a/dev/BootLoader/BootKit/EPM.h
+++ b/dev/BootLoader/BootKit/EPM.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/HW/ATA.h b/dev/BootLoader/BootKit/HW/ATA.h
index e1a0b672..79a19886 100644
--- a/dev/BootLoader/BootKit/HW/ATA.h
+++ b/dev/BootLoader/BootKit/HW/ATA.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/HW/SATA.h b/dev/BootLoader/BootKit/HW/SATA.h
index ffb903f4..0b6dd92b 100644
--- a/dev/BootLoader/BootKit/HW/SATA.h
+++ b/dev/BootLoader/BootKit/HW/SATA.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/Platform.h b/dev/BootLoader/BootKit/Platform.h
index 886c340a..c8bb5058 100644
--- a/dev/BootLoader/BootKit/Platform.h
+++ b/dev/BootLoader/BootKit/Platform.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/Protocol.h b/dev/BootLoader/BootKit/Protocol.h
index 07b381a7..618885fe 100644
--- a/dev/BootLoader/BootKit/Protocol.h
+++ b/dev/BootLoader/BootKit/Protocol.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/Support.h b/dev/BootLoader/BootKit/Support.h
index ee783c08..a57782e3 100644
--- a/dev/BootLoader/BootKit/Support.h
+++ b/dev/BootLoader/BootKit/Support.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/BootKit/Thread.h b/dev/BootLoader/BootKit/Thread.h
index 691c9b97..06fd84a0 100644
--- a/dev/BootLoader/BootKit/Thread.h
+++ b/dev/BootLoader/BootKit/Thread.h
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/Modules/NetBoot/Boot.S b/dev/BootLoader/Modules/NetBoot/Boot.S
index 090b3050..0527e509 100644
--- a/dev/BootLoader/Modules/NetBoot/Boot.S
+++ b/dev/BootLoader/Modules/NetBoot/Boot.S
@@ -2,7 +2,7 @@
 ;; *	========================================================
 ;; *
 ;; *	BootZ
-;; * 	Copyright (C) 2024, TQ B.V, all rights reserved., all rights reserved.
+;; * 	Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved.
 ;; *
 ;; * 	========================================================
 ;; */
diff --git a/dev/BootLoader/Modules/NetBoot/Module.cc b/dev/BootLoader/Modules/NetBoot/Module.cc
index a7c20e06..1b4a4bb4 100644
--- a/dev/BootLoader/Modules/NetBoot/Module.cc
+++ b/dev/BootLoader/Modules/NetBoot/Module.cc
@@ -2,7 +2,7 @@
  *	========================================================
  *
  *	NetBoot
- * 	Copyright (C) 2024, TQ B.V, all rights reserved., all rights reserved.
+ * 	Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved.
  *
  * 	========================================================
  */
diff --git a/dev/BootLoader/Modules/NetBoot/NetBoot.h b/dev/BootLoader/Modules/NetBoot/NetBoot.h
index 79e9951c..cdfe17f9 100644
--- a/dev/BootLoader/Modules/NetBoot/NetBoot.h
+++ b/dev/BootLoader/Modules/NetBoot/NetBoot.h
@@ -2,7 +2,7 @@
  *	========================================================
  *
  *	NetBoot
- * 	Copyright (C) 2024, TQ B.V, all rights reserved., all rights reserved.
+ * 	Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved.
  *
  * 	========================================================
  */
diff --git a/dev/BootLoader/Modules/SysChk/Boot.S b/dev/BootLoader/Modules/SysChk/Boot.S
index ad1dc1d0..9fdf4428 100644
--- a/dev/BootLoader/Modules/SysChk/Boot.S
+++ b/dev/BootLoader/Modules/SysChk/Boot.S
@@ -2,7 +2,7 @@
 ;; *	========================================================
 ;; *
 ;; *	BootZ
-;; * 	Copyright (C) 2024, TQ B.V, all rights reserved., all rights reserved.
+;; * 	Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved.
 ;; *
 ;; * 	========================================================
 ;; */
diff --git a/dev/BootLoader/Modules/SysChk/Module.cc b/dev/BootLoader/Modules/SysChk/Module.cc
index 2ae5023e..b0808fde 100644
--- a/dev/BootLoader/Modules/SysChk/Module.cc
+++ b/dev/BootLoader/Modules/SysChk/Module.cc
@@ -2,7 +2,7 @@
  *	========================================================
  *
  *	NetBoot
- * 	Copyright (C) 2024, TQ B.V, all rights reserved., all rights reserved.
+ * 	Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved.
  *
  * 	========================================================
  */
diff --git a/dev/BootLoader/ReadMe.md b/dev/BootLoader/ReadMe.md
index 8a9de0f6..91f8fa2e 100644
--- a/dev/BootLoader/ReadMe.md
+++ b/dev/BootLoader/ReadMe.md
@@ -17,4 +17,4 @@ And then execute:
 make all
 ```
 
-##### Copyright, TQ B.V, all rights reserved.
+##### Copyright, Theater Quality Inc, all rights reserved.
diff --git a/dev/BootLoader/amd64-efi.make b/dev/BootLoader/amd64-efi.make
index e83a833b..05323172 100644
--- a/dev/BootLoader/amd64-efi.make
+++ b/dev/BootLoader/amd64-efi.make
@@ -1,5 +1,5 @@
 ##################################################
-# (c) TQ B.V, all rights reserved.
+# (c) Theater Quality Inc, all rights reserved.
 # This is the bootloader makefile.
 ##################################################
 
@@ -36,7 +36,7 @@ EMU_FLAGS=-net none -smp 1 -m 8G -M q35 \
 
 LD_FLAGS=-e Main --subsystem=10
 
-STANDALONE_MACRO=-D__STANDALONE__
+STANDALONE_MACRO=-D__BOOTLDR_STANDALONE__
 OBJ=*.o
 
 REM=rm
diff --git a/dev/BootLoader/arm64-efi.make b/dev/BootLoader/arm64-efi.make
index ccf60605..c8aed97c 100644
--- a/dev/BootLoader/arm64-efi.make
+++ b/dev/BootLoader/arm64-efi.make
@@ -1,5 +1,5 @@
 ##################################################
-# (c) TQ B.V, all rights reserved.
+# (c) Theater Quality Inc, all rights reserved.
 # This is the bootloader makefile.
 ##################################################
 
@@ -37,7 +37,7 @@ EMU_FLAGS=-net none -smp 4 -m 8G -cpu max -M virt-9.1 \
 
 LD_FLAGS=-subsystem:efi_application -entry:Main /nodefaultlib
 
-STANDALONE_MACRO=-D__STANDALONE__
+STANDALONE_MACRO=-D__BOOTLDR_STANDALONE__
 OBJ=*.o
 
 REM=rm
@@ -46,7 +46,7 @@ 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./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -D__FSKIT_USE_NEFS__ -D__STANDALONE__ -D__MINOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
+				-std=c++20 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__MINOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
 
 BOOT_LOADER=zbaosldr.exe
 KERNEL=minoskrnl.exe
diff --git a/dev/BootLoader/src/BootFileReader.cc b/dev/BootLoader/src/BootFileReader.cc
index d5976464..1edf1281 100644
--- a/dev/BootLoader/src/BootFileReader.cc
+++ b/dev/BootLoader/src/BootFileReader.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 	File: FileReader.cc
 	Purpose: New Boot FileReader,
diff --git a/dev/BootLoader/src/BootString.cc b/dev/BootLoader/src/BootString.cc
index 6ea95173..f511f2fc 100644
--- a/dev/BootLoader/src/BootString.cc
+++ b/dev/BootLoader/src/BootString.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 	File: BootString.cc
 	Purpose: BootZ string library
diff --git a/dev/BootLoader/src/BootSupport.cc b/dev/BootLoader/src/BootSupport.cc
index 521fcd8f..bcd3b185 100644
--- a/dev/BootLoader/src/BootSupport.cc
+++ b/dev/BootLoader/src/BootSupport.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
@@ -12,7 +12,7 @@
 #include <KernelKit/MSDOS.h>
 #include <KernelKit/PE.h>
 
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
 
 /// @brief memset definition in C++.
 /// @param dst destination pointer.
diff --git a/dev/BootLoader/src/BootTextWriter.cc b/dev/BootLoader/src/BootTextWriter.cc
index 69a2ad47..bbb9a961 100644
--- a/dev/BootLoader/src/BootTextWriter.cc
+++ b/dev/BootLoader/src/BootTextWriter.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 	File: BootTextWriter.cc
 	Purpose: BootZ string library
diff --git a/dev/BootLoader/src/BootThread.cc b/dev/BootLoader/src/BootThread.cc
index 33b058df..32f8fd86 100644
--- a/dev/BootLoader/src/BootThread.cc
+++ b/dev/BootLoader/src/BootThread.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/src/BootloaderRsrc.rsrc b/dev/BootLoader/src/BootloaderRsrc.rsrc
index dd20a78c..5cef7e7c 100644
--- a/dev/BootLoader/src/BootloaderRsrc.rsrc
+++ b/dev/BootLoader/src/BootloaderRsrc.rsrc
@@ -8,11 +8,11 @@ BEGIN
   BEGIN
     BLOCK "080904E4"
     BEGIN
-      VALUE "CompanyName", "TQ B.V"
+      VALUE "CompanyName", "Theater Quality Inc"
       VALUE "FileDescription", "ZKA OS Loader."
       VALUE "FileVersion", BOOTLOADER_VERSION
       VALUE "InternalName", "zbaosldr"
-      VALUE "LegalCopyright", "Copyright (C) 2024, TQ B.V all rights reserved."
+      VALUE "LegalCopyright", "Copyright (C) 2024, Theater Quality Inc all rights reserved."
       VALUE "OriginalFilename", "zbaosldr.exe"
       VALUE "ProductName", "zbaosldr"
       VALUE "ProductVersion", BOOTLOADER_VERSION
diff --git a/dev/BootLoader/src/HEL/64X000/Boot64x0.S b/dev/BootLoader/src/HEL/64X000/Boot64x0.S
index e79f97ef..a9ca1a2d 100644
--- a/dev/BootLoader/src/HEL/64X000/Boot64x0.S
+++ b/dev/BootLoader/src/HEL/64X000/Boot64x0.S
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-    Copyright (C) 2024, TQ B.V, all rights reserved.
+    Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/src/HEL/AMD64/BootATA.cc b/dev/BootLoader/src/HEL/AMD64/BootATA.cc
index 52df1b2b..ff92bf48 100644
--- a/dev/BootLoader/src/HEL/AMD64/BootATA.cc
+++ b/dev/BootLoader/src/HEL/AMD64/BootATA.cc
@@ -1,17 +1,17 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
 /**
  * @file BootATA.cc
- * @author TQ B.V (amlalelmahrouss@icloud.com)
+ * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com)
  * @brief ATA driver.
  * @version 0.1
  * @date 2024-02-02
  *
- * @copyright Copyright (c) TQ B.V
+ * @copyright Copyright (c) Theater Quality Inc
  *
  */
 
diff --git a/dev/BootLoader/src/HEL/AMD64/BootMain.cc b/dev/BootLoader/src/HEL/AMD64/BootMain.cc
index 4d0190c0..dd8fb345 100644
--- a/dev/BootLoader/src/HEL/AMD64/BootMain.cc
+++ b/dev/BootLoader/src/HEL/AMD64/BootMain.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
@@ -24,11 +24,11 @@
 #endif // !kMachineModel
 
 #ifndef kExpectedWidth
-#define kExpectedWidth 1920
+#define kExpectedWidth (1920)
 #endif
 
 #ifndef kExpectedHeight
-#define kExpectedHeight 1080
+#define kExpectedHeight (1080)
 #endif
 
 /** Graphics related. */
@@ -132,7 +132,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	// Grab MP services, extended to runtime.	   //
 	// ------------------------------------------- //
 
-	auto				   guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
+	EfiGUID				   guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID);
 	EfiMpServicesProtocol* mp	   = nullptr;
 
 	BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
@@ -174,8 +174,6 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 
 		cg_fini();
 
-		CGDrawString("Formatting EPM disk...", 30, 10, RGB(0xFF, 0xFF, 0xFF));
-
 		Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root;
 
 		root.fFileName[0] = kNeFSRoot[0];
@@ -250,7 +248,9 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 
 	syschk_thread->Start(handover_hdr, NO);
 
-	// nullify these fields, to avoid being reused later.
+	// ------------------------------------------ //
+	// null these fields, to avoid being reused later.
+	// ------------------------------------------ //
 
 	handover_hdr->f_FirmwareCustomTables[0] = nullptr;
 	handover_hdr->f_FirmwareCustomTables[1] = nullptr;
@@ -288,9 +288,8 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	ImageHandle,
 	}
 	else
 	{
-#ifdef ZBA_USE_FB
-		CGDrawString("BootZ: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF));
-#endif // ZBA_USE_FB
+		cg_init();
+		CGDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);			
 
 		EFI::Stop();
 	}
diff --git a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc b/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc
index 83e37a02..5fe7d41f 100644
--- a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc
+++ b/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc
@@ -1,7 +1,7 @@
 
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
@@ -9,7 +9,7 @@
 #include <BootKit/Protocol.h>
 #include <BootKit/BootKit.h>
 
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
 
 using namespace Boot;
 
@@ -103,4 +103,4 @@ void rt_hlt()
 	Kernel::HAL::rt_halt();
 }
 
-#endif // __STANDALONE__
+#endif // __BOOTLDR_STANDALONE__
diff --git a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc b/dev/BootLoader/src/HEL/AMD64/BootSATA.cc
index 5118d865..229ce7e3 100644
--- a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc
+++ b/dev/BootLoader/src/HEL/AMD64/BootSATA.cc
@@ -1,17 +1,17 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
 /**
  * @file BootAHCI.cc
- * @author TQ B.V (amlalelmahrouss@icloud.com)
- * @brief AHCI support for BootZ.
+ * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com)
+ * @brief SATA support for BootZ.
  * @version 0.1
  * @date 2024-02-02
  *
- * @copyright Copyright (c) TQ B.V
+ * @copyright Copyright (c) Theater Quality Inc
  *
  */
 
diff --git a/dev/BootLoader/src/HEL/ARM64/BootMain.cc b/dev/BootLoader/src/HEL/ARM64/BootMain.cc
index 7f3ba6cf..fe35ea1b 100644
--- a/dev/BootLoader/src/HEL/ARM64/BootMain.cc
+++ b/dev/BootLoader/src/HEL/ARM64/BootMain.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc b/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc
index 75a69998..df16bd40 100644
--- a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc
+++ b/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
@@ -8,7 +8,7 @@
 #include <BootKit/Protocol.h>
 #include <BootKit/BootKit.h>
 
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
 
 using namespace Boot;
 
@@ -34,4 +34,4 @@ EXTERN_C void rt_std()
 {
 }
 
-#endif // __STANDALONE__
+#endif // __BOOTLDR_STANDALONE__
diff --git a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S b/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S
index 0948711d..e4964c59 100644
--- a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S
+++ b/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-    Copyright (C) 2024, TQ B.V, all rights reserved.
+    Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
diff --git a/dev/BootLoader/src/New+Delete.cc b/dev/BootLoader/src/New+Delete.cc
index b654621e..3abf0ef3 100644
--- a/dev/BootLoader/src/New+Delete.cc
+++ b/dev/BootLoader/src/New+Delete.cc
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright (C) 2024, TQ B.V, all rights reserved.
+	Copyright (C) 2024, Theater Quality Inc, all rights reserved.
 
 ------------------------------------------- */
 
@@ -8,7 +8,7 @@
 #include <BootKit/Protocol.h>
 #include <BootKit/BootKit.h>
 
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
 EXTERN EfiBootServices* BS;
 
 /// @brief Allocates a new object.
@@ -57,4 +57,4 @@ void operator delete(void* buf, size_t size)
 	BS->FreePool(buf);
 }
 
-#endif // __STANDALONE__
+#endif // __BOOTLDR_STANDALONE__