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"