diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/obmc-phosphor-led/obmc-control-led%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/leds/obmc-control-led%.bbappend
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/obmc-phosphor-led/obmc-control-led%.bbappend
rename to meta-ibm/meta-palmetto/recipes-phosphor/leds/obmc-control-led%.bbappend
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%.bbappend
rename to meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board
rename to meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/io_board
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard b/meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
rename to meta-rackspace/meta-barreleye/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/fans/obmc-control-fan%.bbappend
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-fan/obmc-control-fan%.bbappend
rename to meta-rackspace/meta-barreleye/recipes-phosphor/fans/obmc-control-fan%.bbappend
diff --git a/meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-led/obmc-control-led%.bbappend b/meta-rackspace/meta-barreleye/recipes-phosphor/leds/obmc-control-led%.bbappend
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-phosphor/obmc-phosphor-led/obmc-control-led%.bbappend
rename to meta-rackspace/meta-barreleye/recipes-phosphor/leds/obmc-control-led%.bbappend