diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
index 0847dab..ff3b814 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
@@ -6,7 +6,7 @@
 inherit autotools pkgconfig
 inherit obmc-phosphor-license
 
-DEPENDS += "host-ipmid"
+DEPENDS += "phosphor-ipmi-host"
 DEPENDS += "autoconf-archive-native"
 
 TARGET_CFLAGS += "-fpic"
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
index 601e5e2..438e2fd 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb
@@ -11,7 +11,7 @@
 
 PROVIDES += "virtual/obmc-host-ipmi-hw"
 RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS_${PN} += "host-ipmid"
+RRECOMMENDS_${PN} += "phosphor-ipmi-host"
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
index ae1bf18..d36a608 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb
@@ -9,7 +9,7 @@
 
 DEPENDS += " \
         systemd \
-        host-ipmid \
+        phosphor-ipmi-host \
         phosphor-mapper \
         autoconf-archive-native \
         "
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid.bb
rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/op-stop-host@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/op-stop-host@.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/op-stop-host@.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/org.openbmc.HostServices.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/ipmi/host-ipmid/org.openbmc.HostServices.service
rename to meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/org.openbmc.HostServices.service
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
index 680f738..4639a90 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb
@@ -3,7 +3,7 @@
 PR = "r1"
 
 RDEPENDS_${PN} += "python-subprocess python-dbus python-pygobject"
-RRECOMMENDS_${PN} += "host-ipmid"
+RRECOMMENDS_${PN} += "phosphor-ipmi-host"
 
 inherit skeleton-python
 
diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
index 6fa5c28..edd9a89 100644
--- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
+++ b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb
@@ -7,7 +7,7 @@
 inherit obmc-phosphor-license
 
 DEPENDS += "systemd    \
-            host-ipmid \
+            phosphor-ipmi-host \
             "
 
 RDEPENDS_${PN} += "libsystemd \