diff --git a/xml/p10/node_cfir_eq_cs.xml b/xml/p10/node_cfir_eq_cs.xml
index be57835..85a8240 100644
--- a/xml/p10/node_cfir_eq_cs.xml
+++ b/xml/p10/node_cfir_eq_cs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_CS" reg_type="SCOM">
-    <register name="CFIR_EQ_XSTOP">
+    <register name="CFIR_EQ_CS">
         <instance addr="0x20040000" reg_inst="0"/>
         <instance addr="0x21040000" reg_inst="1"/>
         <instance addr="0x22040000" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x26040000" reg_inst="6"/>
         <instance addr="0x27040000" reg_inst="7"/>
     </register>
-    <register name="CFIR_EQ_XSTOP_MASK">
+    <register name="CFIR_EQ_CS_MASK">
         <instance addr="0x20040040" reg_inst="0"/>
         <instance addr="0x21040040" reg_inst="1"/>
         <instance addr="0x22040040" reg_inst="2"/>
@@ -22,9 +22,9 @@
     </register>
     <rule attn_type="CS" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_XSTOP"/>
+            <expr type="reg" value1="CFIR_EQ_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_EQ_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_eq_ha.xml b/xml/p10/node_cfir_eq_ha.xml
index 191ef0b..f46b6f6 100644
--- a/xml/p10/node_cfir_eq_ha.xml
+++ b/xml/p10/node_cfir_eq_ha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_HA" reg_type="SCOM">
-    <register name="CFIR_EQ_HOSTATTN">
+    <register name="CFIR_EQ_HA">
         <instance addr="0x20040004" reg_inst="0"/>
         <instance addr="0x21040004" reg_inst="1"/>
         <instance addr="0x22040004" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x26040004" reg_inst="6"/>
         <instance addr="0x27040004" reg_inst="7"/>
     </register>
-    <register name="CFIR_EQ_HOSTATTN_MASK">
+    <register name="CFIR_EQ_HA_MASK">
         <instance addr="0x20040044" reg_inst="0"/>
         <instance addr="0x21040044" reg_inst="1"/>
         <instance addr="0x22040044" reg_inst="2"/>
@@ -22,9 +22,9 @@
     </register>
     <rule attn_type="HA" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_EQ_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_EQ_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_eq_re.xml b/xml/p10/node_cfir_eq_re.xml
index c74572e..9cdd8c8 100644
--- a/xml/p10/node_cfir_eq_re.xml
+++ b/xml/p10/node_cfir_eq_re.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_RE" reg_type="SCOM">
-    <register name="CFIR_EQ_RECOV">
+    <register name="CFIR_EQ_RE">
         <instance addr="0x20040001" reg_inst="0"/>
         <instance addr="0x21040001" reg_inst="1"/>
         <instance addr="0x22040001" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x26040001" reg_inst="6"/>
         <instance addr="0x27040001" reg_inst="7"/>
     </register>
-    <register name="CFIR_EQ_RECOV_MASK">
+    <register name="CFIR_EQ_RE_MASK">
         <instance addr="0x20040041" reg_inst="0"/>
         <instance addr="0x21040041" reg_inst="1"/>
         <instance addr="0x22040041" reg_inst="2"/>
@@ -22,9 +22,9 @@
     </register>
     <rule attn_type="RE" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_RECOV"/>
+            <expr type="reg" value1="CFIR_EQ_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_EQ_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x2FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_eq_spa.xml b/xml/p10/node_cfir_eq_spa.xml
index 82dd599..9026f19 100644
--- a/xml/p10/node_cfir_eq_spa.xml
+++ b/xml/p10/node_cfir_eq_spa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_SPA" reg_type="SCOM">
-    <register name="CFIR_EQ_SPATTN">
+    <register name="CFIR_EQ_SPA">
         <instance addr="0x20040002" reg_inst="0"/>
         <instance addr="0x21040002" reg_inst="1"/>
         <instance addr="0x22040002" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x26040002" reg_inst="6"/>
         <instance addr="0x27040002" reg_inst="7"/>
     </register>
-    <register name="CFIR_EQ_SPATTN_MASK">
+    <register name="CFIR_EQ_SPA_MASK">
         <instance addr="0x20040042" reg_inst="0"/>
         <instance addr="0x21040042" reg_inst="1"/>
         <instance addr="0x22040042" reg_inst="2"/>
@@ -22,9 +22,9 @@
     </register>
     <rule attn_type="SPA" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_SPATTN"/>
+            <expr type="reg" value1="CFIR_EQ_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_EQ_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_eq_ucs.xml b/xml/p10/node_cfir_eq_ucs.xml
index 4d7b433..d2ce8ab 100644
--- a/xml/p10/node_cfir_eq_ucs.xml
+++ b/xml/p10/node_cfir_eq_ucs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_EQ_UCS" reg_type="SCOM">
-    <register name="CFIR_EQ_LOCAL_XSTOP">
+    <register name="CFIR_EQ_UCS">
         <instance addr="0x20040003" reg_inst="0"/>
         <instance addr="0x21040003" reg_inst="1"/>
         <instance addr="0x22040003" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x26040003" reg_inst="6"/>
         <instance addr="0x27040003" reg_inst="7"/>
     </register>
