diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index f3921dc..a37d1ff 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -1,4 +1,4 @@
-mboxd_SOURCES += %reldir%/pnor_partition_table.cpp \
+mboxd_SOURCES += %reldir%/table.cpp \
 	%reldir%/backend.cpp \
 	%reldir%/partition.cpp
 
diff --git a/vpnor/backend.cpp b/vpnor/backend.cpp
index f4c62d9..f1b2c63 100644
--- a/vpnor/backend.cpp
+++ b/vpnor/backend.cpp
@@ -22,8 +22,8 @@
 #include "vpnor/backend.h"
 }
 
-#include "pnor_partition_table.hpp"
 #include "vpnor/partition.hpp"
+#include "vpnor/table.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <cassert>
diff --git a/vpnor/partition.cpp b/vpnor/partition.cpp
index 3790039..900004b 100644
--- a/vpnor/partition.cpp
+++ b/vpnor/partition.cpp
@@ -6,8 +6,8 @@
 
 #include "config.h"
 
-#include "pnor_partition_table.hpp"
 #include "vpnor/partition.hpp"
+#include "vpnor/table.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <assert.h>
diff --git a/vpnor/partition.hpp b/vpnor/partition.hpp
index 681f013..d6346b1 100644
--- a/vpnor/partition.hpp
+++ b/vpnor/partition.hpp
@@ -7,7 +7,7 @@
 #include "vpnor/backend.h"
 };
 
-#include "pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/vpnor/pnor_partition_table.cpp b/vpnor/table.cpp
similarity index 99%
rename from vpnor/pnor_partition_table.cpp
rename to vpnor/table.cpp
index 64a7872..8c5b882 100644
--- a/vpnor/pnor_partition_table.cpp
+++ b/vpnor/table.cpp
@@ -8,7 +8,7 @@
 #include "mboxd.h"
 }
 
-#include "pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
 #include <endian.h>
diff --git a/vpnor/pnor_partition_table.hpp b/vpnor/table.hpp
similarity index 100%
rename from vpnor/pnor_partition_table.hpp
rename to vpnor/table.hpp
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index c821d13..de081fd 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -8,7 +8,7 @@
 	lpc.c \
 	vpnor/backend.cpp \
 	vpnor/partition.cpp \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/tmpd.cpp
 
 VPNOR_LDADD = -lstdc++fs \
@@ -60,42 +60,42 @@
 
 vpnor_test_toc_no_name_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_no_name.cpp
 vpnor_test_toc_no_name_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_no_name_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_toc_start_gt_end_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_start_gt_end.cpp
 vpnor_test_toc_start_gt_end_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_start_gt_end_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_toc_no_start_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_no_start.cpp
 vpnor_test_toc_no_start_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_no_start_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_toc_no_end_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_no_end.cpp
 vpnor_test_toc_no_end_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_no_end_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_toc_no_version_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_no_version.cpp
 vpnor_test_toc_no_version_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_no_version_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_toc_flags_SOURCES = \
 	common.c \
-	vpnor/pnor_partition_table.cpp \
+	vpnor/table.cpp \
 	%reldir%/toc_flags.cpp
 vpnor_test_toc_flags_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_toc_flags_LDADD = $(VPNOR_LDADD)
diff --git a/vpnor/test/create_pnor_partition_table.cpp b/vpnor/test/create_pnor_partition_table.cpp
index 7af61b7..cc9baed 100644
--- a/vpnor/test/create_pnor_partition_table.cpp
+++ b/vpnor/test/create_pnor_partition_table.cpp
@@ -9,7 +9,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <cassert>
diff --git a/vpnor/test/create_read_window_toc.cpp b/vpnor/test/create_read_window_toc.cpp
index 1eda6c2..f58844d 100644
--- a/vpnor/test/create_read_window_toc.cpp
+++ b/vpnor/test/create_read_window_toc.cpp
@@ -8,7 +8,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <sys/mman.h>
diff --git a/vpnor/test/force_readonly_toc.cpp b/vpnor/test/force_readonly_toc.cpp
index e71b5d1..53e5282 100644
--- a/vpnor/test/force_readonly_toc.cpp
+++ b/vpnor/test/force_readonly_toc.cpp
@@ -9,7 +9,7 @@
 #include "vpnor/ffs.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <endian.h>
