diff --git a/chip_data/odyssey/node_dlx_fir.json b/chip_data/odyssey/node_dlx_fir.json
index eaa5cbc..539db3b 100644
--- a/chip_data/odyssey/node_dlx_fir.json
+++ b/chip_data/odyssey/node_dlx_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08012402"
             }
         },
-        "DLX_FIR_CFG_XSTOP": {
+        "DLX_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08012404"
             }
         },
-        "DLX_FIR_CFG_RECOV": {
+        "DLX_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08012405"
             }
         },
-        "DLX_FIR_CFG_ATTN": {
+        "DLX_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08012406"
             }
         },
-        "DLX_FIR_CFG_LXSTOP": {
+        "DLX_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08012407"
             }
@@ -146,7 +146,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_XSTOP"
+                                "reg_name": "DLX_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -170,7 +170,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_RECOV"
+                                "reg_name": "DLX_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -194,7 +194,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_ATTN"
+                                "reg_name": "DLX_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -218,7 +218,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_LXSTOP"
+                                "reg_name": "DLX_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_mcbist_fir.json b/chip_data/odyssey/node_mcbist_fir.json
index 0b50099..bc658f7 100644
--- a/chip_data/odyssey/node_mcbist_fir.json
+++ b/chip_data/odyssey/node_mcbist_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08011402"
             }
         },
-        "MCBIST_FIR_CFG_XSTOP": {
+        "MCBIST_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08011404"
             }
         },
-        "MCBIST_FIR_CFG_RECOV": {
+        "MCBIST_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08011405"
             }
         },
-        "MCBIST_FIR_CFG_ATTN": {
+        "MCBIST_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08011406"
             }
         },
-        "MCBIST_FIR_CFG_LXSTOP": {
+        "MCBIST_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08011407"
             }
@@ -196,7 +196,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_XSTOP"
+                                "reg_name": "MCBIST_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -220,7 +220,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_RECOV"
+                                "reg_name": "MCBIST_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -244,7 +244,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_ATTN"
+                                "reg_name": "MCBIST_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -268,7 +268,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_LXSTOP"
+                                "reg_name": "MCBIST_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_mem_local_fir.json b/chip_data/odyssey/node_mem_local_fir.json
index 78fba62..26bb13c 100644
--- a/chip_data/odyssey/node_mem_local_fir.json
+++ b/chip_data/odyssey/node_mem_local_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08040102"
             }
         },
-        "MEM_LOCAL_FIR_CFG_XSTOP": {
+        "MEM_LOCAL_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08040104"
             }
         },
-        "MEM_LOCAL_FIR_CFG_RECOV": {
+        "MEM_LOCAL_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08040105"
             }
         },
-        "MEM_LOCAL_FIR_CFG_ATTN": {
+        "MEM_LOCAL_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08040106"
             }
         },
-        "MEM_LOCAL_FIR_CFG_LXSTOP": {
+        "MEM_LOCAL_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08040107"
             }
@@ -61,7 +61,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_XSTOP"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -85,7 +85,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_RECOV"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -109,7 +109,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_ATTN"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_LXSTOP"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_mmio_fir.json b/chip_data/odyssey/node_mmio_fir.json
index 138e08c..99e8e49 100644
--- a/chip_data/odyssey/node_mmio_fir.json
+++ b/chip_data/odyssey/node_mmio_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08010872"
             }
         },
-        "MMIO_FIR_CFG_XSTOP": {
+        "MMIO_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08010874"
             }
         },
-        "MMIO_FIR_CFG_RECOV": {
+        "MMIO_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08010875"
             }
         },
-        "MMIO_FIR_CFG_ATTN": {
+        "MMIO_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08010876"
             }
         },
-        "MMIO_FIR_CFG_LXSTOP": {
+        "MMIO_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08010877"
             }
