diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index 188e69f9ba73fe4414631b8c68dd8bf8224c58e6..f3921dc56cf952ebf918e4497b69186d1eff1129 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -1,6 +1,6 @@
 mboxd_SOURCES += %reldir%/pnor_partition_table.cpp \
 	%reldir%/backend.cpp \
-	%reldir%/pnor_partition.cpp
+	%reldir%/partition.cpp
 
 mboxd_LDFLAGS += -lstdc++fs \
 	$(SDBUSPLUS_LIBS) \
diff --git a/vpnor/backend.cpp b/vpnor/backend.cpp
index 006104f1e8e62a1bec0aa4f25194868b64d8964c..f4c62d9d1683f540791aea3ebd55484336914e83 100644
--- a/vpnor/backend.cpp
+++ b/vpnor/backend.cpp
@@ -22,8 +22,8 @@ extern "C" {
 #include "vpnor/backend.h"
 }
 
-#include "pnor_partition.hpp"
 #include "pnor_partition_table.hpp"
+#include "vpnor/partition.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <cassert>
diff --git a/vpnor/pnor_partition.cpp b/vpnor/partition.cpp
similarity index 99%
rename from vpnor/pnor_partition.cpp
rename to vpnor/partition.cpp
index 362574819942b137b1afe1c6373565c8fbbbc679..379003993b975205aba3ed87cb31fcd9bcbb2310 100644
--- a/vpnor/pnor_partition.cpp
+++ b/vpnor/partition.cpp
@@ -6,8 +6,8 @@ extern "C" {
 
 #include "config.h"
 
-#include "pnor_partition.hpp"
 #include "pnor_partition_table.hpp"
+#include "vpnor/partition.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <assert.h>
diff --git a/vpnor/pnor_partition.hpp b/vpnor/partition.hpp
similarity index 100%
rename from vpnor/pnor_partition.hpp
rename to vpnor/partition.hpp
diff --git a/vpnor/pnor_partition_table.hpp b/vpnor/pnor_partition_table.hpp
index 1e2b309f2caacb18140b192f83bf8a0178e989bb..54aeece9283d8c9d92b245a685ab8e624b911ca5 100644
--- a/vpnor/pnor_partition_table.hpp
+++ b/vpnor/pnor_partition_table.hpp
@@ -86,7 +86,7 @@ namespace partition
  *  PNOR image.
  *  These files are stored in a well-known location on the PNOR.
  *  Based on this information, this class prepares the partition table whose
- *  structure is as outlined in pnor_partition.h.
+ *  structure is as outlined in partition.hpp.
  *
  *  The virtual PNOR supports 4KB erase blocks - partitions must be aligned to
  *  this size.
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index 0b937476c71bb94f76b88f11b59f3c5c3ac9c701..c821d138de1be172ba1ac836df226c26e4cbd41d 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -7,7 +7,7 @@ TEST_MBOX_VPNOR_INTEG_SRCS = \
 	windows.c \
 	lpc.c \
 	vpnor/backend.cpp \
-	vpnor/pnor_partition.cpp \
+	vpnor/partition.cpp \
 	vpnor/pnor_partition_table.cpp \
 	%reldir%/tmpd.cpp