diff --git a/arch.mk b/arch.mk
index f60505a9..a2e8c36c 100644
--- a/arch.mk
+++ b/arch.mk
@@ -733,7 +733,7 @@ ifeq ("${FSP}", "1")
     OBJS += src/x86/ata.o
     OBJS += src/x86/gpt.o
     OBJS += src/x86/mptable.o
-    OBJS += src/stage1.o
+    OBJS += src/stage2_params.o
     OBJS += src/x86/exceptions.o
     UPDATE_OBJS := src/update_disk.o
     ifeq ($(64BIT),1)
diff --git a/include/stage1.h b/include/stage2_params.h
similarity index 98%
rename from include/stage1.h
rename to include/stage2_params.h
index ed4aa74e..f00e7bfb 100644
--- a/include/stage1.h
+++ b/include/stage2_params.h
@@ -1,4 +1,4 @@
-/* stage1.h
+/* stage2_params.h
  *
  * Copyright (C) 2023 wolfSSL Inc.
  *
diff --git a/src/boot_x86_fsp.c b/src/boot_x86_fsp.c
index 110e27a1..99dc3163 100644
--- a/src/boot_x86_fsp.c
+++ b/src/boot_x86_fsp.c
@@ -33,7 +33,7 @@
 #include <x86/paging.h>
 #include <pci.h>
 #include <target.h>
-#include <stage1.h>
+#include <stage2_params.h>
 
 #include "wolfboot/wolfboot.h"
 #include "image.h"
diff --git a/src/boot_x86_fsp_payload.c b/src/boot_x86_fsp_payload.c
index 7f0d89b7..81abd55b 100644
--- a/src/boot_x86_fsp_payload.c
+++ b/src/boot_x86_fsp_payload.c
@@ -34,7 +34,7 @@
 #include <x86/common.h>
 
 #include <printf.h>
-#include <stage1.h>
+#include <stage2_params.h>
 #include <x86/mptable.h>
 
 #if defined(WOLFBOOT_LINUX_PAYLOAD)
diff --git a/src/multiboot.c b/src/multiboot.c
index 79844699..6a1c1cd2 100644
--- a/src/multiboot.c
+++ b/src/multiboot.c
@@ -28,7 +28,7 @@
 #include <multiboot.h>
 
 #ifdef WOLFBOOT_FSP
-#include <stage1.h>
+#include <stage2_params.h>
 #endif
 
 #define MB2_HEADER_MAX_OFF (32768 - 4)
diff --git a/src/stage1.c b/src/stage2_params.c
similarity index 96%
rename from src/stage1.c
rename to src/stage2_params.c
index d3180249..c8377b85 100644
--- a/src/stage1.c
+++ b/src/stage2_params.c
@@ -1,4 +1,4 @@
-/* stage1.h
+/* stage2_params.h
  *
  * Copyright (C) 2023 wolfSSL Inc.
  *
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
-#include <stage1.h>
+#include <stage2_params.h>
 
 /* must be global so the linker will export the symbol. It's used from loader 1
  * to fill the parameters */
diff --git a/src/update_disk.c b/src/update_disk.c
index b6c9e5c7..62d7afd6 100644
--- a/src/update_disk.c
+++ b/src/update_disk.c
@@ -41,7 +41,7 @@
 #include "hal.h"
 #include "spi_flash.h"
 #include "printf.h"
-#include "stage1.h"
+#include "stage2_params.h"
 #include "wolfboot/wolfboot.h"
 #include <stdint.h>
 #include <string.h>
diff --git a/src/x86/ahci.c b/src/x86/ahci.c
index cbf7b8c2..453c5344 100644
--- a/src/x86/ahci.c
+++ b/src/x86/ahci.c
@@ -45,7 +45,7 @@
 #include <tpm.h>
 
 #if defined(WOLFBOOT_FSP)
-#include <stage1.h>
+#include <stage2_params.h>
 #endif
 
 #include <wolfssl/wolfcrypt/coding.h>
diff --git a/src/x86/linux_loader.c b/src/x86/linux_loader.c
index 77213167..f5f6d907 100644
--- a/src/x86/linux_loader.c
+++ b/src/x86/linux_loader.c
@@ -30,7 +30,7 @@
 
 #ifdef WOLFBOOT_FSP
 #include <x86/hob.h>
-#include <stage1.h>
+#include <stage2_params.h>
 #endif /* WOLFBOOT_FSP */
 
 #define ENDLINE "\r\n"
diff --git a/src/x86/qemu_fsp.c b/src/x86/qemu_fsp.c
index 47020ddd..62ec390e 100644
--- a/src/x86/qemu_fsp.c
+++ b/src/x86/qemu_fsp.c
@@ -25,6 +25,7 @@
 #include <x86/hob.h>
 #include <uart_drv.h>
 #include <x86/ahci.h>
+#include <stage2_params.h>
 
 #define FSPM_UPD_SIGNATURE 0x4D5F4450554D4551 /* 'QEMUPD_M' */
 #define FSPT_UPD_SIGNATURE 0x545F4450554D4551 /* 'QEMUPD_T' */
diff --git a/src/x86/tgl_fsp.c b/src/x86/tgl_fsp.c
index e9836055..e34fb730 100644
--- a/src/x86/tgl_fsp.c
+++ b/src/x86/tgl_fsp.c
@@ -46,7 +46,7 @@
 #include <x86/fsp/FspmUpd.h>
 #include <x86/fsp/FspsUpd.h>
 #include <x86/ahci.h>
-#include <stage1.h>
+#include <stage2_params.h>
 
 #define PCR_DMI_PORT_ID 0x88
 #define PCR_DMI_LPCLGIR1 0x2730