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" {