diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index a13c632..ab41423 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -5,9 +5,7 @@
 inherit skeleton-gdbus
 inherit obmc-phosphor-dbus-service
 
-DEPENDS += "obmc-mapper systemd"
-
-DEPENDS += "obmc-mapper systemd"
+DEPENDS += "phosphor-mapper systemd"
 
 SKELETON_DIR = "op-pwrctl"
 
diff --git a/common/recipes-phosphor/dbus/obmc-mapper.bb b/common/recipes-phosphor/dbus/phosphor-mapper.bb
similarity index 100%
rename from common/recipes-phosphor/dbus/obmc-mapper.bb
rename to common/recipes-phosphor/dbus/phosphor-mapper.bb
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/mapper-wait@.service b/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
similarity index 100%
rename from common/recipes-phosphor/dbus/obmc-mapper/mapper-wait@.service
rename to common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf b/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf
similarity index 100%
rename from common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf
rename to common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service b/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service
similarity index 100%
rename from common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service
rename to common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index 13f6804..81290b6 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -11,9 +11,9 @@
 
 TARGET_CFLAGS   += "-fpic"
 
-DEPENDS += "obmc-mapper"
+DEPENDS += "phosphor-mapper"
 DEPENDS += "autoconf-archive-native"
-RDEPENDS_${PN}-dev += "obmc-mapper-dev"
+RDEPENDS_${PN}-dev += "phosphor-mapper-dev"
 RDEPENDS_${PN} += "clear-once"
 RDEPENDS_${PN} += "network"
 RDEPENDS_${PN} += "libmapper"
diff --git a/common/recipes-phosphor/interfaces/phosphor-rest.bb b/common/recipes-phosphor/interfaces/phosphor-rest.bb
index 8df4ca0..058e450 100644
--- a/common/recipes-phosphor/interfaces/phosphor-rest.bb
+++ b/common/recipes-phosphor/interfaces/phosphor-rest.bb
@@ -15,7 +15,7 @@
 RDEPENDS_${PN} += " \
         python-xml \
         python-dbus \
-        obmc-mapper \
+        phosphor-mapper \
         python-bottle \
         python-spwd \
         pyphosphor-utils \