diff --git a/classes/obmc-phosphor-chassis-mgmt.bbclass b/classes/obmc-phosphor-chassis-mgmt.bbclass
deleted file mode 100644
index edf18c0..0000000
--- a/classes/obmc-phosphor-chassis-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC chassis management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-chassis-mgmt"
-PROVIDES += "virtual/obmc-phosphor-chassis-mgmt"
diff --git a/classes/obmc-phosphor-event-mgmt.bbclass b/classes/obmc-phosphor-event-mgmt.bbclass
deleted file mode 100644
index afab38f..0000000
--- a/classes/obmc-phosphor-event-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC event management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-event-mgmt"
-PROVIDES += "virtual/obmc-phosphor-event-mgmt"
diff --git a/classes/obmc-phosphor-fan-mgmt.bbclass b/classes/obmc-phosphor-fan-mgmt.bbclass
deleted file mode 100644
index 2e64773..0000000
--- a/classes/obmc-phosphor-fan-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC fan management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-fan-mgmt"
-PROVIDES += "virtual/obmc-phosphor-fan-mgmt"
diff --git a/classes/obmc-phosphor-flash-mgmt.bbclass b/classes/obmc-phosphor-flash-mgmt.bbclass
deleted file mode 100644
index 4898c20..0000000
--- a/classes/obmc-phosphor-flash-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC flash management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-flash-mgmt"
-PROVIDES += "virtual/obmc-phosphor-flash-mgmt"
diff --git a/classes/obmc-phosphor-host-ipmi-hw.bbclass b/classes/obmc-phosphor-host-ipmi-hw.bbclass
deleted file mode 100644
index 974c010..0000000
--- a/classes/obmc-phosphor-host-ipmi-hw.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC IPMI HW to DBUS translation.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-host-ipmi-hw"
-PROVIDES += "virtual/obmc-phosphor-host-ipmi-hw"
diff --git a/classes/obmc-phosphor-sensor-mgmt.bbclass b/classes/obmc-phosphor-sensor-mgmt.bbclass
deleted file mode 100644
index 0d9982e..0000000
--- a/classes/obmc-phosphor-sensor-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC sensor management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-sensor-mgmt"
-PROVIDES += "virtual/obmc-phosphor-sensor-mgmt"
diff --git a/classes/obmc-phosphor-system-mgmt.bbclass b/classes/obmc-phosphor-system-mgmt.bbclass
deleted file mode 100644
index 07c89c4..0000000
--- a/classes/obmc-phosphor-system-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC system management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-system-mgmt"
-PROVIDES += "virtual/obmc-phosphor-system-mgmt"
diff --git a/classes/obmc-phosphor-user-mgmt.bbclass b/classes/obmc-phosphor-user-mgmt.bbclass
deleted file mode 100644
index 4b82f60..0000000
--- a/classes/obmc-phosphor-user-mgmt.bbclass
+++ /dev/null
@@ -1,4 +0,0 @@
-# Common code for recipes that implement Phosphor OpenBMC user management.
-
-RPROVIDES_${PN} += "virtual/obmc-phosphor-user-mgmt"
-PROVIDES += "virtual/obmc-phosphor-user-mgmt"
diff --git a/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
index d7a8ed9..b02787e 100644
--- a/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
+++ b/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb
@@ -2,8 +2,10 @@
 DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation."
 PR = "r1"
 
-inherit obmc-phosphor-chassis-mgmt
 inherit obmc-phosphor-pydbus-service
 
+PROVIDES += "virtual/obmc-chassis-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt"
+
 S = "${WORKDIR}"
 SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/events/obmc-phosphor-event.bb b/common/recipes-phosphor/events/obmc-phosphor-event.bb
index bd4d678..43825f4 100644
--- a/common/recipes-phosphor/events/obmc-phosphor-event.bb
+++ b/common/recipes-phosphor/events/obmc-phosphor-event.bb
@@ -5,10 +5,12 @@
 
 
 inherit obmc-phosphor-license
-inherit obmc-phosphor-event-mgmt
 inherit obmc-phosphor-dbus-service
 inherit obmc-phosphor-c-daemon
 
+PROVIDES += "virtual/obmc-event-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-event-mgmt"
+
 TARGET_CXXFLAGS += " -std=c++11 -fpic"
 TARGET_CFLAGS += " -fpic"
 
diff --git a/common/recipes-phosphor/fans/obmc-phosphor-fand.bb b/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
index 8c937c6..89ab368 100644
--- a/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
+++ b/common/recipes-phosphor/fans/obmc-phosphor-fand.bb
@@ -2,10 +2,12 @@
 DESCRIPTION = "Phosphor OpenBMC fan management reference implementation."
 PR = "r1"
 