@@ -71,7 +71,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_XSTOP"
+                                "reg_name": "MMIO_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -95,7 +95,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_RECOV"
+                                "reg_name": "MMIO_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -119,7 +119,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_ATTN"
+                                "reg_name": "MMIO_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -143,7 +143,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_LXSTOP"
+                                "reg_name": "MMIO_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_ocmb_phy_fir.json b/chip_data/odyssey/node_ocmb_phy_fir.json
index baa4df3..6ba1560 100644
--- a/chip_data/odyssey/node_ocmb_phy_fir.json
+++ b/chip_data/odyssey/node_ocmb_phy_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08010C02"
             }
         },
-        "OCMB_PHY_FIR_CFG_XSTOP": {
+        "OCMB_PHY_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08010C04"
             }
         },
-        "OCMB_PHY_FIR_CFG_RECOV": {
+        "OCMB_PHY_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08010C05"
             }
         },
-        "OCMB_PHY_FIR_CFG_ATTN": {
+        "OCMB_PHY_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08010C06"
             }
         },
-        "OCMB_PHY_FIR_CFG_LXSTOP": {
+        "OCMB_PHY_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08010C07"
             }
@@ -61,7 +61,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_XSTOP"
+                                "reg_name": "OCMB_PHY_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -85,7 +85,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_RECOV"
+                                "reg_name": "OCMB_PHY_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -109,7 +109,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_ATTN"
+                                "reg_name": "OCMB_PHY_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_LXSTOP"
+                                "reg_name": "OCMB_PHY_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_odp_fir.json b/chip_data/odyssey/node_odp_fir.json
index 3ad5b8d..5fba497 100644
--- a/chip_data/odyssey/node_odp_fir.json
+++ b/chip_data/odyssey/node_odp_fir.json
@@ -14,25 +14,25 @@
                 "1": "0x08013402"
             }
         },
-        "ODP_FIR_CFG_XSTOP": {
+        "ODP_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08013004",
                 "1": "0x08013404"
             }
         },
-        "ODP_FIR_CFG_RECOV": {
+        "ODP_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08013005",
                 "1": "0x08013405"
             }
         },
-        "ODP_FIR_CFG_ATTN": {
+        "ODP_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08013006",
                 "1": "0x08013406"
             }
         },
-        "ODP_FIR_CFG_LXSTOP": {
+        "ODP_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08013007",
                 "1": "0x08013407"
@@ -68,7 +68,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_XSTOP"
+                                "reg_name": "ODP_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -92,7 +92,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_RECOV"
+                                "reg_name": "ODP_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -116,7 +116,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_ATTN"
+                                "reg_name": "ODP_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -140,7 +140,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_LXSTOP"
+                                "reg_name": "ODP_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_rdf_fir.json b/chip_data/odyssey/node_rdf_fir.json
index cd418aa..f326b41 100644
--- a/chip_data/odyssey/node_rdf_fir.json
+++ b/chip_data/odyssey/node_rdf_fir.json
@@ -14,25 +14,25 @@
                 "1": "0x08012802"
             }
         },
-        "RDF_FIR_CFG_XSTOP": {
+        "RDF_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08011804",
                 "1": "0x08012804"
             }
         },
-        "RDF_FIR_CFG_RECOV": {
+        "RDF_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08011805",
                 "1": "0x08012805"
             }
         },
-        "RDF_FIR_CFG_ATTN": {
+        "RDF_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08011806",
                 "1": "0x08012806"
             }
         },
-        "RDF_FIR_CFG_LXSTOP": {
+        "RDF_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08011807",
                 "1": "0x08012807"
@@ -182,7 +182,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_XSTOP"
+                                "reg_name": "RDF_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -206,7 +206,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_RECOV"
+                                "reg_name": "RDF_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -230,7 +230,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_ATTN"
+                                "reg_name": "RDF_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -254,7 +254,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_LXSTOP"
+                                "reg_name": "RDF_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_srq_fir.json b/chip_data/odyssey/node_srq_fir.json
index 5be8898..e579719 100644
--- a/chip_data/odyssey/node_srq_fir.json
+++ b/chip_data/odyssey/node_srq_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08011002"
             }
         },