-    <register name="CFIR_EQ_LOCAL_XSTOP_MASK">
+    <register name="CFIR_EQ_UCS_MASK">
         <instance addr="0x20040043" reg_inst="0"/>
         <instance addr="0x21040043" reg_inst="1"/>
         <instance addr="0x22040043" reg_inst="2"/>
@@ -22,9 +22,9 @@
     </register>
     <rule attn_type="UCS" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_EQ_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_EQ_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_EQ_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_EQ_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_iohs_cs_re_spa.xml b/xml/p10/node_cfir_iohs_cs_re_spa.xml
index c785f92..1e94246 100644
--- a/xml/p10/node_cfir_iohs_cs_re_spa.xml
+++ b/xml/p10/node_cfir_iohs_cs_re_spa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_CS_RE_SPA" reg_type="SCOM">
-    <register name="CFIR_IOHS_XSTOP">
+    <register name="CFIR_IOHS_CS">
         <instance addr="0x18040000" reg_inst="0"/>
         <instance addr="0x19040000" reg_inst="1"/>
         <instance addr="0x1A040000" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x1E040000" reg_inst="6"/>
         <instance addr="0x1F040000" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_XSTOP_MASK">
+    <register name="CFIR_IOHS_CS_MASK">
         <instance addr="0x18040040" reg_inst="0"/>
         <instance addr="0x19040040" reg_inst="1"/>
         <instance addr="0x1A040040" reg_inst="2"/>
@@ -20,7 +20,7 @@
         <instance addr="0x1E040040" reg_inst="6"/>
         <instance addr="0x1F040040" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_RECOV">
+    <register name="CFIR_IOHS_RE">
         <instance addr="0x18040001" reg_inst="0"/>
         <instance addr="0x19040001" reg_inst="1"/>
         <instance addr="0x1A040001" reg_inst="2"/>
@@ -30,7 +30,7 @@
         <instance addr="0x1E040001" reg_inst="6"/>
         <instance addr="0x1F040001" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_RECOV_MASK">
+    <register name="CFIR_IOHS_RE_MASK">
         <instance addr="0x18040041" reg_inst="0"/>
         <instance addr="0x19040041" reg_inst="1"/>
         <instance addr="0x1A040041" reg_inst="2"/>
@@ -40,7 +40,7 @@
         <instance addr="0x1E040041" reg_inst="6"/>
         <instance addr="0x1F040041" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_SPATTN">
+    <register name="CFIR_IOHS_SPA">
         <instance addr="0x18040002" reg_inst="0"/>
         <instance addr="0x19040002" reg_inst="1"/>
         <instance addr="0x1A040002" reg_inst="2"/>
@@ -50,7 +50,7 @@
         <instance addr="0x1E040002" reg_inst="6"/>
         <instance addr="0x1F040002" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_SPATTN_MASK">
+    <register name="CFIR_IOHS_SPA_MASK">
         <instance addr="0x18040042" reg_inst="0"/>
         <instance addr="0x19040042" reg_inst="1"/>
         <instance addr="0x1A040042" reg_inst="2"/>
@@ -62,27 +62,27 @@
     </register>
     <rule attn_type="CS" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_XSTOP"/>
+            <expr type="reg" value1="CFIR_IOHS_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_IOHS_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_RECOV"/>
+            <expr type="reg" value1="CFIR_IOHS_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_IOHS_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="SPA" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_SPATTN"/>
+            <expr type="reg" value1="CFIR_IOHS_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_IOHS_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_iohs_ucs_ha.xml b/xml/p10/node_cfir_iohs_ucs_ha.xml
index 30140bc..8f6ce62 100644
--- a/xml/p10/node_cfir_iohs_ucs_ha.xml
+++ b/xml/p10/node_cfir_iohs_ucs_ha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_UCS_HA" reg_type="SCOM">
-    <register name="CFIR_IOHS_LOCAL_XSTOP">
+    <register name="CFIR_IOHS_UCS">
         <instance addr="0x18040003" reg_inst="0"/>
         <instance addr="0x19040003" reg_inst="1"/>
         <instance addr="0x1A040003" reg_inst="2"/>
@@ -10,7 +10,7 @@
         <instance addr="0x1E040003" reg_inst="6"/>
         <instance addr="0x1F040003" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_LOCAL_XSTOP_MASK">
+    <register name="CFIR_IOHS_UCS_MASK">
         <instance addr="0x18040043" reg_inst="0"/>
         <instance addr="0x19040043" reg_inst="1"/>
         <instance addr="0x1A040043" reg_inst="2"/>
@@ -20,7 +20,7 @@
         <instance addr="0x1E040043" reg_inst="6"/>
         <instance addr="0x1F040043" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_HOSTATTN">
+    <register name="CFIR_IOHS_HA">
         <instance addr="0x18040004" reg_inst="0"/>
         <instance addr="0x19040004" reg_inst="1"/>
         <instance addr="0x1A040004" reg_inst="2"/>
@@ -30,7 +30,7 @@
         <instance addr="0x1E040004" reg_inst="6"/>
         <instance addr="0x1F040004" reg_inst="7"/>
     </register>
-    <register name="CFIR_IOHS_HOSTATTN_MASK">
+    <register name="CFIR_IOHS_HA_MASK">
         <instance addr="0x18040044" reg_inst="0"/>
         <instance addr="0x19040044" reg_inst="1"/>
         <instance addr="0x1A040044" reg_inst="2"/>
