diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index d051582498..9ad913e6f1 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1587,13 +1587,13 @@ int main(int argc, char **argv)
 	}
 
 	if (comboable)
-		amd_romsig->comboable = BUFF_TO_RUN(ctx, pspdir);
+		amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, pspdir);
 	else
-		amd_romsig->psp_entry = BUFF_TO_RUN(ctx, pspdir);
+		amd_romsig->psp_directory = BUFF_TO_RUN(ctx, pspdir);
 
 #if PSP_COMBO
 	psp_combo_directory *combo_dir = new_combo_dir(&ctx);
-	amd_romsig->comboable = BUFF_TO_RUN(ctx, combo_dir);
+	amd_romsig->combo_psp_directory = BUFF_TO_RUN(ctx, combo_dir);
 	/* 0 -Compare PSP ID, 1 -Compare chip family ID */
 	combo_dir->entries[0].id_sel = 0;
 	/* TODO: PSP ID. Documentation is needed. */
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index d246af7932..d7f0f5db96 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -86,8 +86,8 @@ typedef struct _embedded_firmware {
 	uint32_t imc_entry;
 	uint32_t gec_entry;
 	uint32_t xhci_entry;
-	uint32_t psp_entry;
-	uint32_t comboable;
+	uint32_t psp_directory;
+	uint32_t combo_psp_directory;
 	uint32_t bios0_entry; /* todo: add way to select correct entry */
 	uint32_t bios1_entry;
 	uint32_t bios2_entry;