diff --git a/chip_data/chip-data-json.md b/chip_data/chip-data-json.md
index 96a8942..38872c6 100644
--- a/chip_data/chip-data-json.md
+++ b/chip_data/chip-data-json.md
@@ -234,7 +234,7 @@
 
 ```json
 {
-  "attn_type": ["CS", "RE", "SPA"],
+  "attn_type": ["CHIP_CS", "RECOV", "SP_ATTN"],
   "node_inst": [0, 1],
   "expr": {
     "expr_type": "and",
@@ -479,13 +479,13 @@
 always, recover from a chip checkstop on a memory buffer or other peripheral
 chips.
 
-| Value | Description                                                        |
-| ----- | ------------------------------------------------------------------ |
-| `CS`  | Chip checkstop hardware attention.                                 |
-| `UCS` | Local checkstop hardware attention within a chip unit.             |
-| `RE`  | Recoverable hardware attention.                                    |
-| `SPA` | SW or HW event requiring action by the service processor firmware. |
-| `HA`  | SW or HW event requiring action by the host firmware.              |
+| Value       | Description                                            |
+| ----------- | ------------------------------------------------------ |
+| `CHIP_CS`   | Chip checkstop hardware attention.                     |
+| `UNIT_CS`   | Local checkstop hardware attention within a chip unit. |
+| `RECOV`     | Recoverable hardware attention.                        |
+| `SP_ATTN`   | SW or HW event requiring action by the SP firmware.    |
+| `HOST_ATTN` | SW or HW event requiring action by the host firmware.  |
 
 ### 10.6) Supported Register Types
 
diff --git a/chip_data/explorer/chip_explorer.json b/chip_data/explorer/chip_explorer.json
index 98e3320..1d6f606 100644
--- a/chip_data/explorer/chip_explorer.json
+++ b/chip_data/explorer/chip_explorer.json
@@ -2,15 +2,15 @@
     "version": 1,
     "model_ec": ["EXPLORER_11", "EXPLORER_20"],
     "root_nodes": {
-        "CS": {
+        "CHIP_CS": {
             "name": "CHIPLET_OCMB_FIR",
             "inst": 0
         },
-        "RE": {
+        "RECOV": {
             "name": "CHIPLET_OCMB_FIR",
             "inst": 0
         },
-        "SPA": {
+        "SP_ATTN": {
             "name": "CHIPLET_OCMB_SPA_FIR",
             "inst": 0
         }
diff --git a/chip_data/explorer/node_chiplet_ocmb_fir.json b/chip_data/explorer/node_chiplet_ocmb_fir.json
index 1bd1910..9217105 100644
--- a/chip_data/explorer/node_chiplet_ocmb_fir.json
+++ b/chip_data/explorer/node_chiplet_ocmb_fir.json
@@ -23,7 +23,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -47,7 +47,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_chiplet_ocmb_spa_fir.json b/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
index 0865a6e..4465e69 100644
--- a/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
+++ b/chip_data/explorer/node_chiplet_ocmb_spa_fir.json
@@ -18,7 +18,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_mcbistfir.json b/chip_data/explorer/node_mcbistfir.json
index 80dde58..666e57c 100644
--- a/chip_data/explorer/node_mcbistfir.json
+++ b/chip_data/explorer/node_mcbistfir.json
@@ -43,7 +43,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -77,7 +77,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -108,7 +108,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_mmiofir.json b/chip_data/explorer/node_mmiofir.json
index 300d1e2..d0a0824 100644
--- a/chip_data/explorer/node_mmiofir.json
+++ b/chip_data/explorer/node_mmiofir.json
@@ -43,7 +43,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -77,7 +77,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -108,7 +108,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_ocmb_lfir.json b/chip_data/explorer/node_ocmb_lfir.json
index fa784af..4786883 100644
--- a/chip_data/explorer/node_ocmb_lfir.json
+++ b/chip_data/explorer/node_ocmb_lfir.json
@@ -52,7 +52,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -86,7 +86,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_omi_dl_err_rpt.json b/chip_data/explorer/node_omi_dl_err_rpt.json
index c2e38bf..b3f28e6 100644
--- a/chip_data/explorer/node_omi_dl_err_rpt.json
+++ b/chip_data/explorer/node_omi_dl_err_rpt.json
@@ -6,7 +6,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -40,7 +40,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_omi_dl_fir.json b/chip_data/explorer/node_omi_dl_fir.json
index 989a636..3b86cbb 100644
--- a/chip_data/explorer/node_omi_dl_fir.json
+++ b/chip_data/explorer/node_omi_dl_fir.json
@@ -108,7 +108,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -142,7 +142,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_rdffir.json b/chip_data/explorer/node_rdffir.json
index a597425..eafc663 100644
--- a/chip_data/explorer/node_rdffir.json
+++ b/chip_data/explorer/node_rdffir.json
@@ -180,7 +180,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -214,7 +214,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -245,7 +245,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_srqfir.json b/chip_data/explorer/node_srqfir.json
index c3a3cc6..c8aa095 100644
--- a/chip_data/explorer/node_srqfir.json
+++ b/chip_data/explorer/node_srqfir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -72,7 +72,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_tlx_err_rpt_1.json b/chip_data/explorer/node_tlx_err_rpt_1.json
index 423071e..90c99bb 100644
--- a/chip_data/explorer/node_tlx_err_rpt_1.json
+++ b/chip_data/explorer/node_tlx_err_rpt_1.json
@@ -6,7 +6,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -30,7 +30,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -54,7 +54,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/explorer/node_tlxfir.json b/chip_data/explorer/node_tlxfir.json
index 56fb114..a159694 100644
--- a/chip_data/explorer/node_tlxfir.json
+++ b/chip_data/explorer/node_tlxfir.json
@@ -63,7 +63,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -128,7 +128,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/odyssey/chip_odyssey.json b/chip_data/odyssey/chip_odyssey.json
index 4e8f3c0..7cbd04a 100644
--- a/chip_data/odyssey/chip_odyssey.json
+++ b/chip_data/odyssey/chip_odyssey.json
@@ -2,19 +2,19 @@
     "version": 1,
     "model_ec": ["ODYSSEY_10"],
     "root_nodes": {
-        "CS": {
+        "CHIP_CS": {
             "name": "GFIR",
             "inst": 0
         },
-        "RE": {
+        "RECOV": {
             "name": "GFIR",
             "inst": 0
         },
-        "SPA": {
+        "SP_ATTN": {
             "name": "GFIR",
             "inst": 0
         },
-        "UCS": {
+        "UNIT_CS": {
             "name": "GFIR",
             "inst": 0
         }
diff --git a/chip_data/odyssey/node_cfir_mem.json b/chip_data/odyssey/node_cfir_mem.json
index d8c38ca..d87e6b7 100644
--- a/chip_data/odyssey/node_cfir_mem.json
+++ b/chip_data/odyssey/node_cfir_mem.json
@@ -2,42 +2,42 @@
     "version": 1,
     "model_ec": ["ODYSSEY_10"],
     "registers": {
-        "CFIR_MEM_CS": {
+        "CFIR_MEM_CHIP_CS": {
             "instances": {
                 "0": "0x08040000"
             }
         },
-        "CFIR_MEM_RE": {
+        "CFIR_MEM_RECOV": {
             "instances": {
                 "0": "0x08040001"
             }
         },
-        "CFIR_MEM_SPA": {
+        "CFIR_MEM_SP_ATTN": {
             "instances": {
                 "0": "0x08040002"
             }
         },
-        "CFIR_MEM_UCS": {
+        "CFIR_MEM_UNIT_CS": {
             "instances": {
                 "0": "0x08040003"
             }
         },
-        "CFIR_MEM_CS_MASK": {
+        "CFIR_MEM_CHIP_CS_MASK": {
             "instances": {
                 "0": "0x08040040"
             }
         },
-        "CFIR_MEM_RE_MASK": {
+        "CFIR_MEM_RECOV_MASK": {
             "instances": {
                 "0": "0x08040041"
             }
         },
-        "CFIR_MEM_SPA_MASK": {
+        "CFIR_MEM_SP_ATTN_MASK": {
             "instances": {
                 "0": "0x08040042"
             }
         },
-        "CFIR_MEM_UCS_MASK": {
+        "CFIR_MEM_UNIT_CS_MASK": {
             "instances": {
                 "0": "0x08040043"
             }
@@ -48,20 +48,20 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_MEM_CS"
+                                "reg_name": "CFIR_MEM_CHIP_CS"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_MEM_CS_MASK"
+                                    "reg_name": "CFIR_MEM_CHIP_CS_MASK"
                                 }
                             },
                             {
@@ -72,20 +72,20 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_MEM_RE"
+                                "reg_name": "CFIR_MEM_RECOV"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_MEM_RE_MASK"
+                                    "reg_name": "CFIR_MEM_RECOV_MASK"
                                 }
                             },
                             {
@@ -96,20 +96,20 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_MEM_SPA"
+                                "reg_name": "CFIR_MEM_SP_ATTN"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_MEM_SPA_MASK"
+                                    "reg_name": "CFIR_MEM_SP_ATTN_MASK"
                                 }
                             },
                             {
@@ -120,20 +120,20 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_MEM_UCS"
+                                "reg_name": "CFIR_MEM_UNIT_CS"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_MEM_UCS_MASK"
+                                    "reg_name": "CFIR_MEM_UNIT_CS_MASK"
                                 }
                             },
                             {
diff --git a/chip_data/odyssey/node_cfir_tp.json b/chip_data/odyssey/node_cfir_tp.json
index eca635b..aabdb6c 100644
--- a/chip_data/odyssey/node_cfir_tp.json
+++ b/chip_data/odyssey/node_cfir_tp.json
@@ -2,42 +2,42 @@
     "version": 1,
     "model_ec": ["ODYSSEY_10"],
     "registers": {
-        "CFIR_TP_CS": {
+        "CFIR_TP_CHIP_CS": {
             "instances": {
                 "0": "0x01040000"
             }
         },
-        "CFIR_TP_RE": {
+        "CFIR_TP_RECOV": {
             "instances": {
                 "0": "0x01040001"
             }
         },
-        "CFIR_TP_SPA": {
+        "CFIR_TP_SP_ATTN": {
             "instances": {
                 "0": "0x01040002"
             }
         },
-        "CFIR_TP_UCS": {
+        "CFIR_TP_UNIT_CS": {
             "instances": {
                 "0": "0x01040003"
             }
         },
-        "CFIR_TP_CS_MASK": {
+        "CFIR_TP_CHIP_CS_MASK": {
             "instances": {
                 "0": "0x01040040"
             }
         },
-        "CFIR_TP_RE_MASK": {
+        "CFIR_TP_RECOV_MASK": {
             "instances": {
                 "0": "0x01040041"
             }
         },
-        "CFIR_TP_SPA_MASK": {
+        "CFIR_TP_SP_ATTN_MASK": {
             "instances": {
                 "0": "0x01040042"
             }
         },
-        "CFIR_TP_UCS_MASK": {
+        "CFIR_TP_UNIT_CS_MASK": {
             "instances": {
                 "0": "0x01040043"
             }
@@ -48,20 +48,20 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_TP_CS"
+                                "reg_name": "CFIR_TP_CHIP_CS"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_TP_CS_MASK"
+                                    "reg_name": "CFIR_TP_CHIP_CS_MASK"
                                 }
                             },
                             {
@@ -72,20 +72,20 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_TP_RE"
+                                "reg_name": "CFIR_TP_RECOV"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_TP_RE_MASK"
+                                    "reg_name": "CFIR_TP_RECOV_MASK"
                                 }
                             },
                             {
@@ -96,20 +96,20 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_TP_SPA"
+                                "reg_name": "CFIR_TP_SP_ATTN"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_TP_SPA_MASK"
+                                    "reg_name": "CFIR_TP_SP_ATTN_MASK"
                                 }
                             },
                             {
@@ -120,20 +120,20 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
                         "exprs": [
                             {
                                 "expr_type": "reg",
-                                "reg_name": "CFIR_TP_UCS"
+                                "reg_name": "CFIR_TP_UNIT_CS"
                             },
                             {
                                 "expr_type": "not",
                                 "expr": {
                                     "expr_type": "reg",
-                                    "reg_name": "CFIR_TP_UCS_MASK"
+                                    "reg_name": "CFIR_TP_UNIT_CS_MASK"
                                 }
                             },
                             {
diff --git a/chip_data/odyssey/node_dlx_err_rpt.json b/chip_data/odyssey/node_dlx_err_rpt.json
index 4554c54..e452de6 100644
--- a/chip_data/odyssey/node_dlx_err_rpt.json
+++ b/chip_data/odyssey/node_dlx_err_rpt.json
@@ -6,7 +6,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -23,7 +23,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -40,7 +40,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -57,7 +57,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/odyssey/node_dlx_fir.json b/chip_data/odyssey/node_dlx_fir.json
index 539db3b..4efd5c4 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_CS": {
+        "DLX_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08012404"
             }
         },
-        "DLX_FIR_CFG_RE": {
+        "DLX_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08012405"
             }
         },
-        "DLX_FIR_CFG_SPA": {
+        "DLX_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08012406"
             }
         },
-        "DLX_FIR_CFG_UCS": {
+        "DLX_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08012407"
             }
@@ -128,7 +128,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -146,13 +146,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_CS"
+                                "reg_name": "DLX_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -170,13 +170,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_RE"
+                                "reg_name": "DLX_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -194,13 +194,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_SPA"
+                                "reg_name": "DLX_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -218,7 +218,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "DLX_FIR_CFG_UCS"
+                                "reg_name": "DLX_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_gfir.json b/chip_data/odyssey/node_gfir.json
index 86e36ca..cead761 100644
--- a/chip_data/odyssey/node_gfir.json
+++ b/chip_data/odyssey/node_gfir.json
@@ -2,22 +2,22 @@
     "version": 1,
     "model_ec": ["ODYSSEY_10"],
     "registers": {
-        "GFIR_CS": {
+        "GFIR_CHIP_CS": {
             "instances": {
                 "0": "0x570F001C"
             }
         },
-        "GFIR_RE": {
+        "GFIR_RECOV": {
             "instances": {
                 "0": "0x570F001B"
             }
         },
-        "GFIR_SPA": {
+        "GFIR_SP_ATTN": {
             "instances": {
                 "0": "0x570F001A"
             }
         },
-        "GFIR_UCS": {
+        "GFIR_UNIT_CS": {
             "instances": {
                 "0": "0x570F002A"
             }
@@ -28,35 +28,35 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
-                        "reg_name": "GFIR_CS"
+                        "reg_name": "GFIR_CHIP_CS"
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
-                        "reg_name": "GFIR_RE"
+                        "reg_name": "GFIR_RECOV"
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
-                        "reg_name": "GFIR_SPA"
+                        "reg_name": "GFIR_SP_ATTN"
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
-                        "reg_name": "GFIR_UCS"
+                        "reg_name": "GFIR_UNIT_CS"
                     }
                 }
             ],
diff --git a/chip_data/odyssey/node_mcbist_fir.json b/chip_data/odyssey/node_mcbist_fir.json
index bc658f7..cc2f457 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_CS": {
+        "MCBIST_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08011404"
             }
         },
-        "MCBIST_FIR_CFG_RE": {
+        "MCBIST_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08011405"
             }
         },
-        "MCBIST_FIR_CFG_SPA": {
+        "MCBIST_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08011406"
             }
         },
-        "MCBIST_FIR_CFG_UCS": {
+        "MCBIST_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08011407"
             }
@@ -178,7 +178,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -196,13 +196,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_CS"
+                                "reg_name": "MCBIST_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -220,13 +220,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_RE"
+                                "reg_name": "MCBIST_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -244,13 +244,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_SPA"
+                                "reg_name": "MCBIST_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -268,7 +268,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MCBIST_FIR_CFG_UCS"
+                                "reg_name": "MCBIST_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_mem_local_fir.json b/chip_data/odyssey/node_mem_local_fir.json
index 26bb13c..c919250 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_CS": {
+        "MEM_LOCAL_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08040104"
             }
         },
-        "MEM_LOCAL_FIR_CFG_RE": {
+        "MEM_LOCAL_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08040105"
             }
         },
-        "MEM_LOCAL_FIR_CFG_SPA": {
+        "MEM_LOCAL_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08040106"
             }
         },
-        "MEM_LOCAL_FIR_CFG_UCS": {
+        "MEM_LOCAL_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08040107"
             }
@@ -43,7 +43,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -61,13 +61,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_CS"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -85,13 +85,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_RE"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -109,13 +109,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_SPA"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MEM_LOCAL_FIR_CFG_UCS"
+                                "reg_name": "MEM_LOCAL_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_mmio_fir.json b/chip_data/odyssey/node_mmio_fir.json
index 99e8e49..b2a2de0 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_CS": {
+        "MMIO_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08010874"
             }
         },
-        "MMIO_FIR_CFG_RE": {
+        "MMIO_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08010875"
             }
         },
-        "MMIO_FIR_CFG_SPA": {
+        "MMIO_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08010876"
             }
         },
-        "MMIO_FIR_CFG_UCS": {
+        "MMIO_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08010877"
             }
@@ -53,7 +53,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -71,13 +71,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_CS"
+                                "reg_name": "MMIO_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -95,13 +95,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_RE"
+                                "reg_name": "MMIO_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -119,13 +119,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_SPA"
+                                "reg_name": "MMIO_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -143,7 +143,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "MMIO_FIR_CFG_UCS"
+                                "reg_name": "MMIO_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_ocmb_phy_fir.json b/chip_data/odyssey/node_ocmb_phy_fir.json
index 6ba1560..7a17bdb 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_CS": {
+        "OCMB_PHY_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08010C04"
             }
         },
-        "OCMB_PHY_FIR_CFG_RE": {
+        "OCMB_PHY_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08010C05"
             }
         },
-        "OCMB_PHY_FIR_CFG_SPA": {
+        "OCMB_PHY_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08010C06"
             }
         },
-        "OCMB_PHY_FIR_CFG_UCS": {
+        "OCMB_PHY_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08010C07"
             }
@@ -43,7 +43,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -61,13 +61,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_CS"
+                                "reg_name": "OCMB_PHY_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -85,13 +85,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_RE"
+                                "reg_name": "OCMB_PHY_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -109,13 +109,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_SPA"
+                                "reg_name": "OCMB_PHY_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "OCMB_PHY_FIR_CFG_UCS"
+                                "reg_name": "OCMB_PHY_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_odp_fir.json b/chip_data/odyssey/node_odp_fir.json
index 28935be..85e4d82 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_CS": {
+        "ODP_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08013004",
                 "1": "0x08013404"
             }
         },
-        "ODP_FIR_CFG_RE": {
+        "ODP_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08013005",
                 "1": "0x08013405"
             }
         },
-        "ODP_FIR_CFG_SPA": {
+        "ODP_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08013006",
                 "1": "0x08013406"
             }
         },
-        "ODP_FIR_CFG_UCS": {
+        "ODP_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08013007",
                 "1": "0x08013407"
@@ -267,7 +267,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -285,13 +285,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_CS"
+                                "reg_name": "ODP_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -309,13 +309,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_RE"
+                                "reg_name": "ODP_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -333,13 +333,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_SPA"
+                                "reg_name": "ODP_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -357,7 +357,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "ODP_FIR_CFG_UCS"
+                                "reg_name": "ODP_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_rdf_fir.json b/chip_data/odyssey/node_rdf_fir.json
index f326b41..821335f 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_CS": {
+        "RDF_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08011804",
                 "1": "0x08012804"
             }
         },
-        "RDF_FIR_CFG_RE": {
+        "RDF_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08011805",
                 "1": "0x08012805"
             }
         },
-        "RDF_FIR_CFG_SPA": {
+        "RDF_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08011806",
                 "1": "0x08012806"
             }
         },
-        "RDF_FIR_CFG_UCS": {
+        "RDF_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08011807",
                 "1": "0x08012807"
@@ -164,7 +164,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -182,13 +182,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_CS"
+                                "reg_name": "RDF_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -206,13 +206,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_RE"
+                                "reg_name": "RDF_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -230,13 +230,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_SPA"
+                                "reg_name": "RDF_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -254,7 +254,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "RDF_FIR_CFG_UCS"
+                                "reg_name": "RDF_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_srq_fir.json b/chip_data/odyssey/node_srq_fir.json
index e579719..a6da7a1 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_CS": {
+        "SRQ_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08011004"
             }
         },
-        "SRQ_FIR_CFG_RE": {
+        "SRQ_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08011005"
             }
         },
-        "SRQ_FIR_CFG_SPA": {
+        "SRQ_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08011006"
             }
         },
-        "SRQ_FIR_CFG_UCS": {
+        "SRQ_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08011007"
             }
@@ -78,7 +78,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -96,13 +96,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_CS"
+                                "reg_name": "SRQ_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -120,13 +120,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_RE"
+                                "reg_name": "SRQ_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -144,13 +144,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_SPA"
+                                "reg_name": "SRQ_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -168,7 +168,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "SRQ_FIR_CFG_UCS"
+                                "reg_name": "SRQ_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_tlx_fir.json b/chip_data/odyssey/node_tlx_fir.json
index 3a73707..a9fde05 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_CS": {
+        "TLX_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x08012004"
             }
         },
-        "TLX_FIR_CFG_RE": {
+        "TLX_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x08012005"
             }
         },
-        "TLX_FIR_CFG_SPA": {
+        "TLX_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x08012006"
             }
         },
-        "TLX_FIR_CFG_UCS": {
+        "TLX_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x08012007"
             }
@@ -83,7 +83,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -101,13 +101,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_CS"
+                                "reg_name": "TLX_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -125,13 +125,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_RE"
+                                "reg_name": "TLX_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -149,13 +149,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_SPA"
+                                "reg_name": "TLX_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TLX_FIR_CFG_UCS"
+                                "reg_name": "TLX_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/odyssey/node_tp_local_fir.json b/chip_data/odyssey/node_tp_local_fir.json
index 469fbc7..f8e1a50 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_CS": {
+        "TP_LOCAL_FIR_CFG_CHIP_CS": {
             "instances": {
                 "0": "0x01040104"
             }
         },
-        "TP_LOCAL_FIR_CFG_RE": {
+        "TP_LOCAL_FIR_CFG_RECOV": {
             "instances": {
                 "0": "0x01040105"
             }
         },
-        "TP_LOCAL_FIR_CFG_SPA": {
+        "TP_LOCAL_FIR_CFG_SP_ATTN": {
             "instances": {
                 "0": "0x01040106"
             }
         },
-        "TP_LOCAL_FIR_CFG_UCS": {
+        "TP_LOCAL_FIR_CFG_UNIT_CS": {
             "instances": {
                 "0": "0x01040107"
             }
@@ -43,7 +43,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -61,13 +61,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_CS"
+                                "reg_name": "TP_LOCAL_FIR_CFG_CHIP_CS"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -85,13 +85,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_RE"
+                                "reg_name": "TP_LOCAL_FIR_CFG_RECOV"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -109,13 +109,13 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_SPA"
+                                "reg_name": "TP_LOCAL_FIR_CFG_SP_ATTN"
                             }
                         ]
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -133,7 +133,7 @@
                             },
                             {
                                 "expr_type": "reg",
-                                "reg_name": "TP_LOCAL_FIR_CFG_UCS"
+                                "reg_name": "TP_LOCAL_FIR_CFG_UNIT_CS"
                             }
                         ]
                     }
diff --git a/chip_data/p10_10/eq_spattn.json b/chip_data/p10_10/eq_spattn.json
index 3172d1e..1f4866e 100644
--- a/chip_data/p10_10/eq_spattn.json
+++ b/chip_data/p10_10/eq_spattn.json
@@ -119,7 +119,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -259,7 +259,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -345,7 +345,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28,
                         30
@@ -372,7 +372,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29,
                         31
diff --git a/chip_data/p10_10/iohs_dlp_phy_config.json b/chip_data/p10_10/iohs_dlp_phy_config.json
index 6a10a84..4fa4f66 100644
--- a/chip_data/p10_10/iohs_dlp_phy_config.json
+++ b/chip_data/p10_10/iohs_dlp_phy_config.json
@@ -344,7 +344,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -378,7 +378,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -434,7 +434,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -468,7 +468,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -499,7 +499,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -723,7 +723,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -757,7 +757,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -788,7 +788,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/mc_omi_dl_err_rpt.json b/chip_data/p10_10/mc_omi_dl_err_rpt.json
index 94b7b17..ae0ff46 100644
--- a/chip_data/p10_10/mc_omi_dl_err_rpt.json
+++ b/chip_data/p10_10/mc_omi_dl_err_rpt.json
@@ -6,7 +6,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
@@ -25,7 +25,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
@@ -44,7 +44,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
diff --git a/chip_data/p10_10/node_cfir_eq.json b/chip_data/p10_10/node_cfir_eq.json
index ac4ba4f..3a45bde 100644
--- a/chip_data/p10_10/node_cfir_eq.json
+++ b/chip_data/p10_10/node_cfir_eq.json
@@ -128,7 +128,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -447,7 +447,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -766,7 +766,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -1069,7 +1069,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -1180,7 +1180,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_iohs.json b/chip_data/p10_10/node_cfir_iohs.json
index 0a0d83f..4d87040 100644
--- a/chip_data/p10_10/node_cfir_iohs.json
+++ b/chip_data/p10_10/node_cfir_iohs.json
@@ -128,7 +128,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -191,7 +191,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -254,7 +254,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -317,7 +317,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -364,7 +364,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_mc.json b/chip_data/p10_10/node_cfir_mc.json
index 20f781c..acfdfd6 100644
--- a/chip_data/p10_10/node_cfir_mc.json
+++ b/chip_data/p10_10/node_cfir_mc.json
@@ -88,7 +88,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -227,7 +227,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -366,7 +366,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -505,7 +505,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -620,7 +620,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_n0.json b/chip_data/p10_10/node_cfir_n0.json
index 6ddacbd..75aeb19 100644
--- a/chip_data/p10_10/node_cfir_n0.json
+++ b/chip_data/p10_10/node_cfir_n0.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -179,7 +179,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -300,7 +300,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -349,7 +349,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -434,7 +434,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_n1.json b/chip_data/p10_10/node_cfir_n1.json
index f227b4e..ec79091 100644
--- a/chip_data/p10_10/node_cfir_n1.json
+++ b/chip_data/p10_10/node_cfir_n1.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -341,7 +341,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -615,7 +615,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -808,7 +808,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -866,7 +866,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_paue.json b/chip_data/p10_10/node_cfir_paue.json
index 95e844d..4e6d2fa 100644
--- a/chip_data/p10_10/node_cfir_paue.json
+++ b/chip_data/p10_10/node_cfir_paue.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -169,7 +169,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -270,7 +270,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -341,7 +341,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -432,7 +432,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_pauw.json b/chip_data/p10_10/node_cfir_pauw.json
index 4189839..a98e01d 100644
--- a/chip_data/p10_10/node_cfir_pauw.json
+++ b/chip_data/p10_10/node_cfir_pauw.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -199,7 +199,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -330,7 +330,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -401,7 +401,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -522,7 +522,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_pci.json b/chip_data/p10_10/node_cfir_pci.json
index a9bba86..eb315ec 100644
--- a/chip_data/p10_10/node_cfir_pci.json
+++ b/chip_data/p10_10/node_cfir_pci.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -189,7 +189,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -310,7 +310,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -351,7 +351,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -412,7 +412,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_cfir_tp.json b/chip_data/p10_10/node_cfir_tp.json
index 33f4e85..56d9aeb 100644
--- a/chip_data/p10_10/node_cfir_tp.json
+++ b/chip_data/p10_10/node_cfir_tp.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -116,7 +116,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -174,7 +174,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -214,7 +214,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -254,7 +254,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_eq_core_fir.json b/chip_data/p10_10/node_eq_core_fir.json
index d6ea36c..e3f32f9 100644
--- a/chip_data/p10_10/node_eq_core_fir.json
+++ b/chip_data/p10_10/node_eq_core_fir.json
@@ -191,7 +191,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -264,7 +264,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_10/node_eq_l2_fir.json b/chip_data/p10_10/node_eq_l2_fir.json
index e69146b..143a8ea 100644
--- a/chip_data/p10_10/node_eq_l2_fir.json
+++ b/chip_data/p10_10/node_eq_l2_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_10/node_eq_l3_fir.json b/chip_data/p10_10/node_eq_l3_fir.json
index 35ca70e..86ce075 100644
--- a/chip_data/p10_10/node_eq_l3_fir.json
+++ b/chip_data/p10_10/node_eq_l3_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_10/node_eq_local_fir.json b/chip_data/p10_10/node_eq_local_fir.json
index a94d5bf..bb50ca0 100644
--- a/chip_data/p10_10/node_eq_local_fir.json
+++ b/chip_data/p10_10/node_eq_local_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_eq_ncu_fir.json b/chip_data/p10_10/node_eq_ncu_fir.json
index 566f3fd..476d66f 100644
--- a/chip_data/p10_10/node_eq_ncu_fir.json
+++ b/chip_data/p10_10/node_eq_ncu_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_10/node_eq_qme_fir.json b/chip_data/p10_10/node_eq_qme_fir.json
index 6e59b5a..101dac1 100644
--- a/chip_data/p10_10/node_eq_qme_fir.json
+++ b/chip_data/p10_10/node_eq_qme_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -90,7 +90,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_gfir.json b/chip_data/p10_10/node_gfir.json
index ff8a469..a0e81db 100644
--- a/chip_data/p10_10/node_gfir.json
+++ b/chip_data/p10_10/node_gfir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -309,7 +309,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -585,7 +585,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -861,7 +861,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -1137,7 +1137,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -1411,23 +1411,23 @@
         }
     },
     "root_nodes": {
-        "CS": {
+        "CHIP_CS": {
             "name": "GFIR_CS",
             "inst": 0
         },
-        "RE": {
+        "RECOV": {
             "name": "GFIR_RE",
             "inst": 0
         },
-        "SPA": {
+        "SP_ATTN": {
             "name": "GFIR_SPA",
             "inst": 0
         },
-        "UCS": {
+        "UNIT_CS": {
             "name": "GFIR_UCS",
             "inst": 0
         },
-        "HA": {
+        "HOST_ATTN": {
             "name": "GFIR_HA",
             "inst": 0
         }
diff --git a/chip_data/p10_10/node_hca_fir.json b/chip_data/p10_10/node_hca_fir.json
index dcb8341..81b7d07 100644
--- a/chip_data/p10_10/node_hca_fir.json
+++ b/chip_data/p10_10/node_hca_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_int_cq_fir.json b/chip_data/p10_10/node_int_cq_fir.json
index 8b6747f..76154dd 100644
--- a/chip_data/p10_10/node_int_cq_fir.json
+++ b/chip_data/p10_10/node_int_cq_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_iohs_local_fir.json b/chip_data/p10_10/node_iohs_local_fir.json
index a303b13..be7b722 100644
--- a/chip_data/p10_10/node_iohs_local_fir.json
+++ b/chip_data/p10_10/node_iohs_local_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_lpc_fir.json b/chip_data/p10_10/node_lpc_fir.json
index 7d7131f..eaf3526 100644
--- a/chip_data/p10_10/node_lpc_fir.json
+++ b/chip_data/p10_10/node_lpc_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_dstl_fir.json b/chip_data/p10_10/node_mc_dstl_fir.json
index 2a9f6b1..ec388c9 100644
--- a/chip_data/p10_10/node_mc_dstl_fir.json
+++ b/chip_data/p10_10/node_mc_dstl_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_fir.json b/chip_data/p10_10/node_mc_fir.json
index 2e23008..3e8008e 100644
--- a/chip_data/p10_10/node_mc_fir.json
+++ b/chip_data/p10_10/node_mc_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_local_fir.json b/chip_data/p10_10/node_mc_local_fir.json
index 038c95a..0a251d1 100644
--- a/chip_data/p10_10/node_mc_local_fir.json
+++ b/chip_data/p10_10/node_mc_local_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_misc_fir.json b/chip_data/p10_10/node_mc_misc_fir.json
index ed38bf0..63e731d 100644
--- a/chip_data/p10_10/node_mc_misc_fir.json
+++ b/chip_data/p10_10/node_mc_misc_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_omi_dl_fir.json b/chip_data/p10_10/node_mc_omi_dl_fir.json
index 97adfb4..b2a5a15 100644
--- a/chip_data/p10_10/node_mc_omi_dl_fir.json
+++ b/chip_data/p10_10/node_mc_omi_dl_fir.json
@@ -68,7 +68,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -102,7 +102,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mc_ustl_fir.json b/chip_data/p10_10/node_mc_ustl_fir.json
index d138b6c..567c34f 100644
--- a/chip_data/p10_10/node_mc_ustl_fir.json
+++ b/chip_data/p10_10/node_mc_ustl_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_mcd_fir.json b/chip_data/p10_10/node_mcd_fir.json
index cedbe4d..a257c03 100644
--- a/chip_data/p10_10/node_mcd_fir.json
+++ b/chip_data/p10_10/node_mcd_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_n0_local_fir.json b/chip_data/p10_10/node_n0_local_fir.json
index 679074f..75b0d21 100644
--- a/chip_data/p10_10/node_n0_local_fir.json
+++ b/chip_data/p10_10/node_n0_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_n1_local_fir.json b/chip_data/p10_10/node_n1_local_fir.json
index f9d5310..d085cff 100644
--- a/chip_data/p10_10/node_n1_local_fir.json
+++ b/chip_data/p10_10/node_n1_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_nmmu_cq_fir.json b/chip_data/p10_10/node_nmmu_cq_fir.json
index 1672947..5748857 100644
--- a/chip_data/p10_10/node_nmmu_cq_fir.json
+++ b/chip_data/p10_10/node_nmmu_cq_fir.json
@@ -38,7 +38,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -72,7 +72,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_nmmu_fir.json b/chip_data/p10_10/node_nmmu_fir.json
index 1523cd3..31520d8 100644
--- a/chip_data/p10_10/node_nmmu_fir.json
+++ b/chip_data/p10_10/node_nmmu_fir.json
@@ -38,7 +38,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -72,7 +72,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_nx_cq_fir.json b/chip_data/p10_10/node_nx_cq_fir.json
index e591590..5854393 100644
--- a/chip_data/p10_10/node_nx_cq_fir.json
+++ b/chip_data/p10_10/node_nx_cq_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_nx_dma_eng_fir.json b/chip_data/p10_10/node_nx_dma_eng_fir.json
index 80b0e35..647aee2 100644
--- a/chip_data/p10_10/node_nx_dma_eng_fir.json
+++ b/chip_data/p10_10/node_nx_dma_eng_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_occ_fir.json b/chip_data/p10_10/node_occ_fir.json
index 9d6367d..7e08fe9 100644
--- a/chip_data/p10_10/node_occ_fir.json
+++ b/chip_data/p10_10/node_occ_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_dl_fir.json b/chip_data/p10_10/node_pau_dl_fir.json
index e52e01d..d837c3c 100644
--- a/chip_data/p10_10/node_pau_dl_fir.json
+++ b/chip_data/p10_10/node_pau_dl_fir.json
@@ -48,7 +48,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -144,7 +144,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_fir_0.json b/chip_data/p10_10/node_pau_fir_0.json
index 483f561..10a01b1 100644
--- a/chip_data/p10_10/node_pau_fir_0.json
+++ b/chip_data/p10_10/node_pau_fir_0.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_fir_1.json b/chip_data/p10_10/node_pau_fir_1.json
index a2c5778..2fa2fb8 100644
--- a/chip_data/p10_10/node_pau_fir_1.json
+++ b/chip_data/p10_10/node_pau_fir_1.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_fir_2.json b/chip_data/p10_10/node_pau_fir_2.json
index 35764d6..13efb73 100644
--- a/chip_data/p10_10/node_pau_fir_2.json
+++ b/chip_data/p10_10/node_pau_fir_2.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_local_fir.json b/chip_data/p10_10/node_pau_local_fir.json
index 6c36778..25a9318 100644
--- a/chip_data/p10_10/node_pau_local_fir.json
+++ b/chip_data/p10_10/node_pau_local_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_phy_fir.json b/chip_data/p10_10/node_pau_phy_fir.json
index ae1a8fb..7983b9f 100644
--- a/chip_data/p10_10/node_pau_phy_fir.json
+++ b/chip_data/p10_10/node_pau_phy_fir.json
@@ -48,7 +48,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -144,7 +144,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pau_ptl_fir.json b/chip_data/p10_10/node_pau_ptl_fir.json
index 5ab7326..d4c95b3 100644
--- a/chip_data/p10_10/node_pau_ptl_fir.json
+++ b/chip_data/p10_10/node_pau_ptl_fir.json
@@ -48,7 +48,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_ext_fir.json b/chip_data/p10_10/node_pb_ext_fir.json
index 6a04a6e..b64cbeb 100644
--- a/chip_data/p10_10/node_pb_ext_fir.json
+++ b/chip_data/p10_10/node_pb_ext_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_en1.json b/chip_data/p10_10/node_pb_station_fir_en1.json
index f7c9376..4a27d9b 100644
--- a/chip_data/p10_10/node_pb_station_fir_en1.json
+++ b/chip_data/p10_10/node_pb_station_fir_en1.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_en2.json b/chip_data/p10_10/node_pb_station_fir_en2.json
index b1e0c02..6471217 100644
--- a/chip_data/p10_10/node_pb_station_fir_en2.json
+++ b/chip_data/p10_10/node_pb_station_fir_en2.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_en3.json b/chip_data/p10_10/node_pb_station_fir_en3.json
index 52c0d2f..ddac7f4 100644
--- a/chip_data/p10_10/node_pb_station_fir_en3.json
+++ b/chip_data/p10_10/node_pb_station_fir_en3.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_en4.json b/chip_data/p10_10/node_pb_station_fir_en4.json
index dc3f87c..45eb1ae 100644
--- a/chip_data/p10_10/node_pb_station_fir_en4.json
+++ b/chip_data/p10_10/node_pb_station_fir_en4.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_eq.json b/chip_data/p10_10/node_pb_station_fir_eq.json
index ac36d2a..a328cb4 100644
--- a/chip_data/p10_10/node_pb_station_fir_eq.json
+++ b/chip_data/p10_10/node_pb_station_fir_eq.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -90,7 +90,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_es1.json b/chip_data/p10_10/node_pb_station_fir_es1.json
index 383d716..429e489 100644
--- a/chip_data/p10_10/node_pb_station_fir_es1.json
+++ b/chip_data/p10_10/node_pb_station_fir_es1.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_es2.json b/chip_data/p10_10/node_pb_station_fir_es2.json
index 482ec18..7b51b48 100644
--- a/chip_data/p10_10/node_pb_station_fir_es2.json
+++ b/chip_data/p10_10/node_pb_station_fir_es2.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_es3.json b/chip_data/p10_10/node_pb_station_fir_es3.json
index be3e23d..5d6550b 100644
--- a/chip_data/p10_10/node_pb_station_fir_es3.json
+++ b/chip_data/p10_10/node_pb_station_fir_es3.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pb_station_fir_es4.json b/chip_data/p10_10/node_pb_station_fir_es4.json
index 852161b..bbb8402 100644
--- a/chip_data/p10_10/node_pb_station_fir_es4.json
+++ b/chip_data/p10_10/node_pb_station_fir_es4.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pbaf_fir.json b/chip_data/p10_10/node_pbaf_fir.json
index e009b2b..3a00849 100644
--- a/chip_data/p10_10/node_pbaf_fir.json
+++ b/chip_data/p10_10/node_pbaf_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pbao_fir.json b/chip_data/p10_10/node_pbao_fir.json
index 95261f5..f625b83 100644
--- a/chip_data/p10_10/node_pbao_fir.json
+++ b/chip_data/p10_10/node_pbao_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pci_etu_fir.json b/chip_data/p10_10/node_pci_etu_fir.json
index 449a9f9..6302f56 100644
--- a/chip_data/p10_10/node_pci_etu_fir.json
+++ b/chip_data/p10_10/node_pci_etu_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pci_fir.json b/chip_data/p10_10/node_pci_fir.json
index a0eb5a6..1d1d957 100644
--- a/chip_data/p10_10/node_pci_fir.json
+++ b/chip_data/p10_10/node_pci_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pci_iop_fir.json b/chip_data/p10_10/node_pci_iop_fir.json
index 3d87a9c..2f7bd32 100644
--- a/chip_data/p10_10/node_pci_iop_fir.json
+++ b/chip_data/p10_10/node_pci_iop_fir.json
@@ -40,7 +40,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -74,7 +74,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -105,7 +105,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pci_local_fir.json b/chip_data/p10_10/node_pci_local_fir.json
index b2b62db..ac17485 100644
--- a/chip_data/p10_10/node_pci_local_fir.json
+++ b/chip_data/p10_10/node_pci_local_fir.json
@@ -44,7 +44,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -161,7 +161,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -196,7 +196,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_pci_nest_fir.json b/chip_data/p10_10/node_pci_nest_fir.json
index ba733fd..7be2c5b 100644
--- a/chip_data/p10_10/node_pci_nest_fir.json
+++ b/chip_data/p10_10/node_pci_nest_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_psihb_fir.json b/chip_data/p10_10/node_psihb_fir.json
index fd88238..a280e48 100644
--- a/chip_data/p10_10/node_psihb_fir.json
+++ b/chip_data/p10_10/node_psihb_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_tp_local_fir.json b/chip_data/p10_10/node_tp_local_fir.json
index 0baa7cc..fb9ca7f 100644
--- a/chip_data/p10_10/node_tp_local_fir.json
+++ b/chip_data/p10_10/node_tp_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/node_vas_fir.json b/chip_data/p10_10/node_vas_fir.json
index f2d3234..63fa056 100644
--- a/chip_data/p10_10/node_vas_fir.json
+++ b/chip_data/p10_10/node_vas_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_10/pau_pb0123_pr_err.json b/chip_data/p10_10/pau_pb0123_pr_err.json
index b635133..ca74876 100644
--- a/chip_data/p10_10/pau_pb0123_pr_err.json
+++ b/chip_data/p10_10/pau_pb0123_pr_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_10/pau_pb_dob01_dib01_int_err.json b/chip_data/p10_10/pau_pb_dob01_dib01_int_err.json
index d031220..e20e5c1 100644
--- a/chip_data/p10_10/pau_pb_dob01_dib01_int_err.json
+++ b/chip_data/p10_10/pau_pb_dob01_dib01_int_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_10/pau_pb_dob23_dib23_int_err.json b/chip_data/p10_10/pau_pb_dob23_dib23_int_err.json
index d4eb2ff..def4358 100644
--- a/chip_data/p10_10/pau_pb_dob23_dib23_int_err.json
+++ b/chip_data/p10_10/pau_pb_dob23_dib23_int_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_10/pau_pb_fm0123_err.json b/chip_data/p10_10/pau_pb_fm0123_err.json
index 3adbe72..a640c8b 100644
--- a/chip_data/p10_10/pau_pb_fm0123_err.json
+++ b/chip_data/p10_10/pau_pb_fm0123_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_10/rcs_pll.json b/chip_data/p10_10/rcs_pll.json
index 0c22df2..f461cb4 100644
--- a/chip_data/p10_10/rcs_pll.json
+++ b/chip_data/p10_10/rcs_pll.json
@@ -114,7 +114,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -484,7 +484,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -669,7 +669,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -854,7 +854,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
diff --git a/chip_data/p10_10/tod_error.json b/chip_data/p10_10/tod_error.json
index 323ac9f..4a222db 100644
--- a/chip_data/p10_10/tod_error.json
+++ b/chip_data/p10_10/tod_error.json
@@ -123,7 +123,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -150,7 +150,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -177,7 +177,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -204,7 +204,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/eq_spattn.json b/chip_data/p10_20/eq_spattn.json
index 848cca6..cdaa594 100644
--- a/chip_data/p10_20/eq_spattn.json
+++ b/chip_data/p10_20/eq_spattn.json
@@ -119,7 +119,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -259,7 +259,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -345,7 +345,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28,
                         30
@@ -372,7 +372,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29,
                         31
diff --git a/chip_data/p10_20/iohs_dlp_phy_config.json b/chip_data/p10_20/iohs_dlp_phy_config.json
index 3081c96..5f46044 100644
--- a/chip_data/p10_20/iohs_dlp_phy_config.json
+++ b/chip_data/p10_20/iohs_dlp_phy_config.json
@@ -344,7 +344,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -361,7 +361,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -378,7 +378,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -434,7 +434,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -468,7 +468,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -499,7 +499,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -723,7 +723,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -757,7 +757,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -788,7 +788,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/mc_omi_dl_err_rpt.json b/chip_data/p10_20/mc_omi_dl_err_rpt.json
index b3129cb..6d05c4f 100644
--- a/chip_data/p10_20/mc_omi_dl_err_rpt.json
+++ b/chip_data/p10_20/mc_omi_dl_err_rpt.json
@@ -6,7 +6,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
@@ -25,7 +25,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
@@ -44,7 +44,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
                     ],
diff --git a/chip_data/p10_20/node_cfir_eq.json b/chip_data/p10_20/node_cfir_eq.json
index f3140a2..1f9cd12 100644
--- a/chip_data/p10_20/node_cfir_eq.json
+++ b/chip_data/p10_20/node_cfir_eq.json
@@ -128,7 +128,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -447,7 +447,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -766,7 +766,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -1069,7 +1069,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -1180,7 +1180,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_iohs.json b/chip_data/p10_20/node_cfir_iohs.json
index f031a4b..9090c8c 100644
--- a/chip_data/p10_20/node_cfir_iohs.json
+++ b/chip_data/p10_20/node_cfir_iohs.json
@@ -128,7 +128,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -191,7 +191,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -254,7 +254,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -317,7 +317,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -364,7 +364,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_mc.json b/chip_data/p10_20/node_cfir_mc.json
index b86cbfb..e45fdd9 100644
--- a/chip_data/p10_20/node_cfir_mc.json
+++ b/chip_data/p10_20/node_cfir_mc.json
@@ -88,7 +88,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -227,7 +227,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -366,7 +366,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -505,7 +505,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -620,7 +620,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_n0.json b/chip_data/p10_20/node_cfir_n0.json
index e729158..8d4e9e6 100644
--- a/chip_data/p10_20/node_cfir_n0.json
+++ b/chip_data/p10_20/node_cfir_n0.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -179,7 +179,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -300,7 +300,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -349,7 +349,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -434,7 +434,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_n1.json b/chip_data/p10_20/node_cfir_n1.json
index d512ec1..cbc197a 100644
--- a/chip_data/p10_20/node_cfir_n1.json
+++ b/chip_data/p10_20/node_cfir_n1.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -341,7 +341,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -615,7 +615,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -808,7 +808,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -866,7 +866,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_paue.json b/chip_data/p10_20/node_cfir_paue.json
index a8bea12..7e7cbbc 100644
--- a/chip_data/p10_20/node_cfir_paue.json
+++ b/chip_data/p10_20/node_cfir_paue.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -250,7 +250,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -311,7 +311,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -392,7 +392,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_pauw.json b/chip_data/p10_20/node_cfir_pauw.json
index dd2d1ee..5c5cac0 100644
--- a/chip_data/p10_20/node_cfir_pauw.json
+++ b/chip_data/p10_20/node_cfir_pauw.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -189,7 +189,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -310,7 +310,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -371,7 +371,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -482,7 +482,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_pci.json b/chip_data/p10_20/node_cfir_pci.json
index fd5a1df..10987e1 100644
--- a/chip_data/p10_20/node_cfir_pci.json
+++ b/chip_data/p10_20/node_cfir_pci.json
@@ -68,7 +68,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -189,7 +189,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -310,7 +310,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -351,7 +351,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -412,7 +412,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_cfir_tp.json b/chip_data/p10_20/node_cfir_tp.json
index 423fb81..79fa62e 100644
--- a/chip_data/p10_20/node_cfir_tp.json
+++ b/chip_data/p10_20/node_cfir_tp.json
@@ -58,7 +58,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -116,7 +116,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -174,7 +174,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -214,7 +214,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -254,7 +254,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_eq_core_fir.json b/chip_data/p10_20/node_eq_core_fir.json
index 3ad5b39..8cc042b 100644
--- a/chip_data/p10_20/node_eq_core_fir.json
+++ b/chip_data/p10_20/node_eq_core_fir.json
@@ -191,7 +191,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -229,7 +229,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -264,7 +264,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_20/node_eq_l2_fir.json b/chip_data/p10_20/node_eq_l2_fir.json
index 386edbf..93040e3 100644
--- a/chip_data/p10_20/node_eq_l2_fir.json
+++ b/chip_data/p10_20/node_eq_l2_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_20/node_eq_l3_fir.json b/chip_data/p10_20/node_eq_l3_fir.json
index 784111b..6de072f 100644
--- a/chip_data/p10_20/node_eq_l3_fir.json
+++ b/chip_data/p10_20/node_eq_l3_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_20/node_eq_local_fir.json b/chip_data/p10_20/node_eq_local_fir.json
index 284bf4a..47df4d3 100644
--- a/chip_data/p10_20/node_eq_local_fir.json
+++ b/chip_data/p10_20/node_eq_local_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_eq_ncu_fir.json b/chip_data/p10_20/node_eq_ncu_fir.json
index 63e9bd8..18794c9 100644
--- a/chip_data/p10_20/node_eq_ncu_fir.json
+++ b/chip_data/p10_20/node_eq_ncu_fir.json
@@ -155,7 +155,7 @@
             ],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -193,7 +193,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [
                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
                         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
diff --git a/chip_data/p10_20/node_eq_qme_fir.json b/chip_data/p10_20/node_eq_qme_fir.json
index 4621453..5229999 100644
--- a/chip_data/p10_20/node_eq_qme_fir.json
+++ b/chip_data/p10_20/node_eq_qme_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -90,7 +90,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_gfir.json b/chip_data/p10_20/node_gfir.json
index 4b8c933..69c233a 100644
--- a/chip_data/p10_20/node_gfir.json
+++ b/chip_data/p10_20/node_gfir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -309,7 +309,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -585,7 +585,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -861,7 +861,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -1137,7 +1137,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "reg",
@@ -1411,23 +1411,23 @@
         }
     },
     "root_nodes": {
-        "CS": {
+        "CHIP_CS": {
             "name": "GFIR_CS",
             "inst": 0
         },
-        "RE": {
+        "RECOV": {
             "name": "GFIR_RE",
             "inst": 0
         },
-        "SPA": {
+        "SP_ATTN": {
             "name": "GFIR_SPA",
             "inst": 0
         },
-        "UCS": {
+        "UNIT_CS": {
             "name": "GFIR_UCS",
             "inst": 0
         },
-        "HA": {
+        "HOST_ATTN": {
             "name": "GFIR_HA",
             "inst": 0
         }
diff --git a/chip_data/p10_20/node_hca_fir.json b/chip_data/p10_20/node_hca_fir.json
index 9d98d7a..2a16bcc 100644
--- a/chip_data/p10_20/node_hca_fir.json
+++ b/chip_data/p10_20/node_hca_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_int_cq_fir.json b/chip_data/p10_20/node_int_cq_fir.json
index 1bf2fd1..712a5f9 100644
--- a/chip_data/p10_20/node_int_cq_fir.json
+++ b/chip_data/p10_20/node_int_cq_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_iohs_local_fir.json b/chip_data/p10_20/node_iohs_local_fir.json
index 93c94ae..eb0befd 100644
--- a/chip_data/p10_20/node_iohs_local_fir.json
+++ b/chip_data/p10_20/node_iohs_local_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_lpc_fir.json b/chip_data/p10_20/node_lpc_fir.json
index bd234ff..38785ec 100644
--- a/chip_data/p10_20/node_lpc_fir.json
+++ b/chip_data/p10_20/node_lpc_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_dstl_fir.json b/chip_data/p10_20/node_mc_dstl_fir.json
index d9a5827..b9e21d9 100644
--- a/chip_data/p10_20/node_mc_dstl_fir.json
+++ b/chip_data/p10_20/node_mc_dstl_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_fir.json b/chip_data/p10_20/node_mc_fir.json
index 00c2de0..6352b9b 100644
--- a/chip_data/p10_20/node_mc_fir.json
+++ b/chip_data/p10_20/node_mc_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_local_fir.json b/chip_data/p10_20/node_mc_local_fir.json
index c3549d1..8057b23 100644
--- a/chip_data/p10_20/node_mc_local_fir.json
+++ b/chip_data/p10_20/node_mc_local_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_misc_fir.json b/chip_data/p10_20/node_mc_misc_fir.json
index d206e4b..e265b76 100644
--- a/chip_data/p10_20/node_mc_misc_fir.json
+++ b/chip_data/p10_20/node_mc_misc_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_omi_dl_fir.json b/chip_data/p10_20/node_mc_omi_dl_fir.json
index ce73ea6..c24d4f5 100644
--- a/chip_data/p10_20/node_mc_omi_dl_fir.json
+++ b/chip_data/p10_20/node_mc_omi_dl_fir.json
@@ -68,7 +68,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -102,7 +102,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -133,7 +133,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mc_ustl_fir.json b/chip_data/p10_20/node_mc_ustl_fir.json
index 7cc2510..1c48756 100644
--- a/chip_data/p10_20/node_mc_ustl_fir.json
+++ b/chip_data/p10_20/node_mc_ustl_fir.json
@@ -80,7 +80,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -159,7 +159,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -197,7 +197,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -232,7 +232,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_mcd_fir.json b/chip_data/p10_20/node_mcd_fir.json
index 9ac6048..6bd3572 100644
--- a/chip_data/p10_20/node_mcd_fir.json
+++ b/chip_data/p10_20/node_mcd_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_n0_local_fir.json b/chip_data/p10_20/node_n0_local_fir.json
index 5d45ada..c4ab3d3 100644
--- a/chip_data/p10_20/node_n0_local_fir.json
+++ b/chip_data/p10_20/node_n0_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_n1_local_fir.json b/chip_data/p10_20/node_n1_local_fir.json
index ce7f45a..3911df7 100644
--- a/chip_data/p10_20/node_n1_local_fir.json
+++ b/chip_data/p10_20/node_n1_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_nmmu_cq_fir.json b/chip_data/p10_20/node_nmmu_cq_fir.json
index b036004..85aba5d 100644
--- a/chip_data/p10_20/node_nmmu_cq_fir.json
+++ b/chip_data/p10_20/node_nmmu_cq_fir.json
@@ -38,7 +38,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -72,7 +72,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_nmmu_fir.json b/chip_data/p10_20/node_nmmu_fir.json
index 5e542dc..96710e1 100644
--- a/chip_data/p10_20/node_nmmu_fir.json
+++ b/chip_data/p10_20/node_nmmu_fir.json
@@ -38,7 +38,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -72,7 +72,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -103,7 +103,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_nx_cq_fir.json b/chip_data/p10_20/node_nx_cq_fir.json
index d53da37..a309254 100644
--- a/chip_data/p10_20/node_nx_cq_fir.json
+++ b/chip_data/p10_20/node_nx_cq_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_nx_dma_eng_fir.json b/chip_data/p10_20/node_nx_dma_eng_fir.json
index 01f38b2..3aae512 100644
--- a/chip_data/p10_20/node_nx_dma_eng_fir.json
+++ b/chip_data/p10_20/node_nx_dma_eng_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_occ_fir.json b/chip_data/p10_20/node_occ_fir.json
index 4f81969..70b5319 100644
--- a/chip_data/p10_20/node_occ_fir.json
+++ b/chip_data/p10_20/node_occ_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_fir_0.json b/chip_data/p10_20/node_pau_fir_0.json
index e3ca798..1898545 100644
--- a/chip_data/p10_20/node_pau_fir_0.json
+++ b/chip_data/p10_20/node_pau_fir_0.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_fir_1.json b/chip_data/p10_20/node_pau_fir_1.json
index 2f129d1..f74f3fe 100644
--- a/chip_data/p10_20/node_pau_fir_1.json
+++ b/chip_data/p10_20/node_pau_fir_1.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_fir_2.json b/chip_data/p10_20/node_pau_fir_2.json
index a7d2e00..17166c4 100644
--- a/chip_data/p10_20/node_pau_fir_2.json
+++ b/chip_data/p10_20/node_pau_fir_2.json
@@ -48,7 +48,7 @@
             "instances": [0, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_local_fir.json b/chip_data/p10_20/node_pau_local_fir.json
index 7999ea1..04136f2 100644
--- a/chip_data/p10_20/node_pau_local_fir.json
+++ b/chip_data/p10_20/node_pau_local_fir.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -97,7 +97,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -135,7 +135,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -173,7 +173,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -208,7 +208,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_phy_fir.json b/chip_data/p10_20/node_pau_phy_fir.json
index e367d6f..7eb8d26 100644
--- a/chip_data/p10_20/node_pau_phy_fir.json
+++ b/chip_data/p10_20/node_pau_phy_fir.json
@@ -48,7 +48,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -144,7 +144,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pau_ptl_fir.json b/chip_data/p10_20/node_pau_ptl_fir.json
index 6548c70..9cc20d0 100644
--- a/chip_data/p10_20/node_pau_ptl_fir.json
+++ b/chip_data/p10_20/node_pau_ptl_fir.json
@@ -48,7 +48,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -82,7 +82,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -113,7 +113,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_ext_fir.json b/chip_data/p10_20/node_pb_ext_fir.json
index 821a572..1dadd99 100644
--- a/chip_data/p10_20/node_pb_ext_fir.json
+++ b/chip_data/p10_20/node_pb_ext_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_en1.json b/chip_data/p10_20/node_pb_station_fir_en1.json
index ce80135..883fc34 100644
--- a/chip_data/p10_20/node_pb_station_fir_en1.json
+++ b/chip_data/p10_20/node_pb_station_fir_en1.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_en2.json b/chip_data/p10_20/node_pb_station_fir_en2.json
index 405ed71..5ab0335 100644
--- a/chip_data/p10_20/node_pb_station_fir_en2.json
+++ b/chip_data/p10_20/node_pb_station_fir_en2.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_en3.json b/chip_data/p10_20/node_pb_station_fir_en3.json
index 7ea9b44..3b8d999 100644
--- a/chip_data/p10_20/node_pb_station_fir_en3.json
+++ b/chip_data/p10_20/node_pb_station_fir_en3.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_en4.json b/chip_data/p10_20/node_pb_station_fir_en4.json
index 6e3996f..28c41fd 100644
--- a/chip_data/p10_20/node_pb_station_fir_en4.json
+++ b/chip_data/p10_20/node_pb_station_fir_en4.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_eq.json b/chip_data/p10_20/node_pb_station_fir_eq.json
index aa8cead..4687260 100644
--- a/chip_data/p10_20/node_pb_station_fir_eq.json
+++ b/chip_data/p10_20/node_pb_station_fir_eq.json
@@ -56,7 +56,7 @@
             "instances": [0, 1, 2, 3, 4, 5, 6, 7],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -90,7 +90,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
@@ -121,7 +121,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3, 4, 5, 6, 7],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_es1.json b/chip_data/p10_20/node_pb_station_fir_es1.json
index 7e6b6fc..269d981 100644
--- a/chip_data/p10_20/node_pb_station_fir_es1.json
+++ b/chip_data/p10_20/node_pb_station_fir_es1.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_es2.json b/chip_data/p10_20/node_pb_station_fir_es2.json
index 9c71bcb..d7c782c 100644
--- a/chip_data/p10_20/node_pb_station_fir_es2.json
+++ b/chip_data/p10_20/node_pb_station_fir_es2.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_es3.json b/chip_data/p10_20/node_pb_station_fir_es3.json
index 336622e..e185324 100644
--- a/chip_data/p10_20/node_pb_station_fir_es3.json
+++ b/chip_data/p10_20/node_pb_station_fir_es3.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pb_station_fir_es4.json b/chip_data/p10_20/node_pb_station_fir_es4.json
index e09ceaa..56c1c0c 100644
--- a/chip_data/p10_20/node_pb_station_fir_es4.json
+++ b/chip_data/p10_20/node_pb_station_fir_es4.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -93,7 +93,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pbaf_fir.json b/chip_data/p10_20/node_pbaf_fir.json
index cd9864f..f4b2aee 100644
--- a/chip_data/p10_20/node_pbaf_fir.json
+++ b/chip_data/p10_20/node_pbaf_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pbao_fir.json b/chip_data/p10_20/node_pbao_fir.json
index 2d5fc9d..f29bda5 100644
--- a/chip_data/p10_20/node_pbao_fir.json
+++ b/chip_data/p10_20/node_pbao_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pci_etu_fir.json b/chip_data/p10_20/node_pci_etu_fir.json
index 9530d14..ed0854c 100644
--- a/chip_data/p10_20/node_pci_etu_fir.json
+++ b/chip_data/p10_20/node_pci_etu_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pci_fir.json b/chip_data/p10_20/node_pci_fir.json
index 4568823..d5fa9ee 100644
--- a/chip_data/p10_20/node_pci_fir.json
+++ b/chip_data/p10_20/node_pci_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pci_iop_fir.json b/chip_data/p10_20/node_pci_iop_fir.json
index 0455296..ea2ed7d 100644
--- a/chip_data/p10_20/node_pci_iop_fir.json
+++ b/chip_data/p10_20/node_pci_iop_fir.json
@@ -40,7 +40,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -74,7 +74,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
@@ -105,7 +105,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pci_local_fir.json b/chip_data/p10_20/node_pci_local_fir.json
index 6ee9a16..750f9dc 100644
--- a/chip_data/p10_20/node_pci_local_fir.json
+++ b/chip_data/p10_20/node_pci_local_fir.json
@@ -44,7 +44,7 @@
             "instances": [0, 1],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -85,7 +85,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -123,7 +123,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -161,7 +161,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
@@ -196,7 +196,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0, 1],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_pci_nest_fir.json b/chip_data/p10_20/node_pci_nest_fir.json
index 09bb7db..d20b242 100644
--- a/chip_data/p10_20/node_pci_nest_fir.json
+++ b/chip_data/p10_20/node_pci_nest_fir.json
@@ -58,7 +58,7 @@
             "instances": [0, 1, 2, 3, 4, 5],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
@@ -92,7 +92,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3, 4, 5],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_psihb_fir.json b/chip_data/p10_20/node_psihb_fir.json
index 70f2a2e..890a772 100644
--- a/chip_data/p10_20/node_psihb_fir.json
+++ b/chip_data/p10_20/node_psihb_fir.json
@@ -28,7 +28,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -62,7 +62,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_tp_local_fir.json b/chip_data/p10_20/node_tp_local_fir.json
index 1d35875..2450ef8 100644
--- a/chip_data/p10_20/node_tp_local_fir.json
+++ b/chip_data/p10_20/node_tp_local_fir.json
@@ -38,7 +38,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -79,7 +79,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -117,7 +117,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -155,7 +155,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -190,7 +190,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/node_vas_fir.json b/chip_data/p10_20/node_vas_fir.json
index d4b03a2..fdfb485 100644
--- a/chip_data/p10_20/node_vas_fir.json
+++ b/chip_data/p10_20/node_vas_fir.json
@@ -33,7 +33,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -67,7 +67,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -98,7 +98,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/p10_20/pau_pb0123_pr_err.json b/chip_data/p10_20/pau_pb0123_pr_err.json
index e0a07ff..f789635 100644
--- a/chip_data/p10_20/pau_pb0123_pr_err.json
+++ b/chip_data/p10_20/pau_pb0123_pr_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_20/pau_pb_dob01_dib01_int_err.json b/chip_data/p10_20/pau_pb_dob01_dib01_int_err.json
index 215e451..48a0fb4 100644
--- a/chip_data/p10_20/pau_pb_dob01_dib01_int_err.json
+++ b/chip_data/p10_20/pau_pb_dob01_dib01_int_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_20/pau_pb_dob23_dib23_int_err.json b/chip_data/p10_20/pau_pb_dob23_dib23_int_err.json
index 81bf3a2..1628a93 100644
--- a/chip_data/p10_20/pau_pb_dob23_dib23_int_err.json
+++ b/chip_data/p10_20/pau_pb_dob23_dib23_int_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_20/pau_pb_fm0123_err.json b/chip_data/p10_20/pau_pb_fm0123_err.json
index 5e9cdad..82388c3 100644
--- a/chip_data/p10_20/pau_pb_fm0123_err.json
+++ b/chip_data/p10_20/pau_pb_fm0123_err.json
@@ -16,7 +16,7 @@
             "instances": [0, 1, 2, 3],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -24,7 +24,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
@@ -32,7 +32,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0, 1, 2, 3],
                     "expr": {
                         "expr_type": "reg",
diff --git a/chip_data/p10_20/rcs_pll.json b/chip_data/p10_20/rcs_pll.json
index 07b40b9..22faf18 100644
--- a/chip_data/p10_20/rcs_pll.json
+++ b/chip_data/p10_20/rcs_pll.json
@@ -114,7 +114,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -299,7 +299,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -484,7 +484,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -669,7 +669,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
@@ -854,7 +854,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "or",
diff --git a/chip_data/p10_20/tod_error.json b/chip_data/p10_20/tod_error.json
index 384899f..b9fbcd9 100644
--- a/chip_data/p10_20/tod_error.json
+++ b/chip_data/p10_20/tod_error.json
@@ -123,7 +123,7 @@
             "instances": [0],
             "rules": [
                 {
-                    "attn_type": ["CS"],
+                    "attn_type": ["CHIP_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -150,7 +150,7 @@
                     }
                 },
                 {
-                    "attn_type": ["RE"],
+                    "attn_type": ["RECOV"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -177,7 +177,7 @@
                     }
                 },
                 {
-                    "attn_type": ["UCS"],
+                    "attn_type": ["UNIT_CS"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -204,7 +204,7 @@
                     }
                 },
                 {
-                    "attn_type": ["SPA"],
+                    "attn_type": ["SP_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
@@ -231,7 +231,7 @@
                     }
                 },
                 {
-                    "attn_type": ["HA"],
+                    "attn_type": ["HOST_ATTN"],
                     "node_inst": [0],
                     "expr": {
                         "expr_type": "and",
diff --git a/chip_data/pyprd/chip_data/binary.py b/chip_data/pyprd/chip_data/binary.py
index 5041b4a..a812171 100644
--- a/chip_data/pyprd/chip_data/binary.py
+++ b/chip_data/pyprd/chip_data/binary.py
@@ -82,7 +82,7 @@
 
 
 def _attn_type(value: str) -> bytes:
-    m = {"CS": 1, "UCS": 2, "RE": 3, "SPA": 4, "HA": 5}
+    m = {"CHIP_CS": 1, "UNIT_CS": 2, "RECOV": 3, "SP_ATTN": 4, "HOST_ATTN": 5}
     return _bin(1, m[value])
 
 
diff --git a/chip_data/pyprd/chip_data/chip_data.py b/chip_data/pyprd/chip_data/chip_data.py
index efaa7cd..34663d4 100644
--- a/chip_data/pyprd/chip_data/chip_data.py
+++ b/chip_data/pyprd/chip_data/chip_data.py
@@ -33,7 +33,7 @@
 
 
 def _check_attn_type(attn_type: [str, list]) -> [str, list]:
-    supported = ["CS", "RE", "SPA", "UCS", "HA"]
+    supported = ["CHIP_CS", "UNIT_CS", "RECOV", "SP_ATTN", "HOST_ATTN"]
 
     t = type(attn_type)
 
diff --git a/chip_data/pyprd/chip_data/peltool.py b/chip_data/pyprd/chip_data/peltool.py
index 814d17c..f1939cc 100644
--- a/chip_data/pyprd/chip_data/peltool.py
+++ b/chip_data/pyprd/chip_data/peltool.py
@@ -8,11 +8,11 @@
 AttnType = namedtuple("AttnType", "id desc")
 
 _attn_types = {
-    "CS": AttnType(1, "chip checkstop"),
-    "UCS": AttnType(2, "unit checkstop"),
-    "RE": AttnType(3, "recoverable"),
-    "SPA": AttnType(4, "special attention"),
-    "HA": AttnType(5, "host attention"),
+    "CHIP_CS": AttnType(1, "chip checkstop"),
+    "UNIT_CS": AttnType(2, "unit checkstop"),
+    "RECOV": AttnType(3, "recoverable"),
+    "SP_ATTN": AttnType(4, "special attention"),
+    "HOST_ATTN": AttnType(5, "host attention"),
 }
 
 
diff --git a/chip_data/schema/chip-data-schema-v01.json b/chip_data/schema/chip-data-schema-v01.json
index 3ac0a15..d43b248 100644
--- a/chip_data/schema/chip-data-schema-v01.json
+++ b/chip_data/schema/chip-data-schema-v01.json
@@ -89,7 +89,7 @@
         },
         "attn_type": {
             "type": "string",
-            "enum": ["CS", "UCS", "RE", "SPA", "HA"]
+            "enum": ["CHIP_CS", "UNIT_CS", "RECOV", "SP_ATTN", "HOST_ATTN"]
         },
         "reg_type": {
             "type": "string",