diff --git a/mboxd.c b/mboxd.c
index 48624c8..70580de 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -36,7 +36,7 @@
 #include "transport_mbox.h"
 #include "transport_dbus.h"
 #include "windows.h"
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const char* USAGE =
 	"\nUsage: %s [-V | --version] [-h | --help] [-v[v] | --verbose] [-s | --syslog]\n"
diff --git a/mboxd.h b/mboxd.h
index ef4f5be..96235d7 100644
--- a/mboxd.h
+++ b/mboxd.h
@@ -13,7 +13,7 @@
 #include "backend.h"
 #include "protocol.h"
 #include "transport.h"
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 #include "windows.h"
 
 enum api_version {
diff --git a/vpnor/backend.cpp b/vpnor/backend.cpp
index ccda4ec..06aed57 100644
--- a/vpnor/backend.cpp
+++ b/vpnor/backend.cpp
@@ -31,7 +31,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 namespace err = sdbusplus::xyz::openbmc_project::Common::Error;
 namespace fs = std::experimental::filesystem;
diff --git a/vpnor/mboxd_pnor_partition_table.h b/vpnor/backend.h
similarity index 100%
rename from vpnor/mboxd_pnor_partition_table.h
rename to vpnor/backend.h
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index 394cc18..e5f7458 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -16,7 +16,7 @@
 
 #include "common.h"
 #include "mboxd.h"
-#include "mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 void vpnor_default_paths(vpnor_partition_paths* paths)
 {
diff --git a/vpnor/pnor_partition.cpp b/vpnor/pnor_partition.cpp
index 9854159..3625748 100644
--- a/vpnor/pnor_partition.cpp
+++ b/vpnor/pnor_partition.cpp
@@ -28,7 +28,7 @@
 #include <string>
 
 #include "common.h"
-#include "mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 namespace openpower
 {
diff --git a/vpnor/pnor_partition.hpp b/vpnor/pnor_partition.hpp
index c91f22e..681f013 100644
--- a/vpnor/pnor_partition.hpp
+++ b/vpnor/pnor_partition.hpp
@@ -4,7 +4,7 @@
 
 extern "C" {
 #include "backend.h"
-#include "mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 };
 
 #include "pnor_partition_table.hpp"
diff --git a/vpnor/pnor_partition_table.hpp b/vpnor/pnor_partition_table.hpp
index 90f014c..cfd47b5 100644
--- a/vpnor/pnor_partition_table.hpp
+++ b/vpnor/pnor_partition_table.hpp
@@ -10,8 +10,8 @@
 extern "C" {
 #include "backend.h"
 #include "common.h"
-#include "mboxd_pnor_partition_table.h"
 #include "pnor_partition_defs.h"
+#include "vpnor/backend.h"
 }
 
 struct mbox_context;
diff --git a/vpnor/test/create_read_window_oob.cpp b/vpnor/test/create_read_window_oob.cpp
index d1e7e64..8652d72 100644
--- a/vpnor/test/create_read_window_oob.cpp
+++ b/vpnor/test/create_read_window_oob.cpp
@@ -13,7 +13,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READONLY",
diff --git a/vpnor/test/create_read_window_partition_exists.cpp b/vpnor/test/create_read_window_partition_exists.cpp
index 7ff3018..5469615 100644
--- a/vpnor/test/create_read_window_partition_exists.cpp
+++ b/vpnor/test/create_read_window_partition_exists.cpp
@@ -16,7 +16,7 @@
 #include <fstream>
 #include <vector>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 // A read window assumes that the toc is located at offset 0,
 // so create dummy partition at arbitrary offset 0x1000.
diff --git a/vpnor/test/create_read_window_partition_invalid.cpp b/vpnor/test/create_read_window_partition_invalid.cpp
index 4d28b2c..9083ee2 100644
--- a/vpnor/test/create_read_window_partition_invalid.cpp
+++ b/vpnor/test/create_read_window_partition_invalid.cpp
@@ -13,7 +13,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const std::string toc[] = {
     "partition01=HBB,00002000,00003000,80,ECC,READONLY",
diff --git a/vpnor/test/create_read_window_remap.cpp b/vpnor/test/create_read_window_remap.cpp
index f81d1bc..5e25412 100644
--- a/vpnor/test/create_read_window_remap.cpp
+++ b/vpnor/test/create_read_window_remap.cpp
@@ -16,7 +16,7 @@
 #include <fstream>
 #include <vector>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 static const auto BLOCK_SIZE = 4096;
 static const auto ERASE_SIZE = BLOCK_SIZE;
diff --git a/vpnor/test/create_read_window_size.cpp b/vpnor/test/create_read_window_size.cpp
index 4e8cb5d..17240c9 100644
--- a/vpnor/test/create_read_window_size.cpp
+++ b/vpnor/test/create_read_window_size.cpp
@@ -13,7 +13,7 @@
 #include <cassert>
 #include <experimental/filesystem>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 static const auto BLOCK_SIZE = 4096;
 static const auto ERASE_SIZE = BLOCK_SIZE;
diff --git a/vpnor/test/create_read_window_straddle_partitions.cpp b/vpnor/test/create_read_window_straddle_partitions.cpp
index bdc3fa5..7b09ff6 100644
--- a/vpnor/test/create_read_window_straddle_partitions.cpp
+++ b/vpnor/test/create_read_window_straddle_partitions.cpp
@@ -13,7 +13,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const std::string toc[] = {
     "partition01=ONE,00001000,00002000,80,ECC,READONLY",
diff --git a/vpnor/test/create_write_window_ro_partition.cpp b/vpnor/test/create_write_window_ro_partition.cpp
index 59d4a0d..d6e07e5 100644
--- a/vpnor/test/create_write_window_ro_partition.cpp
+++ b/vpnor/test/create_write_window_ro_partition.cpp
@@ -12,7 +12,7 @@
 
 #include <cassert>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READONLY",
diff --git a/vpnor/test/create_write_window_rw_partition.cpp b/vpnor/test/create_write_window_rw_partition.cpp
index ed6f3dd..1e5b46c 100644
--- a/vpnor/test/create_write_window_rw_partition.cpp
+++ b/vpnor/test/create_write_window_rw_partition.cpp
@@ -12,7 +12,7 @@
 
 #include <cassert>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READWRITE",
diff --git a/vpnor/test/create_write_window_unmapped.cpp b/vpnor/test/create_write_window_unmapped.cpp
index d7f76fd..ecf5280 100644
--- a/vpnor/test/create_write_window_unmapped.cpp
+++ b/vpnor/test/create_write_window_unmapped.cpp
@@ -12,7 +12,7 @@
 
 #include <cassert>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto ERASE_SIZE = BLOCK_SIZE;
diff --git a/vpnor/test/dump_flash.cpp b/vpnor/test/dump_flash.cpp
index f285a61..2d5dc5d 100644
--- a/vpnor/test/dump_flash.cpp
+++ b/vpnor/test/dump_flash.cpp
@@ -14,7 +14,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 struct test_context
 {
diff --git a/vpnor/test/read_patch.cpp b/vpnor/test/read_patch.cpp
index 4d541f6..0d3b267 100644
--- a/vpnor/test/read_patch.cpp
+++ b/vpnor/test/read_patch.cpp
@@ -13,7 +13,7 @@
 
 #include <cassert>
 
-#include "vpnor/mboxd_pnor_partition_table.h"
+#include "vpnor/backend.h"
 
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto ERASE_SIZE = BLOCK_SIZE;