diff --git a/dbus.h b/dbus.h
index 0be0240..df31ca3 100644
--- a/dbus.h
+++ b/dbus.h
@@ -4,10 +4,27 @@
 #ifndef MBOX_DBUS_H
 #define MBOX_DBUS_H
 
-#define DBUS_NAME		"org.openbmc.mboxd"
-#define DOBJ_NAME		"/org/openbmc/mboxd"
+#include <stdint.h>
+#include <stddef.h>
 
-/* Commands */
+/*
+ * "mbox" will become an inappropriate name for the protocol/daemon, so claim a
+ * different name on the public interface.
+ *
+ * "hiomapd" expands to "Host I/O Map Daemon"
+ *
+ * TODO: The Great Rename
+ */
+#define MBOX_DBUS_NAME			"xyz.openbmc_project.Hiomapd"
+#define MBOX_DBUS_OBJECT		"/xyz/openbmc_project/Hiomapd"
+#define MBOX_DBUS_CONTROL_IFACE		"xyz.openbmc_project.Hiomapd.Control"
+#define MBOX_DBUS_PROTOCOL_IFACE	"xyz.openbmc_project.Hiomapd.Protocol"
+
+/* Legacy interface */
+#define MBOX_DBUS_LEGACY_NAME		"org.openbmc.mboxd"
+#define MBOX_DBUS_LEGACY_OBJECT		"/org/openbmc/mboxd"
+
+/* Command IDs (Legacy interface) */
 #define DBUS_C_PING		0x00
 #define	DBUS_C_DAEMON_STATE	0x01
 #define DBUS_C_RESET		0x02
@@ -24,7 +41,7 @@
 #define RESUME_NOT_MODIFIED	0x00
 #define RESUME_FLASH_MODIFIED	0x01
 
-/* Return Values */
+/* Return Values (Legacy interface) */
 #define DBUS_SUCCESS		0x00 /* Command Succeded */
 #define E_DBUS_INTERNAL		0x01 /* Internal DBUS Error */
 #define E_DBUS_INVAL		0x02 /* Invalid Command */