diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index 703cfa3..38fc631 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -3,7 +3,7 @@
 	%reldir%/flash.cpp \
 	%reldir%/pnor_partition.cpp \
 	%reldir%/lpc_reset.cpp \
-	%reldir%/mboxd_msg.cpp
+	%reldir%/transport_mbox.cpp
 
 mboxd_LDFLAGS += -lstdc++fs \
 	$(SDBUSPLUS_LIBS) \
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index bc78609..cc0fccf 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -13,7 +13,7 @@
 #include "xyz/openbmc_project/Common/error.hpp"
 #include <phosphor-logging/elog-errors.hpp>
 #include <experimental/filesystem>
-#include "vpnor/mboxd_msg.hpp"
+#include "vpnor/transport_mbox.hpp"
 
 int init_vpnor(struct mbox_context *context)
 {
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index f0c6b1d..91666fd 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -5,13 +5,13 @@
 
 TEST_MBOX_VPNOR_INTEG_SRCS = \
 	common.c \
-	mboxd_msg.c \
+	transport_mbox.c \
 	windows.c \
 	lpc.c \
 	vpnor/lpc_reset.cpp \
 	vpnor/mboxd_pnor_partition_table.cpp \
 	vpnor/flash.cpp \
-	vpnor/mboxd_msg.cpp \
+	vpnor/transport_mbox.cpp \
 	vpnor/pnor_partition.cpp \
 	vpnor/pnor_partition_table.cpp \
 	%reldir%/tmpd.cpp
diff --git a/vpnor/test/dump_flash.cpp b/vpnor/test/dump_flash.cpp
index e811f6f..905bebd 100644
--- a/vpnor/test/dump_flash.cpp
+++ b/vpnor/test/dump_flash.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "vpnor/mboxd_pnor_partition_table.h"
 
 extern "C" {
diff --git a/vpnor/mboxd_msg.cpp b/vpnor/transport_mbox.cpp
similarity index 95%
rename from vpnor/mboxd_msg.cpp
rename to vpnor/transport_mbox.cpp
index dd9e64a..620006e 100644
--- a/vpnor/mboxd_msg.cpp
+++ b/vpnor/transport_mbox.cpp
@@ -2,10 +2,10 @@
 
 extern "C" {
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 };
 
-#include "vpnor/mboxd_msg.hpp"
+#include "vpnor/transport_mbox.hpp"
 #include "vpnor/pnor_partition_table.hpp"
 
 // clang-format off
diff --git a/vpnor/mboxd_msg.hpp b/vpnor/transport_mbox.hpp
similarity index 100%
rename from vpnor/mboxd_msg.hpp
rename to vpnor/transport_mbox.hpp