@@ -42,18 +42,18 @@
     </register>
     <rule attn_type="UCS" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_IOHS_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_IOHS_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="HA" node_inst="0:7">
         <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_IOHS_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_IOHS_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_mc_cs_re_spa.xml b/xml/p10/node_cfir_mc_cs_re_spa.xml
index bb0c066..91b00f9 100644
--- a/xml/p10/node_cfir_mc_cs_re_spa.xml
+++ b/xml/p10/node_cfir_mc_cs_re_spa.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_MC_CS_RE_SPA" reg_type="SCOM">
-    <register name="CFIR_MC_XSTOP">
+    <register name="CFIR_MC_CS">
         <instance addr="0x0C040000" reg_inst="0"/>
         <instance addr="0x0D040000" reg_inst="1"/>
         <instance addr="0x0E040000" reg_inst="2"/>
         <instance addr="0x0F040000" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_XSTOP_MASK">
+    <register name="CFIR_MC_CS_MASK">
         <instance addr="0x0C040040" reg_inst="0"/>
         <instance addr="0x0D040040" reg_inst="1"/>
         <instance addr="0x0E040040" reg_inst="2"/>
         <instance addr="0x0F040040" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_RECOV">
+    <register name="CFIR_MC_RE">
         <instance addr="0x0C040001" reg_inst="0"/>
         <instance addr="0x0D040001" reg_inst="1"/>
         <instance addr="0x0E040001" reg_inst="2"/>
         <instance addr="0x0F040001" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_RECOV_MASK">
+    <register name="CFIR_MC_RE_MASK">
         <instance addr="0x0C040041" reg_inst="0"/>
         <instance addr="0x0D040041" reg_inst="1"/>
         <instance addr="0x0E040041" reg_inst="2"/>
         <instance addr="0x0F040041" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_SPATTN">
+    <register name="CFIR_MC_SPA">
         <instance addr="0x0C040002" reg_inst="0"/>
         <instance addr="0x0D040002" reg_inst="1"/>
         <instance addr="0x0E040002" reg_inst="2"/>
         <instance addr="0x0F040002" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_SPATTN_MASK">
+    <register name="CFIR_MC_SPA_MASK">
         <instance addr="0x0C040042" reg_inst="0"/>
         <instance addr="0x0D040042" reg_inst="1"/>
         <instance addr="0x0E040042" reg_inst="2"/>
@@ -38,27 +38,27 @@
     </register>
     <rule attn_type="CS" node_inst="0:3">
         <expr type="and">
-            <expr type="reg" value1="CFIR_MC_XSTOP"/>
+            <expr type="reg" value1="CFIR_MC_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_MC_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_MC_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:3">
         <expr type="and">
-            <expr type="reg" value1="CFIR_MC_RECOV"/>
+            <expr type="reg" value1="CFIR_MC_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_MC_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_MC_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="SPA" node_inst="0:3">
         <expr type="and">
-            <expr type="reg" value1="CFIR_MC_SPATTN"/>
+            <expr type="reg" value1="CFIR_MC_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_MC_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_MC_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_mc_ucs_ha.xml b/xml/p10/node_cfir_mc_ucs_ha.xml
index 08207bf..730c504 100644
--- a/xml/p10/node_cfir_mc_ucs_ha.xml
+++ b/xml/p10/node_cfir_mc_ucs_ha.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_MC_UCS_HA" reg_type="SCOM">
-    <register name="CFIR_MC_LOCAL_XSTOP">
+    <register name="CFIR_MC_UCS">
         <instance addr="0x0C040003" reg_inst="0"/>
         <instance addr="0x0D040003" reg_inst="1"/>
         <instance addr="0x0E040003" reg_inst="2"/>
         <instance addr="0x0F040003" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_LOCAL_XSTOP_MASK">
+    <register name="CFIR_MC_UCS_MASK">
         <instance addr="0x0C040043" reg_inst="0"/>
         <instance addr="0x0D040043" reg_inst="1"/>
         <instance addr="0x0E040043" reg_inst="2"/>
         <instance addr="0x0F040043" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_HOSTATTN">
+    <register name="CFIR_MC_HA">
         <instance addr="0x0C040004" reg_inst="0"/>
         <instance addr="0x0D040004" reg_inst="1"/>
         <instance addr="0x0E040004" reg_inst="2"/>
         <instance addr="0x0F040004" reg_inst="3"/>
     </register>
-    <register name="CFIR_MC_HOSTATTN_MASK">
+    <register name="CFIR_MC_HA_MASK">
         <instance addr="0x0C040044" reg_inst="0"/>
         <instance addr="0x0D040044" reg_inst="1"/>
         <instance addr="0x0E040044" reg_inst="2"/>
@@ -26,18 +26,18 @@
     </register>
     <rule attn_type="UCS" node_inst="0:3">
         <expr type="and">
-            <expr type="reg" value1="CFIR_MC_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_MC_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_MC_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_MC_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="HA" node_inst="0:3">
         <expr type="and">
