diff --git a/common/recipes-phosphor/dbus/phosphor-mapper.bb b/common/recipes-phosphor/dbus/phosphor-mapper.bb
index ce3b2a4..aa80be9 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper.bb
+++ b/common/recipes-phosphor/dbus/phosphor-mapper.bb
@@ -13,7 +13,7 @@
 DEPENDS += "systemd"
 DEPENDS += "autoconf-archive-native"
 
-DBUS_SERVICE_${PN} += "org.openbmc.ObjectMapper.service"
+DBUS_SERVICE_${PN} += "xyz.openbmc_project.ObjectMapper.service"
 SYSTEMD_SERVICE_${PN} = "mapper-wait@.service"
 RDEPENDS_libmapper += "libsystemd"
 RDEPENDS_${PN} += " \
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
similarity index 63%
rename from common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf
rename to common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
index 9a26ab9..3d9fcc3 100644
--- a/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf
+++ b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf
@@ -2,7 +2,7 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
   <policy user="root">
-    <allow own="org.openbmc.ObjectMapper"/>
-    <allow send_destination="org.openbmc.ObjectMapper"/>
+    <allow own="xyz.openbmc_project.ObjectMapper"/>
+    <allow send_destination="xyz.openbmc_project.ObjectMapper"/>
   </policy>
 </busconfig>
diff --git a/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service b/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service
similarity index 100%
rename from common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service
rename to common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service