diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index 188e69f..f3921dc 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 006104f..f4c62d9 100644
--- a/vpnor/backend.cpp
+++ b/vpnor/backend.cpp
@@ -22,8 +22,8 @@
 #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 3625748..3790039 100644
--- a/vpnor/pnor_partition.cpp
+++ b/vpnor/partition.cpp
@@ -6,8 +6,8 @@
 
 #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 1e2b309..54aeece 100644
--- a/vpnor/pnor_partition_table.hpp
+++ b/vpnor/pnor_partition_table.hpp
@@ -86,7 +86,7 @@
  *  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 0b93747..c821d13 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -7,7 +7,7 @@
 	windows.c \
 	lpc.c \
 	vpnor/backend.cpp \
-	vpnor/pnor_partition.cpp \
+	vpnor/partition.cpp \
 	vpnor/pnor_partition_table.cpp \
 	%reldir%/tmpd.cpp