diff --git a/Documentation/mboxd.md b/Documentation/mboxd.md
index ce82ad8..193d19d 100644
--- a/Documentation/mboxd.md
+++ b/Documentation/mboxd.md
@@ -29,7 +29,7 @@
                   read, write and erase.
 lpc.c -     Contains the functions for controlling the LPC bus mapping
                   including pointing the bus so it maps flash and memory.
-mboxd_msg.c -     Contains the handlers for the mbox commands which the daemon
+transport_mbox.c -     Contains the handlers for the mbox commands which the daemon
                   can receive.
 windows.c - Contains the functions for managing the window cache.
 ```
diff --git a/Makefile.am b/Makefile.am
index 5e12147..97be7e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 	control_legacy.c \
 	control_dbus.c \
 	lpc.c \
-	mboxd_msg.c \
+	transport_mbox.c \
 	windows.c \
 	mtd.c
 mboxd_LDFLAGS = $(LIBSYSTEMD_LIBS)
diff --git a/control.c b/control.c
index 5b20a28..c9956e9 100644
--- a/control.c
+++ b/control.c
@@ -7,7 +7,7 @@
 #include "mbox.h"
 #include "flash.h"
 #include "lpc.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "windows.h"
 
 int control_ping(struct mbox_context *context)
diff --git a/mboxd.c b/mboxd.c
index 0b1357a..5ed42d6 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -33,7 +33,7 @@
 #include "control_dbus.h"
 #include "flash.h"
 #include "lpc.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "windows.h"
 #include "vpnor/mboxd_pnor_partition_table.h"
 
diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index d85dac3..feb1c97 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -19,7 +19,7 @@
 	%reldir%/tmpf.c
 
 TEST_MBOX_SRCS = \
-	mboxd_msg.c \
+	transport_mbox.c \
 	windows.c \
 	lpc.c \
 	lpc_reset.c \
diff --git a/test/bmc_event_ack_v2.c b/test/bmc_event_ack_v2.c
index 627309c..3bf1f37 100644
--- a/test/bmc_event_ack_v2.c
+++ b/test/bmc_event_ack_v2.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/close_window_v2.c b/test/close_window_v2.c
index 0e3dd55..ae9c7f4 100644
--- a/test/close_window_v2.c
+++ b/test/close_window_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/create_oversize_window.c b/test/create_oversize_window.c
index c60b19c..fa0f99d 100644
--- a/test/create_oversize_window.c
+++ b/test/create_oversize_window.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/create_read_window_v2.c b/test/create_read_window_v2.c
index 6085f96..12f0208 100644
--- a/test/create_read_window_v2.c
+++ b/test/create_read_window_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/create_write_window_v2.c b/test/create_write_window_v2.c
index 2ec59d6..568735a 100644
--- a/test/create_write_window_v2.c
+++ b/test/create_write_window_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/create_zero_size_window.c b/test/create_zero_size_window.c
index 4f26cd7..14cff6c 100644
--- a/test/create_zero_size_window.c
+++ b/test/create_zero_size_window.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/get_flash_info_v2.c b/test/get_flash_info_v2.c
index ccb1473..7fb3703 100644
--- a/test/get_flash_info_v2.c
+++ b/test/get_flash_info_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/get_mbox_info_v2.c b/test/get_mbox_info_v2.c
index 2149737..bcfa2ef 100644
--- a/test/get_mbox_info_v2.c
+++ b/test/get_mbox_info_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/get_mbox_info_v2_timeout.c b/test/get_mbox_info_v2_timeout.c
index 8587dfe..c296f5a 100644
--- a/test/get_mbox_info_v2_timeout.c
+++ b/test/get_mbox_info_v2_timeout.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/implicit_flush.c b/test/implicit_flush.c
index a09b034..8c79cff 100644
--- a/test/implicit_flush.c
+++ b/test/implicit_flush.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/invalid_command.c b/test/invalid_command.c
index d277551..c486dc5 100644
--- a/test/invalid_command.c
+++ b/test/invalid_command.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/mark_read_dirty.c b/test/mark_read_dirty.c
index 36e14bd..ea2774a 100644
--- a/test/mark_read_dirty.c
+++ b/test/mark_read_dirty.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/mark_write_dirty_v2.c b/test/mark_write_dirty_v2.c
index 2ea12ae..365750f 100644
--- a/test/mark_write_dirty_v2.c
+++ b/test/mark_write_dirty_v2.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/mark_write_erased_v2.c b/test/mark_write_erased_v2.c
index 09efc2a..4698ed3 100644
--- a/test/mark_write_erased_v2.c
+++ b/test/mark_write_erased_v2.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/mbox.c b/test/mbox.c
index 4a213dc..dbf2526 100644
--- a/test/mbox.c
+++ b/test/mbox.c
@@ -16,7 +16,7 @@
 #include "mbox.h"
 #include "flash.h"
 #include "lpc.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "windows.h"
 
 #include "test/mbox.h"
diff --git a/test/mbox.h b/test/mbox.h
index 4344622..30d36b6 100644
--- a/test/mbox.h
+++ b/test/mbox.h
@@ -9,7 +9,7 @@
 
 #include "common.h"
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "tmpf.h"
 
diff --git a/test/read_window_cycle.c b/test/read_window_cycle.c
index c2f8920..ec2bc37 100644
--- a/test/read_window_cycle.c
+++ b/test/read_window_cycle.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/read_window_mark_write_erased.c b/test/read_window_mark_write_erased.c
index 7daf9a1..61e760d 100644
--- a/test/read_window_mark_write_erased.c
+++ b/test/read_window_mark_write_erased.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/read_window_write_flush.c b/test/read_window_write_flush.c
index 01bbba4..0131cb8 100644
--- a/test/read_window_write_flush.c
+++ b/test/read_window_write_flush.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/request_high_version.c b/test/request_high_version.c
index b85e63f..9ffbba4 100644
--- a/test/request_high_version.c
+++ b/test/request_high_version.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/request_low_version.c b/test/request_low_version.c
index 5f003f4..7b7abf7 100644
--- a/test/request_low_version.c
+++ b/test/request_low_version.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/reset_state.c b/test/reset_state.c
index b110f44..05f98d6 100644
--- a/test/reset_state.c
+++ b/test/reset_state.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/sequence_numbers.c b/test/sequence_numbers.c
index 3d7d6e9..201a5bd 100644
--- a/test/sequence_numbers.c
+++ b/test/sequence_numbers.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/write_flush_v2.c b/test/write_flush_v2.c
index c762a76..ff1be25 100644
--- a/test/write_flush_v2.c
+++ b/test/write_flush_v2.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/test/write_window_dirty_erase.c b/test/write_window_dirty_erase.c
index 03e7d38..9bc25e7 100644
--- a/test/write_window_dirty_erase.c
+++ b/test/write_window_dirty_erase.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 #include "mbox.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 
 #include "test/mbox.h"
 #include "test/system.h"
diff --git a/mboxd_msg.c b/transport_mbox.c
similarity index 99%
rename from mboxd_msg.c
rename to transport_mbox.c
index 28c3670..c14ab27 100644
--- a/mboxd_msg.c
+++ b/transport_mbox.c
@@ -26,7 +26,7 @@
 
 #include "mbox.h"
 #include "common.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "windows.h"
 #include "lpc.h"
 
diff --git a/mboxd_msg.h b/transport_mbox.h
similarity index 100%
rename from mboxd_msg.h
rename to transport_mbox.h
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
diff --git a/windows.c b/windows.c
index 1842108..26fd37b 100644
--- a/windows.c
+++ b/windows.c
@@ -27,7 +27,7 @@
 
 #include "mbox.h"
 #include "common.h"
-#include "mboxd_msg.h"
+#include "transport_mbox.h"
 #include "windows.h"
 #include "flash.h"