diff --git a/Documentation/mboxd.md b/Documentation/mboxd.md
index f8ae982..c91b7d6 100644
--- a/Documentation/mboxd.md
+++ b/Documentation/mboxd.md
@@ -25,7 +25,7 @@
 ```
 dbus.c -    Contains the handlers for the D-Bus commands which the daemon can
                   receive.
-mboxd_flash.c -   Contains the functions for performing flash access including
+flash.c -   Contains the functions for performing flash access including
                   read, write and erase.
 mboxd_lpc.c -     Contains the functions for controlling the LPC bus mapping
                   including pointing the bus so it maps flash and memory.
diff --git a/Makefile.am b/Makefile.am
index fa086da..5df4b95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 if VIRTUAL_PNOR_ENABLED
 include vpnor/Makefile.am.include
 else
-mboxd_SOURCES += mboxd_flash.c \
+mboxd_SOURCES += flash.c \
 	mboxd_lpc_reset.c
 endif
 
diff --git a/control.c b/control.c
index 39099d3..72245d7 100644
--- a/control.c
+++ b/control.c
@@ -5,7 +5,7 @@
 
 #include "dbus.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "mboxd_lpc.h"
 #include "mboxd_msg.h"
 #include "mboxd_windows.h"
diff --git a/mboxd_flash.c b/flash.c
similarity index 99%
rename from mboxd_flash.c
rename to flash.c
index 5cd5868..1513843 100644
--- a/mboxd_flash.c
+++ b/flash.c
@@ -28,7 +28,7 @@
 
 #include "mbox.h"
 #include "common.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 int init_flash_dev(struct mbox_context *context)
 {
diff --git a/mboxd_flash.h b/flash.h
similarity index 100%
rename from mboxd_flash.h
rename to flash.h
diff --git a/mboxd.c b/mboxd.c
index d04daf4..6ebe596 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "dbus.h"
 #include "control_dbus.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "mboxd_lpc.h"
 #include "mboxd_msg.h"
 #include "mboxd_windows.h"
diff --git a/mboxd_lpc.c b/mboxd_lpc.c
index a9c686d..8d5885a 100644
--- a/mboxd_lpc.c
+++ b/mboxd_lpc.c
@@ -27,7 +27,7 @@
 #include "mbox.h"
 #include "common.h"
 #include "mboxd_lpc.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include <linux/aspeed-lpc-ctrl.h>
 
 #define LPC_CTRL_PATH		"/dev/aspeed-lpc-ctrl"
diff --git a/mboxd_windows.c b/mboxd_windows.c
index 6a14e68..200b205 100644
--- a/mboxd_windows.c
+++ b/mboxd_windows.c
@@ -29,7 +29,7 @@
 #include "common.h"
 #include "mboxd_msg.h"
 #include "mboxd_windows.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 /* Initialisation Functions */
 
diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index 264d704..760dbdd 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -2,19 +2,19 @@
 
 test_copy_flash_SOURCES = \
 	%reldir%/copy_flash.c \
-	mboxd_flash.c \
+	flash.c \
 	common.c mtd.c \
 	%reldir%/tmpf.c
 
 test_erase_flash_SOURCES = \
 	%reldir%/erase_flash.c \
-	mboxd_flash.c \
+	flash.c \
 	common.c \
 	%reldir%/tmpf.c
 
 test_write_flash_SOURCES = \
 	%reldir%/write_flash.c \
-	mboxd_flash.c \
+	flash.c \
 	common.c \
 	%reldir%/tmpf.c
 
@@ -24,7 +24,7 @@
 	mboxd_lpc.c \
 	mboxd_lpc_reset.c \
 	common.c \
-	mboxd_flash.c
+	flash.c
 
 TEST_MOCK_SRCS = %reldir%/tmpf.c %reldir%/mbox.c %reldir%/system.c
 
diff --git a/test/copy_flash.c b/test/copy_flash.c
index b8beb21..d6632d2 100644
--- a/test/copy_flash.c
+++ b/test/copy_flash.c
@@ -11,7 +11,7 @@
 
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "test/tmpf.h"
 
diff --git a/test/erase_flash.c b/test/erase_flash.c
index 376b7d5..1a707a2 100644
--- a/test/erase_flash.c
+++ b/test/erase_flash.c
@@ -11,7 +11,7 @@
 #include <linux/types.h>
 
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "test/tmpf.h"
 
diff --git a/test/mbox.c b/test/mbox.c
index 3daf493..7e03292 100644
--- a/test/mbox.c
+++ b/test/mbox.c
@@ -14,7 +14,7 @@
 #include <unistd.h>
 
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "mboxd_lpc.h"
 #include "mboxd_msg.h"
 #include "mboxd_windows.h"
diff --git a/test/write_flash.c b/test/write_flash.c
index 4828cdd..b09e7de 100644
--- a/test/write_flash.c
+++ b/test/write_flash.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "test/tmpf.h"
 
diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index 0f3de00..e4379d2 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -1,6 +1,6 @@
 mboxd_SOURCES += %reldir%/pnor_partition_table.cpp \
 	%reldir%/mboxd_pnor_partition_table.cpp \
-	%reldir%/mboxd_flash.cpp \
+	%reldir%/flash.cpp \
 	%reldir%/pnor_partition.cpp \
 	%reldir%/mboxd_lpc_reset.cpp \
 	%reldir%/mboxd_msg.cpp
diff --git a/vpnor/mboxd_flash.cpp b/vpnor/flash.cpp
similarity index 99%
rename from vpnor/mboxd_flash.cpp
rename to vpnor/flash.cpp
index a774ec1..3d512cb 100644
--- a/vpnor/mboxd_flash.cpp
+++ b/vpnor/flash.cpp
@@ -15,7 +15,7 @@
 }
 
 #include "config.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "mboxd_pnor_partition_table.h"
 #include "pnor_partition.hpp"
 #include "pnor_partition_table.hpp"
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index 1756516..0f584a0 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -4,7 +4,7 @@
 #include "pnor_partition_table.hpp"
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "pnor_partition_table.hpp"
 #include "config.h"
 #include "xyz/openbmc_project/Common/error.hpp"
diff --git a/vpnor/pnor_partition.cpp b/vpnor/pnor_partition.cpp
index 67a24f4..7961194 100644
--- a/vpnor/pnor_partition.cpp
+++ b/vpnor/pnor_partition.cpp
@@ -3,7 +3,7 @@
 #include "pnor_partition.hpp"
 #include "pnor_partition_table.hpp"
 #include "config.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 #include "mboxd_pnor_partition_table.h"
 #include "xyz/openbmc_project/Common/error.hpp"
 #include <phosphor-logging/log.hpp>
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index 819343b..e2d5427 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -10,7 +10,7 @@
 	mboxd_lpc.c \
 	vpnor/mboxd_lpc_reset.cpp \
 	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
+	vpnor/flash.cpp \
 	vpnor/mboxd_msg.cpp \
 	vpnor/pnor_partition.cpp \
 	vpnor/pnor_partition_table.cpp \
diff --git a/vpnor/test/write_patch.cpp b/vpnor/test/write_patch.cpp
index 3b2b16a..1a3e4ee 100644
--- a/vpnor/test/write_patch.cpp
+++ b/vpnor/test/write_patch.cpp
@@ -12,7 +12,7 @@
 #include "config.h"
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "vpnor/test/tmpd.hpp"
 
diff --git a/vpnor/test/write_patch_resize.cpp b/vpnor/test/write_patch_resize.cpp
index 8d67683..5d39802 100644
--- a/vpnor/test/write_patch_resize.cpp
+++ b/vpnor/test/write_patch_resize.cpp
@@ -13,7 +13,7 @@
 #include "config.h"
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "vpnor/test/tmpd.hpp"
 
diff --git a/vpnor/test/write_prsv.cpp b/vpnor/test/write_prsv.cpp
index 6e0ca0f..f880476 100644
--- a/vpnor/test/write_prsv.cpp
+++ b/vpnor/test/write_prsv.cpp
@@ -10,7 +10,7 @@
 
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "vpnor/test/tmpd.hpp"
 
diff --git a/vpnor/test/write_ro.cpp b/vpnor/test/write_ro.cpp
index 53eeb18..f0dd215 100644
--- a/vpnor/test/write_ro.cpp
+++ b/vpnor/test/write_ro.cpp
@@ -10,7 +10,7 @@
 
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "vpnor/test/tmpd.hpp"
 
diff --git a/vpnor/test/write_rw.cpp b/vpnor/test/write_rw.cpp
index 1c4bd38..7760fc7 100644
--- a/vpnor/test/write_rw.cpp
+++ b/vpnor/test/write_rw.cpp
@@ -10,7 +10,7 @@
 
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_flash.h"
+#include "flash.h"
 
 #include "vpnor/test/tmpd.hpp"