diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
index 7a44591..75883d0 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf
@@ -1 +1 @@
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
index 8b3e8ca..66a0d1e 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf
@@ -1,5 +1,5 @@
 lpc-address = 0x2f8
 sirq = 3
-socket-id = hypervisor
+console-id = hypervisor
 logsize = 256k
 logfile = /var/log/obmc-console1.log
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
index 7a44591..75883d0 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf
@@ -1 +1 @@
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
index 0bc52cc..1ec7587 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
+++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf
@@ -1,3 +1,3 @@
 lpc-address = 0x2f8
 sirq = 3
-socket-id = hypervisor
+console-id = hypervisor
diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
index b318c88..dbcb6ab 100644
--- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend
@@ -6,20 +6,20 @@
 install_concurrent_console_config() {
         # Install configuration for the servers and clients. Keep commandline
         # compatibility with previous configurations by defaulting to not
-        # specifying a socket-id for VUART0/2200
+        # specifying a console-id for VUART0/2200
         install -m 0755 -d ${D}${sysconfdir}/${BPN}
 
         # Remove the default client configuration as we don't to define a
-        # socket-id for the 2200 console
+        # console-id for the 2200 console
         rm -f ${D}${sysconfdir}/${BPN}/client.2200.conf
 
         # However, now link to /dev/null as a way of not specifying a
-        # socket-id while having a configuration file present. We need to
+        # console-id while having a configuration file present. We need to
         # provide a configuration path to meet the requirements of the packaged
         # unit file.
         ln -sr ${D}/dev/null ${D}${sysconfdir}/${BPN}/client.2200.conf
 
-        # We need to populate socket-id for remaining consoles
+        # We need to populate console-id for remaining consoles
         install -m 0644 ${WORKDIR}/client.2201.conf ${D}${sysconfdir}/${BPN}/
 
         # Install configuration for remaining servers - the base recipe