diff --git a/hdata/spira.c b/hdata/spira.c
index f6003ea0fc0f..1bcbb6c589b9 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -9,7 +9,7 @@
 #include <interrupts.h>
 #include <ccan/str/str.h>
 #include <chip.h>
-#include <fsp-mdst-table.h>
+#include <opal-dump.h>
 #include <fsp-attn.h>
 #include <fsp-leds.h>
 
@@ -81,9 +81,9 @@ __section(".cpuctrl.data") struct cpu_ctl_init_data cpu_ctl_init_data = {
  * addresses, we set the top bit to 1 on physical addresses
  */
 
-extern struct dump_mdst_table init_mdst_table[];
+extern struct mdst_table init_mdst_table[];
 
-__section(".mdst.data") struct dump_mdst_table init_mdst_table[2] = {
+__section(".mdst.data") struct mdst_table init_mdst_table[2] = {
 	{
 		.addr = CPU_TO_BE64(INMEM_CON_START | HRMOR_BIT),
 		.type = CPU_TO_BE32(DUMP_REGION_CONSOLE),
diff --git a/hw/fsp/Makefile.inc b/hw/fsp/Makefile.inc
index b078a4d765bd..21dc52a9f803 100644
--- a/hw/fsp/Makefile.inc
+++ b/hw/fsp/Makefile.inc
@@ -4,7 +4,7 @@ FSP_OBJS  = fsp.o fsp-console.o fsp-rtc.o fsp-nvram.o fsp-sysparam.o
 FSP_OBJS += fsp-surveillance.o fsp-codeupdate.o fsp-sensor.o
 FSP_OBJS += fsp-diag.o fsp-leds.o fsp-mem-err.o fsp-op-panel.o
 FSP_OBJS += fsp-elog-read.o fsp-elog-write.o fsp-epow.o fsp-dpo.o
-FSP_OBJS += fsp-dump.o fsp-mdst-table.o fsp-chiptod.o fsp-ipmi.o
+FSP_OBJS += fsp-dump.o fsp-sysdump.o fsp-chiptod.o fsp-ipmi.o
 FSP_OBJS += fsp-attn.o fsp-occ.o fsp-psi.o
 FSP = hw/fsp/built-in.a
 
diff --git a/hw/fsp/fsp-mdst-table.c b/hw/fsp/fsp-sysdump.c
similarity index 98%
rename from hw/fsp/fsp-mdst-table.c
rename to hw/fsp/fsp-sysdump.c
index 98f667f96b23..869e059e70c3 100644
--- a/hw/fsp/fsp-mdst-table.c
+++ b/hw/fsp/fsp-sysdump.c
@@ -18,7 +18,7 @@
 #include <lock.h>
 #include <skiboot.h>
 #include <errorlog.h>
-#include <fsp-mdst-table.h>
+#include <opal-dump.h>
 
 /*
  * Sapphire dump size
@@ -46,8 +46,8 @@ DEFINE_LOG_ENTRY(OPAL_RC_DUMP_MDST_REMOVE, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 
-static struct dump_mdst_table *mdst_table;
-static struct dump_mdst_table *dump_mem_region;
+static struct mdst_table *mdst_table;
+static struct mdst_table *dump_mem_region;
 
 static int cur_mdst_entry;
 static int max_mdst_entry;
diff --git a/include/fsp-mdst-table.h b/include/opal-dump.h
similarity index 82%
rename from include/fsp-mdst-table.h
rename to include/opal-dump.h
index 7f0ce14678df..631aa20c0ad6 100644
--- a/include/fsp-mdst-table.h
+++ b/include/opal-dump.h
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 /* Copyright 2013-2015 IBM Corp. */
 
-#ifndef __FSPMDST_H
-#define __FSPMDST_H
+#ifndef __OPAL_DUMP_H
+#define __OPAL_DUMP_H
 
 /*
  * Dump region ids
@@ -25,10 +25,10 @@
  * Format of this table is same as Memory Dump Source Table (MDST)
  * defined in HDAT spec.
  */
-struct dump_mdst_table {
+struct mdst_table {
 	__be64	addr;
-	__be32	type; /* DUMP_SECTION_* */
+	__be32	type; /* DUMP_REGION_* */
 	__be32	size;
 };
 
-#endif	/* __FSPMDST_H */
+#endif	/* __OPAL_DUMP_H */