-        "SRQ_FIR_CFG_XSTOP": {
+        "SRQ_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08011004"
             }
         },
-        "SRQ_FIR_CFG_RECOV": {
+        "SRQ_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08011005"
             }
         },
-        "SRQ_FIR_CFG_ATTN": {
+        "SRQ_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08011006"
             }
         },
-        "SRQ_FIR_CFG_LXSTOP": {
+        "SRQ_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08011007"
             }
@@ -96,7 +96,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_XSTOP"
+                                "reg_name": "SRQ_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -120,7 +120,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_RECOV"
+                                "reg_name": "SRQ_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -144,7 +144,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_ATTN"
+                                "reg_name": "SRQ_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -168,7 +168,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_LXSTOP"
+                                "reg_name": "SRQ_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_tlx_fir.json b/chip_data/odyssey/node_tlx_fir.json
index 67ccaad..3a73707 100644
--- a/chip_data/odyssey/node_tlx_fir.json
+++ b/chip_data/odyssey/node_tlx_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x08012002"
             }
         },
-        "TLX_FIR_CFG_XSTOP": {
+        "TLX_FIR_CFG_CS": {
             "instances": {
                 "0": "0x08012004"
             }
         },
-        "TLX_FIR_CFG_RECOV": {
+        "TLX_FIR_CFG_RE": {
             "instances": {
                 "0": "0x08012005"
             }
         },
-        "TLX_FIR_CFG_ATTN": {
+        "TLX_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x08012006"
             }
         },
-        "TLX_FIR_CFG_LXSTOP": {
+        "TLX_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x08012007"
             }
@@ -101,7 +101,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_XSTOP"
+                                "reg_name": "TLX_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -125,7 +125,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_RECOV"
+                                "reg_name": "TLX_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -149,7 +149,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_ATTN"
+                                "reg_name": "TLX_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -173,7 +173,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_LXSTOP"
+                                "reg_name": "TLX_FIR_CFG_UCS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_tp_local_fir.json b/chip_data/odyssey/node_tp_local_fir.json
index 55c5ea8..469fbc7 100644
--- a/chip_data/odyssey/node_tp_local_fir.json
+++ b/chip_data/odyssey/node_tp_local_fir.json
@@ -12,22 +12,22 @@
                 "0": "0x01040102"
             }
         },
-        "TP_LOCAL_FIR_CFG_XSTOP": {
+        "TP_LOCAL_FIR_CFG_CS": {
             "instances": {
                 "0": "0x01040104"
             }
         },
-        "TP_LOCAL_FIR_CFG_RECOV": {
+        "TP_LOCAL_FIR_CFG_RE": {
             "instances": {
                 "0": "0x01040105"
             }
         },
-        "TP_LOCAL_FIR_CFG_ATTN": {
+        "TP_LOCAL_FIR_CFG_SPA": {
             "instances": {
                 "0": "0x01040106"
             }
         },
-        "TP_LOCAL_FIR_CFG_LXSTOP": {
+        "TP_LOCAL_FIR_CFG_UCS": {
             "instances": {
                 "0": "0x01040107"
             }
@@ -61,7 +61,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_XSTOP"
+                                "reg_name": "TP_LOCAL_FIR_CFG_CS"
                             }
                         ]
                     }
@@ -85,7 +85,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_RECOV"
+                                "reg_name": "TP_LOCAL_FIR_CFG_RE"
                             }
                         ]
                     }
@@ -109,7 +109,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_ATTN"
+                                "reg_name": "TP_LOCAL_FIR_CFG_SPA"
                             }
                         ]
                     }
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_LXSTOP"
+                                "reg_name": "TP_LOCAL_FIR_CFG_UCS"
                             }
                         ]
                     }