diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
index ab898a9..b0834b8 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json
@@ -1,8 +1,7 @@
 [
     {
         "Name": "BTN_BMC_R2_N",
-        "ChipId": "0",
-        "GpioNum": 121,
+        "LineName": "BTN_BMC_R2_N",
         "EventMon": "RISING",
         "Targets": {
             "RISING": ["set-button-sled.service"]
@@ -11,8 +10,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT1",
-        "ChipId": "0",
-        "GpioNum": 10,
+        "LineName": "PWRGD_SLOT1_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@1.service", "rescan-fru-device@1.service", "rescan-wf-bic@1.service"],
@@ -22,8 +20,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT2",
-        "ChipId": "0",
-        "GpioNum": 11,
+        "LineName": "PWRGD_SLOT2_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@2.service", "rescan-fru-device@2.service", "rescan-wf-bic@2.service"],
@@ -33,8 +30,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT3",
-        "ChipId": "0",
-        "GpioNum": 12,
+        "LineName": "PWRGD_SLOT3_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@3.service", "rescan-fru-device@3.service", "rescan-wf-bic@3.service"],
@@ -44,8 +40,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT4",
-        "ChipId": "0",
-        "GpioNum": 13,
+        "LineName": "PWRGD_SLOT4_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@4.service", "rescan-fru-device@4.service", "rescan-wf-bic@4.service"],
@@ -55,8 +50,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT5",
-        "ChipId": "0",
-        "GpioNum": 190,
+        "LineName": "PWRGD_SLOT5_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@5.service", "rescan-fru-device@5.service", "rescan-wf-bic@5.service"],
@@ -66,8 +60,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT6",
-        "ChipId": "0",
-        "GpioNum": 191,
+        "LineName": "PWRGD_SLOT6_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@6.service", "rescan-fru-device@6.service", "rescan-wf-bic@6.service"],
@@ -77,8 +70,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT7",
-        "ChipId": "0",
-        "GpioNum": 195,
+        "LineName": "PWRGD_SLOT7_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@7.service", "rescan-fru-device@7.service", "rescan-wf-bic@7.service"],
@@ -88,8 +80,7 @@
     },
     {
         "Name": "PWROK_STBY_BMC_SLOT8",
-        "ChipId": "0",
-        "GpioNum": 202,
+        "LineName": "PWRGD_SLOT8_STBY",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["probe-slot-device@8.service", "rescan-fru-device@8.service", "rescan-wf-bic@8.service"],
@@ -99,8 +90,7 @@
     },
     {
         "Name": "PRSNT_NIC0_N",
-        "ChipId": "0",
-        "GpioNum": 165,
+        "LineName": "PRSNT_NIC0_N",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["remove-nic-endpoint-slot@0.service"],
@@ -114,8 +104,7 @@
     },
     {
         "Name": "PRSNT_NIC1_N",
-        "ChipId": "0",
-        "GpioNum": 32,
+        "LineName": "PRSNT_NIC1_N",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["remove-nic-endpoint-slot@1.service"],
@@ -130,8 +119,7 @@
     },
     {
         "Name": "PRSNT_NIC2_N",
-        "ChipId": "0",
-        "GpioNum": 33,
+        "LineName": "PRSNT_NIC2_N",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["remove-nic-endpoint-slot@2.service"],
@@ -146,8 +134,7 @@
     },
     {
         "Name": "PRSNT_NIC3_N",
-        "ChipId": "0",
-        "GpioNum": 99,
+        "LineName": "PRSNT_NIC3_N",
         "EventMon": "BOTH",
         "Targets": {
             "RISING": ["remove-nic-endpoint-slot@3.service"],
@@ -161,8 +148,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT1_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 44,
+        "LineName": "PRSNT_SB_SLOT1_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -172,8 +158,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT2_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 45,
+        "LineName": "PRSNT_SB_SLOT2_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -183,8 +168,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT3_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 46,
+        "LineName": "PRSNT_SB_SLOT3_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -194,8 +178,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT4_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 47,
+        "LineName": "PRSNT_SB_SLOT4_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -205,8 +188,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT5_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 132,
+        "LineName": "PRSNT_SB_SLOT5_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -216,8 +198,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT6_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 133,
+        "LineName": "PRSNT_SB_SLOT6_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -227,8 +208,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT7_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 134,
+        "LineName": "PRSNT_SB_SLOT7_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [
@@ -238,8 +218,7 @@
     },
     {
         "Name": "PRSNT_SB_SLOT8_BMC_N",
-        "ChipId": "0",
-        "GpioNum": 135,
+        "LineName": "PRSNT_SB_SLOT8_N",
         "EventMon": "FALLING",
         "Targets": {
             "FALLING": [