-inherit obmc-phosphor-fan-mgmt
 inherit obmc-phosphor-sdbus-service
 inherit obmc-phosphor-c-daemon
 
+PROVIDES += "virtual/obmc-fan-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-fan-mgmt"
+
 S = "${WORKDIR}"
 SRC_URI += "file://Makefile \
            file://obmc-phosphor-fand.c \
diff --git a/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
index 6e4c04a..64a47a6 100644
--- a/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
+++ b/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb
@@ -2,8 +2,10 @@
 DESCRIPTION = "Phosphor OpenBMC flash management reference implementation."
 PR = "r1"
 
-inherit obmc-phosphor-flash-mgmt
 inherit obmc-phosphor-pydbus-service
 
+PROVIDES += "virtual/obmc-flash-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-flash-mgmt"
+
 S = "${WORKDIR}"
 SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/host-ipmid/btbridged.bb b/common/recipes-phosphor/host-ipmid/btbridged.bb
index 9ab1540..5bc8fbd 100644
--- a/common/recipes-phosphor/host-ipmid/btbridged.bb
+++ b/common/recipes-phosphor/host-ipmid/btbridged.bb
@@ -7,7 +7,8 @@
 
 DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service"
 
-inherit obmc-phosphor-host-ipmi-hw
+PROVIDES += "virtual/obmc-host-ipmi-hw"
+RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
 
 DEPENDS += "systemd"
 RDEPENDS_${PN} += "libsystemd"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb b/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
index 2b27dc1..0698372 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmi-hw-example.bb
@@ -4,7 +4,9 @@
 
 RDEPENDS_${PN} += "python-subprocess python-dbus python-pygobject"
 
-inherit obmc-phosphor-host-ipmi-hw
 inherit skeleton-python
 
+PROVIDES += "virtual/obmc-host-ipmi-hw"
+RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
+
 SKELETON_DIR = "pyipmitest"
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
index 0d69af1..533d7ed 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser"
 PR = "r1"
 
-RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw"
 
 inherit obmc-phosphor-license
 inherit obmc-phosphor-systemd
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb b/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
index 6ddd61f..e2a23c2 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid-oem.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem"
 PR = "r1"
 
-RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw"
 
 inherit obmc-phosphor-license
 
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb b/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
index 2a4d670..aec28c2 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid-tool.bb
@@ -4,7 +4,7 @@
 PR = "r1"
 
 
-RRECOMMENDS_${PN} = "virtual/obmc-phosphor-host-ipmi-hw"
+RRECOMMENDS_${PN} = "virtual-obmc-host-ipmi-hw"
 
 inherit obmc-phosphor-license
 
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index 18e9341..ff7f562 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -3,7 +3,7 @@
 HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid"
 PR = "r1"
 
-RRECOMMENDS_${PN} += "virtual/obmc-phosphor-host-ipmi-hw"
+RRECOMMENDS_${PN} += "virtual-obmc-host-ipmi-hw"
 
 RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers}"
 
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index 8cb0784..d1777e2 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -37,45 +37,45 @@
 SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-fan-mgmt = \
         "${@cf_enabled("obmc-phosphor-fan-mgmt", " \