-            <expr type="reg" value1="CFIR_MC_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_MC_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_MC_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_MC_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n0_cs_re.xml b/xml/p10/node_cfir_n0_cs_re.xml
index 7a24f09..228e91a 100644
--- a/xml/p10/node_cfir_n0_cs_re.xml
+++ b/xml/p10/node_cfir_n0_cs_re.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N0_CS_RE" reg_type="SCOM">
-    <register name="CFIR_N0_XSTOP">
+    <register name="CFIR_N0_CS">
         <instance addr="0x02040000" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_XSTOP_MASK">
+    <register name="CFIR_N0_CS_MASK">
         <instance addr="0x02040040" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_RECOV">
+    <register name="CFIR_N0_RE">
         <instance addr="0x02040001" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_RECOV_MASK">
+    <register name="CFIR_N0_RE_MASK">
         <instance addr="0x02040041" reg_inst="0"/>
     </register>
     <rule attn_type="CS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N0_XSTOP"/>
+            <expr type="reg" value1="CFIR_N0_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N0_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_N0_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N0_RECOV"/>
+            <expr type="reg" value1="CFIR_N0_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N0_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_N0_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n0_ha.xml b/xml/p10/node_cfir_n0_ha.xml
index c4d660a..14d161d 100644
--- a/xml/p10/node_cfir_n0_ha.xml
+++ b/xml/p10/node_cfir_n0_ha.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N0_HA" reg_type="SCOM">
-    <register name="CFIR_N0_HOSTATTN">
+    <register name="CFIR_N0_HA">
         <instance addr="0x02040004" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_HOSTATTN_MASK">
+    <register name="CFIR_N0_HA_MASK">
         <instance addr="0x02040044" reg_inst="0"/>
     </register>
     <rule attn_type="HA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N0_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_N0_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N0_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_N0_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n0_spa.xml b/xml/p10/node_cfir_n0_spa.xml
index e32ae1a..5250961 100644
--- a/xml/p10/node_cfir_n0_spa.xml
+++ b/xml/p10/node_cfir_n0_spa.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N0_SPA" reg_type="SCOM">
-    <register name="CFIR_N0_SPATTN">
+    <register name="CFIR_N0_SPA">
         <instance addr="0x02040002" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_SPATTN_MASK">
+    <register name="CFIR_N0_SPA_MASK">
         <instance addr="0x02040042" reg_inst="0"/>
     </register>
     <rule attn_type="SPA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N0_SPATTN"/>
+            <expr type="reg" value1="CFIR_N0_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N0_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_N0_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n0_ucs.xml b/xml/p10/node_cfir_n0_ucs.xml
index 72c2005..fadd459 100644
--- a/xml/p10/node_cfir_n0_ucs.xml
+++ b/xml/p10/node_cfir_n0_ucs.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N0_UCS" reg_type="SCOM">
-    <register name="CFIR_N0_LOCAL_XSTOP">
+    <register name="CFIR_N0_UCS">
         <instance addr="0x02040003" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_LOCAL_XSTOP_MASK">
+    <register name="CFIR_N0_UCS_MASK">
         <instance addr="0x02040043" reg_inst="0"/>
     </register>
     <rule attn_type="UCS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N0_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_N0_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N0_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_N0_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n1_cs.xml b/xml/p10/node_cfir_n1_cs.xml
index 763fd79..bf7c764 100644
--- a/xml/p10/node_cfir_n1_cs.xml
+++ b/xml/p10/node_cfir_n1_cs.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N1_CS" reg_type="SCOM">
-    <register name="CFIR_N1_XSTOP">
+    <register name="CFIR_N1_CS">
         <instance addr="0x03040000" reg_inst="0"/>
     </register>
-    <register name="CFIR_N1_XSTOP_MASK">
+    <register name="CFIR_N1_CS_MASK">
         <instance addr="0x03040040" reg_inst="0"/>
     </register>
     <rule attn_type="CS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N1_XSTOP"/>
+            <expr type="reg" value1="CFIR_N1_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N1_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_N1_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n1_ha.xml b/xml/p10/node_cfir_n1_ha.xml
index 8a99cc4..d445f15 100644
--- a/xml/p10/node_cfir_n1_ha.xml
+++ b/xml/p10/node_cfir_n1_ha.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N1_HA" reg_type="SCOM">
-    <register name="CFIR_N1_HOSTATTN">
+    <register name="CFIR_N1_HA">
         <instance addr="0x03040004" reg_inst="0"/>
     </register>
-    <register name="CFIR_N1_HOSTATTN_MASK">
+    <register name="CFIR_N1_HA_MASK">
         <instance addr="0x03040044" reg_inst="0"/>
     </register>
     <rule attn_type="HA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N1_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_N1_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N1_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_N1_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n1_re.xml b/xml/p10/node_cfir_n1_re.xml
index 0f7c996..fb08ca9 100644
--- a/xml/p10/node_cfir_n1_re.xml
+++ b/xml/p10/node_cfir_n1_re.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N1_RE" reg_type="SCOM">
-    <register name="CFIR_N1_RECOV">
+    <register name="CFIR_N1_RE">
         <instance addr="0x03040001" reg_inst="0"/>
     </register>
-    <register name="CFIR_N1_RECOV_MASK">
+    <register name="CFIR_N1_RE_MASK">
         <instance addr="0x03040041" reg_inst="0"/>
     </register>
     <rule attn_type="RE" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N1_RECOV"/>
