diff --git a/control/config_files/p10bmc/ibm,everest/events.json b/control/config_files/p10bmc/ibm,everest/events.json
index 97be940..8fa161f 100644
--- a/control/config_files/p10bmc/ibm,everest/events.json
+++ b/control/config_files/p10bmc/ibm,everest/events.json
@@ -103,7 +103,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        },
@@ -165,7 +165,7 @@
                  "property": { "name": "Value" }
                },
                {
-                 "name": "bear lake temps",
+                 "name": "pcie cable card temps",
                  "interface": "xyz.openbmc_project.Sensor.Value",
                  "property": { "name": "Value" }
                },
@@ -342,7 +342,7 @@
         "property": { "name": "Functional" }
       },
       {
-        "name": "bear lake temps",
+        "name": "pcie cable card temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
       },
@@ -1177,7 +1177,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        }
@@ -1483,7 +1483,7 @@
          "name": "set_net_increase_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
@@ -1783,7 +1783,7 @@
          "name": "set_net_decrease_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index 4c07cab..27200ab 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -871,7 +871,8 @@
    ]
  },
  {
-   "name": "bear lake temps",
+   // Bear Lake card
+   "name": "pcie cable card temps",
    "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
index f4f3343..24db29e 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/events.json
@@ -103,7 +103,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        },
@@ -160,7 +160,7 @@
                  "property": { "name": "Value" }
                },
                {
-                 "name": "bear lake temps",
+                 "name": "pcie cable card temps",
                  "interface": "xyz.openbmc_project.Sensor.Value",
                  "property": { "name": "Value" }
                },
@@ -281,7 +281,7 @@
         "property": { "name": "Functional" }
       },
       {
-        "name": "bear lake temps",
+        "name": "pcie cable card temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
       },
@@ -552,7 +552,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        }
@@ -726,7 +726,7 @@
          "name": "set_net_increase_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
@@ -894,7 +894,7 @@
          "name": "set_net_decrease_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index 8df2905..ffb493b 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -307,7 +307,8 @@
    ]
  },
  {
-   "name": "bear lake temps",
+   // Bear Lake card
+   "name": "pcie cable card temps",
    "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp"
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/events.json b/control/config_files/p10bmc/ibm,rainier-2u/events.json
index 7dca9e0..3b419a7 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/events.json
@@ -113,7 +113,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        },
@@ -175,7 +175,7 @@
                  "property": { "name": "Value" }
                },
                {
-                 "name": "bear lake temps",
+                 "name": "pcie cable card temps",
                  "interface": "xyz.openbmc_project.Sensor.Value",
                  "property": { "name": "Value" }
                },
@@ -317,7 +317,7 @@
         "property": { "name": "Functional" }
       },
       {
-        "name": "bear river temps",
+        "name": "pcie cable card temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
       },
@@ -781,7 +781,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear river temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        }
@@ -1003,7 +1003,7 @@
          "name": "set_net_increase_target",
          "groups": [
            {
-             "name": "bear river temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
@@ -1219,7 +1219,7 @@
          "name": "set_net_decrease_target",
          "groups": [
            {
-             "name": "bear river temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index 65cb465..4a47be6 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -505,7 +505,8 @@
    ]
  },
  {
-   "name": "bear river temps",
+   // Bear River card
+   "name": "pcie cable card temps",
    "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index 7c0b5e0..a86755f 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -113,7 +113,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        },
@@ -170,7 +170,7 @@
                  "property": { "name": "Value" }
                },
                {
-                 "name": "bear lake temps",
+                 "name": "pcie cable card temps",
                  "interface": "xyz.openbmc_project.Sensor.Value",
                  "property": { "name": "Value" }
                },
@@ -311,7 +311,7 @@
         "property": { "name": "Functional" }
       },
       {
-        "name": "bear lake temps",
+        "name": "pcie cable card temps",
         "interface": "xyz.openbmc_project.State.Decorator.OperationalStatus",
         "property": { "name": "Functional" }
       },
@@ -771,7 +771,7 @@
          "property": { "name": "Value" }
        },
        {
-         "name": "bear lake temps",
+         "name": "pcie cable card temps",
          "interface": "xyz.openbmc_project.Sensor.Value",
          "property": { "name": "Value" }
        }
@@ -993,7 +993,7 @@
          "name": "set_net_increase_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
@@ -1209,7 +1209,7 @@
          "name": "set_net_decrease_target",
          "groups": [
            {
-             "name": "bear lake temps",
+             "name": "pcie cable card temps",
              "interface": "xyz.openbmc_project.Sensor.Value",
              "property": { "name": "Value" }
            }
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index 0fdc3b5..f3abd79 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -515,7 +515,8 @@
    ]
  },
  {
-   "name": "bear lake temps",
+   // Bear Lake card
+   "name": "pcie cable card temps",
    "service": "xyz.openbmc_project.HwmonTempSensor",
    "members": [
        "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",