diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2200.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2201.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2202.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/client.2203.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf
similarity index 100%
rename from meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/server.ttyS2.conf
rename to meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf
diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
index 2666140..05b4a4e 100644
--- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,20 +1,21 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 OBMC_CONSOLE_HOST_TTY = "ttyS2"
 
-SRC_URI:append:tiogapass = " file://server.ttyS2.conf"
-SRC_URI:append:yosemitev2 = " file://server.ttyS0.conf \
-                              file://server.ttyS1.conf \
-                              file://server.ttyS2.conf \
-                              file://server.ttyS3.conf \
-                              file://client.2200.conf \
-                              file://client.2201.conf \
-                              file://client.2202.conf \
-                              file://client.2203.conf"
+SRC_URI:append:fb-compute-singlehost = " file://server.ttyS2.conf"
+
+SRC_URI:append:fb-compute-multihost = " file://server.ttyS0.conf \
+                                        file://server.ttyS1.conf \
+                                        file://server.ttyS2.conf \
+                                        file://server.ttyS3.conf \
+                                        file://client.2200.conf \
+                                        file://client.2201.conf \
+                                        file://client.2202.conf \
+                                        file://client.2203.conf"
 
 SRC_URI:remove = "file://${BPN}.conf"
 
-SYSTEMD_SERVICE:${PN}:remove:yosemitev2 = "obmc-console-ssh.socket"
-EXTRA_OECONF:append:yosemitev2 = " --enable-concurrent-servers"
+SYSTEMD_SERVICE:${PN}:remove:fb-compute-multihost = "obmc-console-ssh.socket"
+EXTRA_OECONF:append:fb-compute-multihost = " --enable-concurrent-servers"
 
 do_install:append() {
         # Install the server configuration