+            <expr type="reg" value1="CFIR_N1_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N1_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_N1_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n1_spa.xml b/xml/p10/node_cfir_n1_spa.xml
index 74d6ec0..5286a4c 100644
--- a/xml/p10/node_cfir_n1_spa.xml
+++ b/xml/p10/node_cfir_n1_spa.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N1_SPA" reg_type="SCOM">
-    <register name="CFIR_N1_SPATTN">
+    <register name="CFIR_N1_SPA">
         <instance addr="0x03040002" reg_inst="0"/>
     </register>
-    <register name="CFIR_N1_SPATTN_MASK">
+    <register name="CFIR_N1_SPA_MASK">
         <instance addr="0x03040042" reg_inst="0"/>
     </register>
     <rule attn_type="SPA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N1_SPATTN"/>
+            <expr type="reg" value1="CFIR_N1_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N1_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_N1_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_n1_ucs.xml b/xml/p10/node_cfir_n1_ucs.xml
index 51b877e..bfcd9af 100644
--- a/xml/p10/node_cfir_n1_ucs.xml
+++ b/xml/p10/node_cfir_n1_ucs.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_N1_UCS" reg_type="SCOM">
-    <register name="CFIR_N1_LOCAL_XSTOP">
+    <register name="CFIR_N1_UCS">
         <instance addr="0x03040003" reg_inst="0"/>
     </register>
-    <register name="CFIR_N1_LOCAL_XSTOP_MASK">
+    <register name="CFIR_N1_UCS_MASK">
         <instance addr="0x03040043" reg_inst="0"/>
     </register>
     <rule attn_type="UCS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_N1_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_N1_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_N1_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_N1_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_cs_re.xml b/xml/p10/node_cfir_paue_cs_re.xml
index 11c8e20..2de2614 100644
--- a/xml/p10/node_cfir_paue_cs_re.xml
+++ b/xml/p10/node_cfir_paue_cs_re.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUE_CS_RE" reg_type="SCOM">
-    <register name="CFIR_PAUE_XSTOP">
+    <register name="CFIR_PAUE_CS">
         <instance addr="0x10040000" reg_inst="0"/>
         <instance addr="0x11040000" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_XSTOP_MASK">
+    <register name="CFIR_PAUE_CS_MASK">
         <instance addr="0x10040040" reg_inst="0"/>
         <instance addr="0x11040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RECOV">
+    <register name="CFIR_PAUE_RE">
         <instance addr="0x10040001" reg_inst="0"/>
         <instance addr="0x11040001" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RECOV_MASK">
+    <register name="CFIR_PAUE_RE_MASK">
         <instance addr="0x10040041" reg_inst="0"/>
         <instance addr="0x11040041" reg_inst="1"/>
     </register>
     <rule attn_type="CS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUE_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RECOV"/>
+            <expr type="reg" value1="CFIR_PAUE_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_cs_re_p10_10.xml b/xml/p10/node_cfir_paue_cs_re_p10_10.xml
index e38b1ba..9d74507 100644
--- a/xml/p10/node_cfir_paue_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_paue_cs_re_p10_10.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUE_CS_RE" reg_type="SCOM">
-    <register name="CFIR_PAUE_XSTOP">
+    <register name="CFIR_PAUE_CS">
         <instance addr="0x10040000" reg_inst="0"/>
         <instance addr="0x11040000" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_XSTOP_MASK">
+    <register name="CFIR_PAUE_CS_MASK">
         <instance addr="0x10040040" reg_inst="0"/>
         <instance addr="0x11040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RECOV">
+    <register name="CFIR_PAUE_RE">
         <instance addr="0x10040001" reg_inst="0"/>
         <instance addr="0x11040001" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RECOV_MASK">
+    <register name="CFIR_PAUE_RE_MASK">
         <instance addr="0x10040041" reg_inst="0"/>
         <instance addr="0x11040041" reg_inst="1"/>
     </register>
     <rule attn_type="CS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUE_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RECOV"/>
+            <expr type="reg" value1="CFIR_PAUE_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_ha.xml b/xml/p10/node_cfir_paue_ha.xml
index 8369ab0..00c551f 100644
--- a/xml/p10/node_cfir_paue_ha.xml
+++ b/xml/p10/node_cfir_paue_ha.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_PAUE_HA" reg_type="SCOM">
-    <register name="CFIR_PAUE_HOSTATTN">
+    <register name="CFIR_PAUE_HA">
         <instance addr="0x10040004" reg_inst="0"/>
         <instance addr="0x11040004" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_HOSTATTN_MASK">
+    <register name="CFIR_PAUE_HA_MASK">
         <instance addr="0x10040044" reg_inst="0"/>
         <instance addr="0x11040044" reg_inst="1"/>
     </register>
     <rule attn_type="HA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_PAUE_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_spa.xml b/xml/p10/node_cfir_paue_spa.xml
index 47b5c7b..aa1c9a0 100644
--- a/xml/p10/node_cfir_paue_spa.xml
+++ b/xml/p10/node_cfir_paue_spa.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUE_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUE_SPATTN">
+    <register name="CFIR_PAUE_SPA">
         <instance addr="0x10040002" reg_inst="0"/>
         <instance addr="0x11040002" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_SPATTN_MASK">
