8 files changed, 30 insertions, 26 deletions
diff --git a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h b/dev/kernel/FirmwareKit/CoreBoot/BootNet.h
index 6639d9e3..b05f382e 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h
+++ b/dev/kernel/FirmwareKit/CoreBoot/BootNet.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 #define kBootNetINetMagic "NETB"
 #define kBootNetINetMagicLength (4)
diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
index 2b274f21..9e756a70 100644
--- a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
+++ b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 namespace Firmware::Detail::CoreBoot {
 using namespace Kernel;
diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h
index e2fa3843..ed22f1e9 100644
--- a/dev/kernel/FirmwareKit/EFI/EFI.h
+++ b/dev/kernel/FirmwareKit/EFI/EFI.h
@@ -11,7 +11,7 @@
 @brief Implementation of the main EFI protocols.
 */
 
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 using namespace Kernel;
 
@@ -42,7 +42,7 @@ struct EfiDevicePathProtocol;
 struct EfiBootServices;
 struct EfiMemoryDescriptor;
 struct EfiSystemTable;
-struct EfiGUID;
+struct EFI_GUID;
 struct EfiFileDevicePathProtocol;
 struct EfiHandle;
 struct EfiGraphicsOutputProtocol;
@@ -85,9 +85,9 @@ typedef UInt64(EFI_API* EfiCopyMem)(VoidPtr DstBuf, VoidPtr SrcBuf, SizeT Length
 
 typedef UInt64(EFI_API* EfiSetMem)(VoidPtr DstBuf, Char Byte, SizeT Length);
 
-typedef UInt64(EFI_API* EfiHandleProtocol)(EfiHandlePtr Handle, EfiGUID* Guid, VoidPtr* Device);
+typedef UInt64(EFI_API* EfiHandleProtocol)(EfiHandlePtr Handle, EFI_GUID* Guid, VoidPtr* Device);
 
-typedef UInt64(EFI_API* EfiLocateDevicePath)(EfiGUID* Protocol, EfiDevicePathProtocol** DevicePath,
+typedef UInt64(EFI_API* EfiLocateDevicePath)(EFI_GUID* Protocol, EfiDevicePathProtocol** DevicePath,
                                              EfiHandlePtr Device);
 
 typedef UInt64(EFI_API* EfiStartImage)(EfiHandlePtr Handle, VoidPtr ArgsSize, VoidPtr ArgsPtr);
@@ -495,12 +495,12 @@ typedef UInt64(EFI_API* EfiGetMemoryMap)(UInt32* MapSize, EfiMemoryDescriptor* D
 /**
  * @brief GUID type, something you can also find in CFKit.
  */
-typedef struct EfiGUID EFI_FINAL {
+typedef struct EFI_GUID EFI_FINAL {
   UInt32 Data1;
   UInt16 Data2;
   UInt16 Data3;
   UInt8  Data4[8];
-} EfiGUID;
+} EFI_GUID;
 
 /***
  * Protocol stuff...
@@ -519,10 +519,10 @@ typedef struct EfiGUID EFI_FINAL {
 #define EFI_OPEN_PROTOCOL_BY_DRIVER 0x00000010
 #define EFI_OPEN_PROTOCOL_EXCLUSIVE 0x00000020
 
-typedef UInt64(EFI_API* EfiLocateProtocol)(EfiGUID* Protocol, VoidPtr Registration,
+typedef UInt64(EFI_API* EfiLocateProtocol)(EFI_GUID* Protocol, VoidPtr Registration,
                                            VoidPtr* Interface);
 
-typedef UInt64(EFI_API* EfiOpenProtocol)(EfiHandlePtr Handle, EfiGUID* Guid, VoidPtr* Interface,
+typedef UInt64(EFI_API* EfiOpenProtocol)(EfiHandlePtr Handle, EFI_GUID* Guid, VoidPtr* Interface,
                                          EfiHandlePtr AgentHandle, EfiHandlePtr ControllerHandle,
                                          UInt32 Attributes);
 
@@ -633,10 +633,10 @@ struct EfiSimpleFilesystemProtocol {
 typedef struct EfiRuntimeServices {
   EfiTableHeader SystemTable;
   VoidPtr GetTime, SetTime, GetWakeupTime, SetWakeupTime, SetVirtualAddressMap, ConvertPointer;
-  UInt64(EFI_API* GetVariable)(const WideChar* Name, EfiGUID VendorGUID, UInt32* Attributes,
+  UInt64(EFI_API* GetVariable)(const WideChar* Name, EFI_GUID VendorGUID, UInt32* Attributes,
                                UInt32* DataSize, VoidPtr Data);
   VoidPtr GetNextVariable;
-  UInt64(EFI_API* SetVariable)(const WideChar* Name, EfiGUID VendorGUID, UInt32* Attributes,
+  UInt64(EFI_API* SetVariable)(const WideChar* Name, EFI_GUID VendorGUID, UInt32* Attributes,
                                UInt32* DataSize, VoidPtr Data);
   VoidPtr GetNextHighMonotonicCount;
   VoidPtr ResetSystem;
@@ -663,7 +663,7 @@ typedef struct EfiSystemTable {
   UInt64                       NumberOfTableEntries;
   /// The configuration table (contains the RSD PTR entry.)
   struct {
-    EfiGUID VendorGUID;
+    EFI_GUID VendorGUID;
     VoidPtr VendorTable;
   } * ConfigurationTable;
 } EfiSystemTable;
@@ -792,9 +792,9 @@ typedef struct EfiFileProtocol {
 
   EfiStatusType(EFI_API* SetPosition)(EfiFileProtocol* Self, UInt64* Position);
 
-  EfiStatusType(EFI_API* GetInfo)(struct EfiFileProtocol*, struct EfiGUID*, UInt32*, void*);
+  EfiStatusType(EFI_API* GetInfo)(struct EfiFileProtocol*, struct EFI_GUID*, UInt32*, void*);
 
-  EfiStatusType(EFI_API* SetInfo)(struct EfiFileProtocol*, struct EfiGUID*, UInt32*, void*);
+  EfiStatusType(EFI_API* SetInfo)(struct EfiFileProtocol*, struct EFI_GUID*, UInt32*, void*);
 
   EfiStatusType(EFI_API* Flush)(EfiFileProtocol*);
 
diff --git a/dev/kernel/FirmwareKit/EFI/NS.h b/dev/kernel/FirmwareKit/EFI/NS.h
index f5a28e10..910b2c36 100644
--- a/dev/kernel/FirmwareKit/EFI/NS.h
+++ b/dev/kernel/FirmwareKit/EFI/NS.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 namespace Firmware::Detail::EFI {
 using namespace Kernel;
diff --git a/dev/kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h
index 27d635f3..05291929 100644
--- a/dev/kernel/FirmwareKit/EPM.h
+++ b/dev/kernel/FirmwareKit/EPM.h
@@ -11,7 +11,7 @@
 #ifndef FIRMWAREKIT_EPM_H
 #define FIRMWAREKIT_EPM_H
 
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 #define kEPMNameLength (32)
 #define kEPMFilesystemLength (16)
diff --git a/dev/kernel/FirmwareKit/GPT.h b/dev/kernel/FirmwareKit/GPT.h
index 7e5a910b..df0ed286 100644
--- a/dev/kernel/FirmwareKit/GPT.h
+++ b/dev/kernel/FirmwareKit/GPT.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <FirmwareKit/EFI/EFI.h>
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 #define kSectorAlignGPT_PartTbl (420U)
 #define kSectorAlignGPT_PartEntry (72U)
@@ -29,7 +29,7 @@ struct PACKED GPT_PARTITION_TABLE final {
   UInt64  LBAAltHeader;
   UInt64  FirstGPTEntry;
   UInt64  LastGPTEntry;
-  EfiGUID Guid;
+  EFI_GUID Guid;
   UInt64  StartingLBA;
   UInt32  NumPartitionEntries;
   UInt32  SizeOfEntries;
@@ -38,8 +38,8 @@ struct PACKED GPT_PARTITION_TABLE final {
 };
 
 struct PACKED GPT_PARTITION_ENTRY {
-  EfiGUID PartitionTypeGUID;
-  EfiGUID UniquePartitionGUID;
+  EFI_GUID PartitionTypeGUID;
+  EFI_GUID UniquePartitionGUID;
   UInt64  StartLBA;
   UInt64  EndLBA;
   UInt64  Attributes;
diff --git a/dev/kernel/FirmwareKit/Handover.h b/dev/kernel/FirmwareKit/Handover.h
index d3ccc724..d74194ed 100644
--- a/dev/kernel/FirmwareKit/Handover.h
+++ b/dev/kernel/FirmwareKit/Handover.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <FirmwareKit/EFI/EFI.h>
-#include <NewKit/Defines.h>
+#include <NeKit/Defines.h>
 
 #define kHandoverMagic (0xBADCC)
 #define kHandoverVersion (0x0117)
@@ -61,8 +61,12 @@ struct BootInfoHeader final {
 
   VoidPtr f_KernelImage;
   SizeT   f_KernelSz;
-  VoidPtr f_StartupImage;
-  SizeT   f_StartupSz;
+
+  VoidPtr f_LibSystemImage;
+  SizeT   f_LibSystemSz;
+
+  VoidPtr f_StackTop;
+  SizeT   f_StackSz;
 
   WideChar f_FirmwareVendorName[32];
   SizeT    f_FirmwareVendorLen;
diff --git a/dev/kernel/FirmwareKit/VEPM.h b/dev/kernel/FirmwareKit/VEPM.h
index ca6c83bf..30f6c04d 100644
--- a/dev/kernel/FirmwareKit/VEPM.h
+++ b/dev/kernel/FirmwareKit/VEPM.h
@@ -12,7 +12,7 @@
 
 /// @brief The Virtual Explicit Partition Map scheme extension.
 
-#ifdef __NE_VEPM__
+#if defined(__NE_VEPM__)
 #ifdef kEPMMagic
 #undef kEPMMagic
 #endif  // kEPMMagic
@@ -26,7 +26,7 @@ inline EPM_GUID kVEPMGuidEPM = {
 
 /// @brief VEPM GUID.
 /// @note This is the GUID used to identify a VEPM partition (EFI version)
-inline EfiGUID kVEPMGuidEFI = {
+inline EFI_GUID kVEPMGuidEFI = {
     0x9a1b3f2e, 0x4c3f, 0x4d52, {0xa7, 0x83, 0x9c, 0x21, 0x7b, 0x5e, 0x4d, 0xac}};
 
 #define kVEPMGuidStr "9a1b3f2e-4c3f-4d52-a783-9c217b5e4dac"