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",