+    <register name="CFIR_PAUE_SPA_MASK">
         <instance addr="0x10040042" reg_inst="0"/>
         <instance addr="0x11040042" reg_inst="1"/>
     </register>
     <rule attn_type="SPA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_SPATTN"/>
+            <expr type="reg" value1="CFIR_PAUE_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_spa_p10_10.xml b/xml/p10/node_cfir_paue_spa_p10_10.xml
index c8ded86..e377117 100644
--- a/xml/p10/node_cfir_paue_spa_p10_10.xml
+++ b/xml/p10/node_cfir_paue_spa_p10_10.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUE_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUE_SPATTN">
+    <register name="CFIR_PAUE_SPA">
         <instance addr="0x10040002" reg_inst="0"/>
         <instance addr="0x11040002" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_SPATTN_MASK">
+    <register name="CFIR_PAUE_SPA_MASK">
         <instance addr="0x10040042" reg_inst="0"/>
         <instance addr="0x11040042" reg_inst="1"/>
     </register>
     <rule attn_type="SPA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_SPATTN"/>
+            <expr type="reg" value1="CFIR_PAUE_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_ucs.xml b/xml/p10/node_cfir_paue_ucs.xml
index c64d46b..1011656 100644
--- a/xml/p10/node_cfir_paue_ucs.xml
+++ b/xml/p10/node_cfir_paue_ucs.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUE_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUE_LOCAL_XSTOP">
+    <register name="CFIR_PAUE_UCS">
         <instance addr="0x10040003" reg_inst="0"/>
         <instance addr="0x11040003" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_LOCAL_XSTOP_MASK">
+    <register name="CFIR_PAUE_UCS_MASK">
         <instance addr="0x10040043" reg_inst="0"/>
         <instance addr="0x11040043" reg_inst="1"/>
     </register>
     <rule attn_type="UCS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUE_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_paue_ucs_p10_10.xml b/xml/p10/node_cfir_paue_ucs_p10_10.xml
index 07b4d32..6d24216 100644
--- a/xml/p10/node_cfir_paue_ucs_p10_10.xml
+++ b/xml/p10/node_cfir_paue_ucs_p10_10.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUE_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUE_LOCAL_XSTOP">
+    <register name="CFIR_PAUE_UCS">
         <instance addr="0x10040003" reg_inst="0"/>
         <instance addr="0x11040003" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_LOCAL_XSTOP_MASK">
+    <register name="CFIR_PAUE_UCS_MASK">
         <instance addr="0x10040043" reg_inst="0"/>
         <instance addr="0x11040043" reg_inst="1"/>
     </register>
     <rule attn_type="UCS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUE_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUE_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_cs_re.xml b/xml/p10/node_cfir_pauw_cs_re.xml
index b3a455b..83d6b6f 100644
--- a/xml/p10/node_cfir_pauw_cs_re.xml
+++ b/xml/p10/node_cfir_pauw_cs_re.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUW_CS_RE" reg_type="SCOM">
-    <register name="CFIR_PAUW_XSTOP">
+    <register name="CFIR_PAUW_CS">
         <instance addr="0x12040000" reg_inst="0"/>
         <instance addr="0x13040000" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_XSTOP_MASK">
+    <register name="CFIR_PAUW_CS_MASK">
         <instance addr="0x12040040" reg_inst="0"/>
         <instance addr="0x13040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RECOV">
+    <register name="CFIR_PAUW_RE">
         <instance addr="0x12040001" reg_inst="0"/>
         <instance addr="0x13040001" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RECOV_MASK">
+    <register name="CFIR_PAUW_RE_MASK">
         <instance addr="0x12040041" reg_inst="0"/>
         <instance addr="0x13040041" reg_inst="1"/>
     </register>
     <rule attn_type="CS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUW_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RECOV"/>
+            <expr type="reg" value1="CFIR_PAUW_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml b/xml/p10/node_cfir_pauw_cs_re_p10_10.xml
index bc4d308..15b7ce8 100644
--- a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_pauw_cs_re_p10_10.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUW_CS_RE" reg_type="SCOM">
-    <register name="CFIR_PAUW_XSTOP">
+    <register name="CFIR_PAUW_CS">
         <instance addr="0x12040000" reg_inst="0"/>
         <instance addr="0x13040000" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_XSTOP_MASK">
+    <register name="CFIR_PAUW_CS_MASK">
         <instance addr="0x12040040" reg_inst="0"/>
         <instance addr="0x13040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RECOV">
+    <register name="CFIR_PAUW_RE">
         <instance addr="0x12040001" reg_inst="0"/>
         <instance addr="0x13040001" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RECOV_MASK">
+    <register name="CFIR_PAUW_RE_MASK">
         <instance addr="0x12040041" reg_inst="0"/>
         <instance addr="0x13040041" reg_inst="1"/>
     </register>
     <rule attn_type="CS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUW_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RECOV"/>
+            <expr type="reg" value1="CFIR_PAUW_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_ha.xml b/xml/p10/node_cfir_pauw_ha.xml
index 79242c7..6521416 100644
--- a/xml/p10/node_cfir_pauw_ha.xml
+++ b/xml/p10/node_cfir_pauw_ha.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_PAUW_HA" reg_type="SCOM">
-    <register name="CFIR_PAUW_HOSTATTN">
+    <register name="CFIR_PAUW_HA">
         <instance addr="0x12040004" reg_inst="0"/>
         <instance addr="0x13040004" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_HOSTATTN_MASK">