diff --git a/vpnor/test/tmpd.hpp b/vpnor/test/tmpd.hpp
index f6ea7c9..ae6da9e 100644
--- a/vpnor/test/tmpd.hpp
+++ b/vpnor/test/tmpd.hpp
@@ -8,7 +8,7 @@
 #include "mboxd.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 #include <cstring>
diff --git a/vpnor/test/toc_flags.cpp b/vpnor/test/toc_flags.cpp
index 181c7b2..1ee853f 100644
--- a/vpnor/test/toc_flags.cpp
+++ b/vpnor/test/toc_flags.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/toc_lookup_failed.cpp b/vpnor/test/toc_lookup_failed.cpp
index b92cdff..045caa8 100644
--- a/vpnor/test/toc_lookup_failed.cpp
+++ b/vpnor/test/toc_lookup_failed.cpp
@@ -8,7 +8,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
diff --git a/vpnor/test/toc_lookup_found.cpp b/vpnor/test/toc_lookup_found.cpp
index efe4ea4..93c769f 100644
--- a/vpnor/test/toc_lookup_found.cpp
+++ b/vpnor/test/toc_lookup_found.cpp
@@ -8,7 +8,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <cassert>
diff --git a/vpnor/test/toc_missing_file.cpp b/vpnor/test/toc_missing_file.cpp
index b19bfd8..2face11 100644
--- a/vpnor/test/toc_missing_file.cpp
+++ b/vpnor/test/toc_missing_file.cpp
@@ -8,7 +8,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <cassert>
diff --git a/vpnor/test/toc_no_end.cpp b/vpnor/test/toc_no_end.cpp
index 86cc0a9..496bd80 100644
--- a/vpnor/test/toc_no_end.cpp
+++ b/vpnor/test/toc_no_end.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/toc_no_name.cpp b/vpnor/test/toc_no_name.cpp
index 2db91f4..e305bff 100644
--- a/vpnor/test/toc_no_name.cpp
+++ b/vpnor/test/toc_no_name.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/toc_no_start.cpp b/vpnor/test/toc_no_start.cpp
index 17b2ea0..9f0bc1a 100644
--- a/vpnor/test/toc_no_start.cpp
+++ b/vpnor/test/toc_no_start.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/toc_no_version.cpp b/vpnor/test/toc_no_version.cpp
index 4a712c4..b4accf8 100644
--- a/vpnor/test/toc_no_version.cpp
+++ b/vpnor/test/toc_no_version.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/toc_overlap.cpp b/vpnor/test/toc_overlap.cpp
index 18b7151..96e4d95 100644
--- a/vpnor/test/toc_overlap.cpp
+++ b/vpnor/test/toc_overlap.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2018 IBM Corp.
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 #include <cstring>
diff --git a/vpnor/test/toc_start_gt_end.cpp b/vpnor/test/toc_start_gt_end.cpp
index cd4a6bc..aee4a20 100644
--- a/vpnor/test/toc_start_gt_end.cpp
+++ b/vpnor/test/toc_start_gt_end.cpp
@@ -3,7 +3,7 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 
 #include <cassert>
 
diff --git a/vpnor/test/write_toc.cpp b/vpnor/test/write_toc.cpp
index d8b63ce..2c736c0 100644
--- a/vpnor/test/write_toc.cpp
+++ b/vpnor/test/write_toc.cpp
@@ -8,7 +8,7 @@
 #include "test/system.h"
 }
 
-#include "vpnor/pnor_partition_table.hpp"
+#include "vpnor/table.hpp"
 #include "vpnor/test/tmpd.hpp"
 
 #include <sys/mman.h>