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