+    <register name="CFIR_PAUW_HA_MASK">
         <instance addr="0x12040044" reg_inst="0"/>
         <instance addr="0x13040044" reg_inst="1"/>
     </register>
     <rule attn_type="HA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_PAUW_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_spa.xml b/xml/p10/node_cfir_pauw_spa.xml
index a4f09c9..def81b4 100644
--- a/xml/p10/node_cfir_pauw_spa.xml
+++ b/xml/p10/node_cfir_pauw_spa.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUW_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUW_SPATTN">
+    <register name="CFIR_PAUW_SPA">
         <instance addr="0x12040002" reg_inst="0"/>
         <instance addr="0x13040002" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_SPATTN_MASK">
+    <register name="CFIR_PAUW_SPA_MASK">
         <instance addr="0x12040042" reg_inst="0"/>
         <instance addr="0x13040042" reg_inst="1"/>
     </register>
     <rule attn_type="SPA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_SPATTN"/>
+            <expr type="reg" value1="CFIR_PAUW_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_spa_p10_10.xml b/xml/p10/node_cfir_pauw_spa_p10_10.xml
index c2e2c4e..f4b964b 100644
--- a/xml/p10/node_cfir_pauw_spa_p10_10.xml
+++ b/xml/p10/node_cfir_pauw_spa_p10_10.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUW_SPA" reg_type="SCOM">
-    <register name="CFIR_PAUW_SPATTN">
+    <register name="CFIR_PAUW_SPA">
         <instance addr="0x12040002" reg_inst="0"/>
         <instance addr="0x13040002" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_SPATTN_MASK">
+    <register name="CFIR_PAUW_SPA_MASK">
         <instance addr="0x12040042" reg_inst="0"/>
         <instance addr="0x13040042" reg_inst="1"/>
     </register>
     <rule attn_type="SPA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_SPATTN"/>
+            <expr type="reg" value1="CFIR_PAUW_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_ucs.xml b/xml/p10/node_cfir_pauw_ucs.xml
index e62c3dd..6c51deb 100644
--- a/xml/p10/node_cfir_pauw_ucs.xml
+++ b/xml/p10/node_cfir_pauw_ucs.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_20" name="CFIR_PAUW_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUW_LOCAL_XSTOP">
+    <register name="CFIR_PAUW_UCS">
         <instance addr="0x12040003" reg_inst="0"/>
         <instance addr="0x13040003" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_LOCAL_XSTOP_MASK">
+    <register name="CFIR_PAUW_UCS_MASK">
         <instance addr="0x12040043" reg_inst="0"/>
         <instance addr="0x13040043" reg_inst="1"/>
     </register>
     <rule attn_type="UCS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUW_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pauw_ucs_p10_10.xml b/xml/p10/node_cfir_pauw_ucs_p10_10.xml
index 76932a0..605fde6 100644
--- a/xml/p10/node_cfir_pauw_ucs_p10_10.xml
+++ b/xml/p10/node_cfir_pauw_ucs_p10_10.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10" name="CFIR_PAUW_UCS" reg_type="SCOM">
-    <register name="CFIR_PAUW_LOCAL_XSTOP">
+    <register name="CFIR_PAUW_UCS">
         <instance addr="0x12040003" reg_inst="0"/>
         <instance addr="0x13040003" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_LOCAL_XSTOP_MASK">
+    <register name="CFIR_PAUW_UCS_MASK">
         <instance addr="0x12040043" reg_inst="0"/>
         <instance addr="0x13040043" reg_inst="1"/>
     </register>
     <rule attn_type="UCS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_PAUW_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PAUW_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pci_cs_re.xml b/xml/p10/node_cfir_pci_cs_re.xml
index 0cd9339..218f6ea 100644
--- a/xml/p10/node_cfir_pci_cs_re.xml
+++ b/xml/p10/node_cfir_pci_cs_re.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_CS_RE" reg_type="SCOM">
-    <register name="CFIR_PCI_XSTOP">
+    <register name="CFIR_PCI_CS">
         <instance addr="0x08040000" reg_inst="0"/>
         <instance addr="0x09040000" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_XSTOP_MASK">
+    <register name="CFIR_PCI_CS_MASK">
         <instance addr="0x08040040" reg_inst="0"/>
         <instance addr="0x09040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_RECOV">
+    <register name="CFIR_PCI_RE">
         <instance addr="0x08040001" reg_inst="0"/>
         <instance addr="0x09040001" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_RECOV_MASK">
+    <register name="CFIR_PCI_RE_MASK">
         <instance addr="0x08040041" reg_inst="0"/>
         <instance addr="0x09040041" reg_inst="1"/>
     </register>
     <rule attn_type="CS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_XSTOP"/>
+            <expr type="reg" value1="CFIR_PCI_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PCI_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_RECOV"/>
+            <expr type="reg" value1="CFIR_PCI_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_PCI_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pci_spa_ha.xml b/xml/p10/node_cfir_pci_spa_ha.xml
index 238b5c9..21f8adb 100644
--- a/xml/p10/node_cfir_pci_spa_ha.xml
+++ b/xml/p10/node_cfir_pci_spa_ha.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_SPA_HA" reg_type="SCOM">
-    <register name="CFIR_PCI_SPATTN">
+    <register name="CFIR_PCI_SPA">
         <instance addr="0x08040002" reg_inst="0"/>
         <instance addr="0x09040002" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_SPATTN_MASK">
