3 files changed, 4 insertions, 4 deletions
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 3ea7350e..60d1bd77 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -19,7 +19,7 @@ STATIC Void bootnet_read_ip_packet(BOOTNET_INTERNET_HEADER   inet,
                                    BOOTNET_INTERNET_HEADER** inet_out);
 
 EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
-  fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[1]);
+  fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[Kernel::HEL::kHandoverTableST]);
 
   Boot::BootTextWriter writer;
 
diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc
index c93ef83b..4f71ee31 100644
--- a/dev/boot/modules/SysChk/SysChk.cc
+++ b/dev/boot/modules/SysChk/SysChk.cc
@@ -27,7 +27,7 @@
 #endif  // !kMachineModel
 
 EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) {
-  fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[1]);
+  fw_init_efi((EfiSystemTable*) handover->f_FirmwareCustomTables[Kernel::HEL::kHandoverTableST]);
 
 #if defined(__ATA_PIO__)
   Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 12a912e5..45566d6c 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -156,8 +156,8 @@ EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr image_handle, EfiSystemTa
     }
   }
 
-  handover_hdr->f_FirmwareCustomTables[0] = (VoidPtr) BS;
-  handover_hdr->f_FirmwareCustomTables[1] = (VoidPtr) ST;
+  handover_hdr->f_FirmwareCustomTables[Kernel::HEL::kHandoverTableBS] = (VoidPtr) BS;
+  handover_hdr->f_FirmwareCustomTables[Kernel::HEL::kHandoverTableST] = (VoidPtr) ST;
 
   // ------------------------------------------ //
   // If we succeed in reading the blob, then execute it.