diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
index 901895b..ec15f2c 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2200.conf
@@ -1 +1 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
index f06d9fc..36969ed 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2201.conf
@@ -1 +1 @@
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
index dba9b8d..c030716 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2202.conf
@@ -1 +1 @@
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
index 0047b89..52f65ca 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2203.conf
@@ -1 +1 @@
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
index 2b99388..4753bde 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2204.conf
@@ -1 +1 @@
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
index 407f84c..295dd14 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/client.2205.conf
@@ -1 +1 @@
-socket-id = ttyS8
+console-id = ttyS8
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
index 2d80850..4cb90a7 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf
@@ -1,3 +1,3 @@
-# socket-id is default to obmc-console
+# console-id is default to obmc-console
 local-tty = ttyS0
 local-tty-baud = 115200
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
index 6421f93..4b0d093 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS1.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS1
 local-tty-baud = 115200
-socket-id = ttyS1
+console-id = ttyS1
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
index f8be872..faf3906 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS2.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS2
 local-tty-baud = 115200
-socket-id = ttyS2
+console-id = ttyS2
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
index 8f1ebba..9cda930 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS3.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS3
 local-tty-baud = 115200
-socket-id = ttyS3
+console-id = ttyS3
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
index decc72f..11595e5 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS7.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS7
 local-tty-baud = 115200
-socket-id = ttyS7
+console-id = ttyS7
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
index df56992..ec2f9f3 100644
--- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
+++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS8.conf
@@ -1,3 +1,3 @@
 local-tty = ttyS8
 local-tty-baud = 115200
-socket-id = ttyS8
+console-id = ttyS8