+    <register name="CFIR_PCI_SPA_MASK">
         <instance addr="0x08040042" reg_inst="0"/>
         <instance addr="0x09040042" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_HOSTATTN">
+    <register name="CFIR_PCI_HA">
         <instance addr="0x08040004" reg_inst="0"/>
         <instance addr="0x09040004" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_HOSTATTN_MASK">
+    <register name="CFIR_PCI_HA_MASK">
         <instance addr="0x08040044" reg_inst="0"/>
         <instance addr="0x09040044" reg_inst="1"/>
     </register>
     <rule attn_type="SPA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_SPATTN"/>
+            <expr type="reg" value1="CFIR_PCI_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PCI_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="HA" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_PCI_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_PCI_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_pci_ucs.xml b/xml/p10/node_cfir_pci_ucs.xml
index a7b981c..edc6c14 100644
--- a/xml/p10/node_cfir_pci_ucs.xml
+++ b/xml/p10/node_cfir_pci_ucs.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_UCS" reg_type="SCOM">
-    <register name="CFIR_PCI_LOCAL_XSTOP">
+    <register name="CFIR_PCI_UCS">
         <instance addr="0x08040003" reg_inst="0"/>
         <instance addr="0x09040003" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_LOCAL_XSTOP_MASK">
+    <register name="CFIR_PCI_UCS_MASK">
         <instance addr="0x08040043" reg_inst="0"/>
         <instance addr="0x09040043" reg_inst="1"/>
     </register>
     <rule attn_type="UCS" node_inst="0:1">
         <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_PCI_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_PCI_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_tp_cs_re.xml b/xml/p10/node_cfir_tp_cs_re.xml
index 639a381..67c607d 100644
--- a/xml/p10/node_cfir_tp_cs_re.xml
+++ b/xml/p10/node_cfir_tp_cs_re.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_TP_CS_RE" reg_type="SCOM">
-    <register name="CFIR_TP_XSTOP">
+    <register name="CFIR_TP_CS">
         <instance addr="0x01040000" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_XSTOP_MASK">
+    <register name="CFIR_TP_CS_MASK">
         <instance addr="0x01040040" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_RECOV">
+    <register name="CFIR_TP_RE">
         <instance addr="0x01040001" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_RECOV_MASK">
+    <register name="CFIR_TP_RE_MASK">
         <instance addr="0x01040041" reg_inst="0"/>
     </register>
     <rule attn_type="CS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_TP_XSTOP"/>
+            <expr type="reg" value1="CFIR_TP_CS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_TP_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_TP_CS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="RE" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_TP_RECOV"/>
+            <expr type="reg" value1="CFIR_TP_RE"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_TP_RECOV_MASK"/>
+                <expr type="reg" value1="CFIR_TP_RE_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
diff --git a/xml/p10/node_cfir_tp_spa_ucs_ha.xml b/xml/p10/node_cfir_tp_spa_ucs_ha.xml
index cc70c5b..f189f01 100644
--- a/xml/p10/node_cfir_tp_spa_ucs_ha.xml
+++ b/xml/p10/node_cfir_tp_spa_ucs_ha.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <attn_node model_ec="P10_10,P10_20" name="CFIR_TP_SPA_UCS_HA" reg_type="SCOM">
-    <register name="CFIR_TP_SPATTN">
+    <register name="CFIR_TP_SPA">
         <instance addr="0x01040002" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_SPATTN_MASK">
+    <register name="CFIR_TP_SPA_MASK">
         <instance addr="0x01040042" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_LOCAL_XSTOP">
+    <register name="CFIR_TP_UCS">
         <instance addr="0x01040003" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_LOCAL_XSTOP_MASK">
+    <register name="CFIR_TP_UCS_MASK">
         <instance addr="0x01040043" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_HOSTATTN">
+    <register name="CFIR_TP_HA">
         <instance addr="0x01040004" reg_inst="0"/>
     </register>
-    <register name="CFIR_TP_HOSTATTN_MASK">
+    <register name="CFIR_TP_HA_MASK">
         <instance addr="0x01040044" reg_inst="0"/>
     </register>
     <rule attn_type="SPA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_TP_SPATTN"/>
+            <expr type="reg" value1="CFIR_TP_SPA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_TP_SPATTN_MASK"/>
+                <expr type="reg" value1="CFIR_TP_SPA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="UCS" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_TP_LOCAL_XSTOP"/>
+            <expr type="reg" value1="CFIR_TP_UCS"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_TP_LOCAL_XSTOP_MASK"/>
+                <expr type="reg" value1="CFIR_TP_UCS_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
     <rule attn_type="HA" node_inst="0">
         <expr type="and">
-            <expr type="reg" value1="CFIR_TP_HOSTATTN"/>
+            <expr type="reg" value1="CFIR_TP_HA"/>
             <expr type="not">
-                <expr type="reg" value1="CFIR_TP_HOSTATTN_MASK"/>
+                <expr type="reg" value1="CFIR_TP_HA_MASK"/>
             </expr>
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>