-                virtual/obmc-phosphor-fan-mgmt \
+                virtual-obmc-fan-mgmt \
                 ${VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl} \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-chassis-mgmt = "Chassis management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-chassis-mgmt = "\
         ${@cf_enabled("obmc-phosphor-chassis-mgmt", " \
-                virtual/obmc-phosphor-chassis-mgmt \
+                virtual-obmc-chassis-mgmt \
                 ${VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl} \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-sensor-mgmt = "Sensor management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-sensor-mgmt = "\
         ${@cf_enabled("obmc-phosphor-sensor-mgmt", " \
-                virtual/obmc-phosphor-sensor-mgmt \
+                virtual-obmc-sensor-mgmt \
                 ${VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl} \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-flash-mgmt = "Flash management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-flash-mgmt = "\
         ${@cf_enabled("obmc-phosphor-flash-mgmt", " \
-                virtual/obmc-phosphor-flash-mgmt \
+                virtual-obmc-flash-mgmt \
                 ${VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl} \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-event-mgmt = "Event management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-event-mgmt = " \
         ${@df_enabled("obmc-phosphor-event-mgmt", " \
-                virtual/obmc-phosphor-event-mgmt \
+                virtual-obmc-event-mgmt \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-user-mgmt = "User management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-user-mgmt = " \
         ${@df_enabled("obmc-phosphor-user-mgmt", " \
-                virtual/obmc-phosphor-user-mgmt \
+                virtual-obmc-user-mgmt \
         ", d)}"
 
 SUMMARY_packagegroup-obmc-phosphor-apps-system-mgmt = "System management support"
 RDEPENDS_packagegroup-obmc-phosphor-apps-system-mgmt = " \
         ${@df_enabled("obmc-phosphor-system-mgmt", " \
-                virtual/obmc-phosphor-system-mgmt \
+                virtual-obmc-system-mgmt \
         ", d)}"
diff --git a/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb b/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
index 7a82fb5..513e164 100644
--- a/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
+++ b/common/recipes-phosphor/sensors/obmc-phosphor-sensord.bb
@@ -2,8 +2,10 @@
 DESCRIPTION = "Phosphor OpenBMC sensor management reference implementation."
 PR = "r1"
 
-inherit obmc-phosphor-sensor-mgmt
 inherit obmc-phosphor-pydbus-service
 
+PROVIDES += "virtual/obmc-sensor-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt"
+
 S = "${WORKDIR}"
 SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/skeleton/skeleton.bb b/common/recipes-phosphor/skeleton/skeleton.bb
index 8131417..05ac00a 100644
--- a/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/common/recipes-phosphor/skeleton/skeleton.bb
@@ -6,11 +6,16 @@
 inherit packagegroup
 inherit obmc-phosphor-license
 
-inherit obmc-phosphor-chassis-mgmt
-inherit obmc-phosphor-fan-mgmt
-inherit obmc-phosphor-flash-mgmt
-inherit obmc-phosphor-sensor-mgmt
-inherit obmc-phosphor-system-mgmt
+PROVIDES += "virtual/obmc-chassis-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt"
+PROVIDES += "virtual/obmc-fan-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-fan-mgmt"
+PROVIDES += "virtual/obmc-flash-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-flash-mgmt"
+PROVIDES += "virtual/obmc-sensor-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-sensor-mgmt"
+PROVIDES += "virtual/obmc-system-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-system-mgmt"
 
 RDEPENDS_${PN} += " \
         obmc-button-power \
diff --git a/common/recipes-phosphor/system/obmc-phosphor-sysd.bb b/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
index bcb5d32..7a21c2f 100644
--- a/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
+++ b/common/recipes-phosphor/system/obmc-phosphor-sysd.bb
@@ -2,8 +2,10 @@
 DESCRIPTION = "Phosphor OpenBMC system management reference implementation."
 PR = "r1"
 
-inherit obmc-phosphor-system-mgmt
 inherit obmc-phosphor-pydbus-service
 
+PROVIDES += "virtual/obmc-system-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-system-mgmt"
+
 S = "${WORKDIR}"
 SRC_URI += "file://${PN}.py"
diff --git a/common/recipes-phosphor/users/obmc-phosphor-user.bb b/common/recipes-phosphor/users/obmc-phosphor-user.bb
index 5f63b62..a307403 100644
--- a/common/recipes-phosphor/users/obmc-phosphor-user.bb
+++ b/common/recipes-phosphor/users/obmc-phosphor-user.bb
@@ -5,9 +5,11 @@
 
 inherit allarch
 inherit obmc-phosphor-license
-inherit obmc-phosphor-user-mgmt
 inherit obmc-phosphor-dbus-service
 
+PROVIDES += "virtual/obmc-user-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-user-mgmt"
+
 RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect"
 
 SRC_URI += "git://github.com/openbmc/phosphor-networkd"
diff --git a/conf/machine/include/sample.inc b/conf/machine/include/sample.inc
index c10e81b..272f838 100644
--- a/conf/machine/include/sample.inc
+++ b/conf/machine/include/sample.inc
@@ -22,11 +22,11 @@
         host-ipmid-fru \
         host-ipmid-tool \
        "
-PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-hw-example"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "obmc-phosphor-fand"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "obmc-phosphor-flashd"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd"
-PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "host-ipmi-hw-example"
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "obmc-phosphor-chassisd"
+PREFERRED_PROVIDER_virtual/obmc-event-mgmt = "obmc-phosphor-event"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "obmc-phosphor-fand"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "obmc-phosphor-flashd"
+PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt = "obmc-phosphor-sensord"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "obmc-phosphor-sysd"
+PREFERRED_PROVIDER_virtual/obmc-user-mgmt = "obmc-phosphor-user"