diff --git a/xml/p10/node_cfir_iohs_cs.xml b/xml/p10/node_cfir_iohs_cs.xml
new file mode 100644
index 0000000..35f1980
--- /dev/null
+++ b/xml/p10/node_cfir_iohs_cs.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_CS" reg_type="SCOM">
+    <register name="CFIR_IOHS_CS">
+        <instance addr="0x18040000" reg_inst="0"/>
+        <instance addr="0x19040000" reg_inst="1"/>
+        <instance addr="0x1A040000" reg_inst="2"/>
+        <instance addr="0x1B040000" reg_inst="3"/>
+        <instance addr="0x1C040000" reg_inst="4"/>
+        <instance addr="0x1D040000" reg_inst="5"/>
+        <instance addr="0x1E040000" reg_inst="6"/>
+        <instance addr="0x1F040000" reg_inst="7"/>
+    </register>
+    <register name="CFIR_IOHS_CS_MASK">
+        <instance addr="0x18040040" reg_inst="0"/>
+        <instance addr="0x19040040" reg_inst="1"/>
+        <instance addr="0x1A040040" reg_inst="2"/>
+        <instance addr="0x1B040040" reg_inst="3"/>
+        <instance addr="0x1C040040" reg_inst="4"/>
+        <instance addr="0x1D040040" reg_inst="5"/>
+        <instance addr="0x1E040040" reg_inst="6"/>
+        <instance addr="0x1F040040" reg_inst="7"/>
+    </register>
+    <rule attn_type="CS" node_inst="0:7">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_IOHS_CS"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_IOHS_CS_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
+    <bit child_node="IOHS_DLP_FIR" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_iohs_cs_re_spa.xml b/xml/p10/node_cfir_iohs_cs_re_spa.xml
deleted file mode 100644
index 1e94246..0000000
--- a/xml/p10/node_cfir_iohs_cs_re_spa.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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_CS">
-        <instance addr="0x18040000" reg_inst="0"/>
-        <instance addr="0x19040000" reg_inst="1"/>
-        <instance addr="0x1A040000" reg_inst="2"/>
-        <instance addr="0x1B040000" reg_inst="3"/>
-        <instance addr="0x1C040000" reg_inst="4"/>
-        <instance addr="0x1D040000" reg_inst="5"/>
-        <instance addr="0x1E040000" reg_inst="6"/>
-        <instance addr="0x1F040000" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_CS_MASK">
-        <instance addr="0x18040040" reg_inst="0"/>
-        <instance addr="0x19040040" reg_inst="1"/>
-        <instance addr="0x1A040040" reg_inst="2"/>
-        <instance addr="0x1B040040" reg_inst="3"/>
-        <instance addr="0x1C040040" reg_inst="4"/>
-        <instance addr="0x1D040040" reg_inst="5"/>
-        <instance addr="0x1E040040" reg_inst="6"/>
-        <instance addr="0x1F040040" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_RE">
-        <instance addr="0x18040001" reg_inst="0"/>
-        <instance addr="0x19040001" reg_inst="1"/>
-        <instance addr="0x1A040001" reg_inst="2"/>
-        <instance addr="0x1B040001" reg_inst="3"/>
-        <instance addr="0x1C040001" reg_inst="4"/>
-        <instance addr="0x1D040001" reg_inst="5"/>
-        <instance addr="0x1E040001" reg_inst="6"/>
-        <instance addr="0x1F040001" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_RE_MASK">
-        <instance addr="0x18040041" reg_inst="0"/>
-        <instance addr="0x19040041" reg_inst="1"/>
-        <instance addr="0x1A040041" reg_inst="2"/>
-        <instance addr="0x1B040041" reg_inst="3"/>
-        <instance addr="0x1C040041" reg_inst="4"/>
-        <instance addr="0x1D040041" reg_inst="5"/>
-        <instance addr="0x1E040041" reg_inst="6"/>
-        <instance addr="0x1F040041" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_SPA">
-        <instance addr="0x18040002" reg_inst="0"/>
-        <instance addr="0x19040002" reg_inst="1"/>
-        <instance addr="0x1A040002" reg_inst="2"/>
-        <instance addr="0x1B040002" reg_inst="3"/>
-        <instance addr="0x1C040002" reg_inst="4"/>
-        <instance addr="0x1D040002" reg_inst="5"/>
-        <instance addr="0x1E040002" reg_inst="6"/>
-        <instance addr="0x1F040002" reg_inst="7"/>
-    </register>
-    <register name="CFIR_IOHS_SPA_MASK">
-        <instance addr="0x18040042" reg_inst="0"/>
-        <instance addr="0x19040042" reg_inst="1"/>
-        <instance addr="0x1A040042" reg_inst="2"/>
-        <instance addr="0x1B040042" reg_inst="3"/>
-        <instance addr="0x1C040042" reg_inst="4"/>
-        <instance addr="0x1D040042" reg_inst="5"/>
-        <instance addr="0x1E040042" reg_inst="6"/>
-        <instance addr="0x1F040042" reg_inst="7"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:7">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_IOHS_CS"/>
-            <expr type="not">
-                <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_RE"/>
-            <expr type="not">
-                <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_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_IOHS_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
-    <bit child_node="IOHS_DLP_FIR" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_iohs_re.xml b/xml/p10/node_cfir_iohs_re.xml
new file mode 100644
index 0000000..c0df60c
--- /dev/null
+++ b/xml/p10/node_cfir_iohs_re.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_RE" reg_type="SCOM">
+    <register name="CFIR_IOHS_RE">
+        <instance addr="0x18040001" reg_inst="0"/>
+        <instance addr="0x19040001" reg_inst="1"/>
+        <instance addr="0x1A040001" reg_inst="2"/>
+        <instance addr="0x1B040001" reg_inst="3"/>
+        <instance addr="0x1C040001" reg_inst="4"/>
+        <instance addr="0x1D040001" reg_inst="5"/>
+        <instance addr="0x1E040001" reg_inst="6"/>
+        <instance addr="0x1F040001" reg_inst="7"/>
+    </register>
+    <register name="CFIR_IOHS_RE_MASK">
+        <instance addr="0x18040041" reg_inst="0"/>
+        <instance addr="0x19040041" reg_inst="1"/>
+        <instance addr="0x1A040041" reg_inst="2"/>
+        <instance addr="0x1B040041" reg_inst="3"/>
+        <instance addr="0x1C040041" reg_inst="4"/>
+        <instance addr="0x1D040041" reg_inst="5"/>
+        <instance addr="0x1E040041" reg_inst="6"/>
+        <instance addr="0x1F040041" reg_inst="7"/>
+    </register>
+    <rule attn_type="RE" node_inst="0:7">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_IOHS_RE"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_IOHS_RE_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
+    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
+    <bit child_node="IOHS_DLP_FIR" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_iohs_spa.xml b/xml/p10/node_cfir_iohs_spa.xml
new file mode 100644
index 0000000..4e612f0
--- /dev/null
+++ b/xml/p10/node_cfir_iohs_spa.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_IOHS_SPA" reg_type="SCOM">
+    <register name="CFIR_IOHS_SPA">
+        <instance addr="0x18040002" reg_inst="0"/>
+        <instance addr="0x19040002" reg_inst="1"/>
+        <instance addr="0x1A040002" reg_inst="2"/>
+        <instance addr="0x1B040002" reg_inst="3"/>
+        <instance addr="0x1C040002" reg_inst="4"/>
+        <instance addr="0x1D040002" reg_inst="5"/>
+        <instance addr="0x1E040002" reg_inst="6"/>
+        <instance addr="0x1F040002" reg_inst="7"/>
+    </register>
+    <register name="CFIR_IOHS_SPA_MASK">
+        <instance addr="0x18040042" reg_inst="0"/>
+        <instance addr="0x19040042" reg_inst="1"/>
+        <instance addr="0x1A040042" reg_inst="2"/>
+        <instance addr="0x1B040042" reg_inst="3"/>
+        <instance addr="0x1C040042" reg_inst="4"/>
+        <instance addr="0x1D040042" reg_inst="5"/>
+        <instance addr="0x1E040042" reg_inst="6"/>
+        <instance addr="0x1F040042" reg_inst="7"/>
+    </register>
+    <rule attn_type="SPA" node_inst="0:7">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_IOHS_SPA"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_IOHS_SPA_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit child_node="IOHS_LOCAL_FIR" node_inst="0,1,2,3,4,5,6,7" pos="4">Attention from IOHS_LOCAL_FIR</bit>
+    <bit child_node="IOHS_DLP_FIR" node_inst="0,1,2,3,4,5,6,7" pos="5">Attention from IOHS_DLP_FIR</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_mc_cs.xml b/xml/p10/node_cfir_mc_cs.xml
new file mode 100644
index 0000000..c6ccfa3
--- /dev/null
+++ b/xml/p10/node_cfir_mc_cs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_CS" reg_type="SCOM">
+    <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_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>
+    <rule attn_type="CS" node_inst="0:3">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_MC_CS"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_MC_CS_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
+    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
+    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_mc_cs_re_spa.xml b/xml/p10/node_cfir_mc_cs_re_spa.xml
deleted file mode 100644
index 91b00f9..0000000
--- a/xml/p10/node_cfir_mc_cs_re_spa.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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_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_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_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_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_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_SPA_MASK">
-        <instance addr="0x0C040042" reg_inst="0"/>
-        <instance addr="0x0D040042" reg_inst="1"/>
-        <instance addr="0x0E040042" reg_inst="2"/>
-        <instance addr="0x0F040042" reg_inst="3"/>
-    </register>
-    <rule attn_type="CS" node_inst="0:3">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_MC_CS"/>
-            <expr type="not">
-                <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_RE"/>
-            <expr type="not">
-                <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_SPA"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_MC_SPA_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
-    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
-    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
-    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
-    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
-    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_mc_re.xml b/xml/p10/node_cfir_mc_re.xml
new file mode 100644
index 0000000..a36b867
--- /dev/null
+++ b/xml/p10/node_cfir_mc_re.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_RE" reg_type="SCOM">
+    <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_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>
+    <rule attn_type="RE" node_inst="0:3">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_MC_RE"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_MC_RE_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
+    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
+    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
+    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_mc_spa.xml b/xml/p10/node_cfir_mc_spa.xml
new file mode 100644
index 0000000..1c3e1d3
--- /dev/null
+++ b/xml/p10/node_cfir_mc_spa.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_MC_SPA" reg_type="SCOM">
+    <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_SPA_MASK">
+        <instance addr="0x0C040042" reg_inst="0"/>
+        <instance addr="0x0D040042" reg_inst="1"/>
+        <instance addr="0x0E040042" reg_inst="2"/>
+        <instance addr="0x0F040042" reg_inst="3"/>
+    </register>
+    <rule attn_type="SPA" node_inst="0:3">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_MC_SPA"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_MC_SPA_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit child_node="MC_LOCAL_FIR" node_inst="0,1,2,3" pos="4">Attention from MC_LOCAL_FIR</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="0,2,4,6" pos="5">Attention from MC_DSTL_FIR 0</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="0,2,4,6" pos="6">Attention from MC_USTL_FIR 0</bit>
+    <bit child_node="MC_DSTL_FIR" node_inst="1,3,5,7" pos="7">Attention from MC_DSTL_FIR 1</bit>
+    <bit child_node="MC_USTL_FIR" node_inst="1,3,5,7" pos="8">Attention from MC_USTL_FIR 1</bit>
+    <bit child_node="MC_FIR" node_inst="0,1,2,3" pos="9">Attention from MC_FIR</bit>
+    <bit child_node="MC_MISC_FIR" node_inst="0,1,2,3" pos="10">Attention from MC_MISC_FIR</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="0,2,4,6" pos="13">Attention from MC_OMI_DL_FIR 0</bit>
+    <bit child_node="MC_OMI_DL_FIR" node_inst="1,3,5,7" pos="14">Attention from MC_OMI_DL_FIR 1</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_n0_cs_re.xml b/xml/p10/node_cfir_n0_cs.xml
similarity index 71%
copy from xml/p10/node_cfir_n0_cs_re.xml
copy to xml/p10/node_cfir_n0_cs.xml
index 228e91a..3e1241e 100644
--- a/xml/p10/node_cfir_n0_cs_re.xml
+++ b/xml/p10/node_cfir_n0_cs.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_CS" reg_type="SCOM">
     <register name="CFIR_N0_CS">
         <instance addr="0x02040000" reg_inst="0"/>
     </register>
     <register name="CFIR_N0_CS_MASK">
         <instance addr="0x02040040" reg_inst="0"/>
     </register>
-    <register name="CFIR_N0_RE">
-        <instance addr="0x02040001" reg_inst="0"/>
-    </register>
-    <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_CS"/>
@@ -21,15 +15,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_N0_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_N0_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
     <bit child_node="NMMU_CQ_FIR" node_inst="0" pos="5">Attention from NMMU_CQ_FIR 0</bit>
     <bit child_node="NMMU_FIR" node_inst="0" pos="6">Attention from NMMU_FIR 0</bit>
diff --git a/xml/p10/node_cfir_n0_cs_re.xml b/xml/p10/node_cfir_n0_re.xml
similarity index 71%
rename from xml/p10/node_cfir_n0_cs_re.xml
rename to xml/p10/node_cfir_n0_re.xml
index 228e91a..784691d 100644
--- a/xml/p10/node_cfir_n0_cs_re.xml
+++ b/xml/p10/node_cfir_n0_re.xml
@@ -1,26 +1,11 @@
 <?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_CS">
-        <instance addr="0x02040000" reg_inst="0"/>
-    </register>
-    <register name="CFIR_N0_CS_MASK">
-        <instance addr="0x02040040" reg_inst="0"/>
-    </register>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_N0_RE" reg_type="SCOM">
     <register name="CFIR_N0_RE">
         <instance addr="0x02040001" reg_inst="0"/>
     </register>
     <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -30,6 +15,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="N0_LOCAL_FIR" node_inst="0" pos="4">Attention from N0_LOCAL_FIR</bit>
     <bit child_node="NMMU_CQ_FIR" node_inst="0" pos="5">Attention from NMMU_CQ_FIR 0</bit>
     <bit child_node="NMMU_FIR" node_inst="0" pos="6">Attention from NMMU_FIR 0</bit>
diff --git a/xml/p10/node_cfir_n1_re.xml b/xml/p10/node_cfir_n1_re.xml
index fb08ca9..a74acad 100644
--- a/xml/p10/node_cfir_n1_re.xml
+++ b/xml/p10/node_cfir_n1_re.xml
@@ -15,6 +15,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="N1_LOCAL_FIR" node_inst="0" pos="4">Attention from N1_LOCAL_FIR</bit>
     <bit child_node="NMMU_CQ_FIR" node_inst="1" pos="5">Attention from NMMU_CQ_FIR 1</bit>
     <bit child_node="NMMU_FIR" node_inst="1" pos="6">Attention from NMMU_FIR 1</bit>
diff --git a/xml/p10/node_cfir_paue_cs_re.xml b/xml/p10/node_cfir_paue_cs.xml
similarity index 63%
rename from xml/p10/node_cfir_paue_cs_re.xml
rename to xml/p10/node_cfir_paue_cs.xml
index 2de2614..9cff2ff 100644
--- a/xml/p10/node_cfir_paue_cs_re.xml
+++ b/xml/p10/node_cfir_paue_cs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUE_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_20" name="CFIR_PAUE_CS" reg_type="SCOM">
     <register name="CFIR_PAUE_CS">
         <instance addr="0x10040000" reg_inst="0"/>
         <instance addr="0x11040000" reg_inst="1"/>
@@ -8,14 +8,6 @@
         <instance addr="0x10040040" reg_inst="0"/>
         <instance addr="0x11040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RE">
-        <instance addr="0x10040001" reg_inst="0"/>
-        <instance addr="0x11040001" reg_inst="1"/>
-    </register>
-    <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_CS"/>
@@ -25,15 +17,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_paue_cs_re_p10_10.xml b/xml/p10/node_cfir_paue_cs_p10_10.xml
similarity index 65%
copy from xml/p10/node_cfir_paue_cs_re_p10_10.xml
copy to xml/p10/node_cfir_paue_cs_p10_10.xml
index 9d74507..e9e5717 100644
--- a/xml/p10/node_cfir_paue_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_paue_cs_p10_10.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUE_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_10" name="CFIR_PAUE_CS" reg_type="SCOM">
     <register name="CFIR_PAUE_CS">
         <instance addr="0x10040000" reg_inst="0"/>
         <instance addr="0x11040000" reg_inst="1"/>
@@ -8,14 +8,6 @@
         <instance addr="0x10040040" reg_inst="0"/>
         <instance addr="0x11040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUE_RE">
-        <instance addr="0x10040001" reg_inst="0"/>
-        <instance addr="0x11040001" reg_inst="1"/>
-    </register>
-    <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_CS"/>
@@ -25,15 +17,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUE_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUE_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_paue_cs_re.xml b/xml/p10/node_cfir_paue_re.xml
similarity index 63%
copy from xml/p10/node_cfir_paue_cs_re.xml
copy to xml/p10/node_cfir_paue_re.xml
index 2de2614..baaabc1 100644
--- a/xml/p10/node_cfir_paue_cs_re.xml
+++ b/xml/p10/node_cfir_paue_re.xml
@@ -1,13 +1,5 @@
 <?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_CS">
-        <instance addr="0x10040000" reg_inst="0"/>
-        <instance addr="0x11040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_CS_MASK">
-        <instance addr="0x10040040" reg_inst="0"/>
-        <instance addr="0x11040040" reg_inst="1"/>
-    </register>
+<attn_node model_ec="P10_20" name="CFIR_PAUE_RE" reg_type="SCOM">
     <register name="CFIR_PAUE_RE">
         <instance addr="0x10040001" reg_inst="0"/>
         <instance addr="0x11040001" reg_inst="1"/>
@@ -16,15 +8,6 @@
         <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -34,6 +17,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_paue_cs_re_p10_10.xml b/xml/p10/node_cfir_paue_re_p10_10.xml
similarity index 65%
rename from xml/p10/node_cfir_paue_cs_re_p10_10.xml
rename to xml/p10/node_cfir_paue_re_p10_10.xml
index 9d74507..443b743 100644
--- a/xml/p10/node_cfir_paue_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_paue_re_p10_10.xml
@@ -1,13 +1,5 @@
 <?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_CS">
-        <instance addr="0x10040000" reg_inst="0"/>
-        <instance addr="0x11040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUE_CS_MASK">
-        <instance addr="0x10040040" reg_inst="0"/>
-        <instance addr="0x11040040" reg_inst="1"/>
-    </register>
+<attn_node model_ec="P10_10" name="CFIR_PAUE_RE" reg_type="SCOM">
     <register name="CFIR_PAUE_RE">
         <instance addr="0x10040001" reg_inst="0"/>
         <instance addr="0x11040001" reg_inst="1"/>
@@ -16,15 +8,6 @@
         <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -34,6 +17,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="PAU_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="0,3" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="0,3" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_pauw_cs_re.xml b/xml/p10/node_cfir_pauw_cs.xml
similarity index 67%
copy from xml/p10/node_cfir_pauw_cs_re.xml
copy to xml/p10/node_cfir_pauw_cs.xml
index 83d6b6f..aefa466 100644
--- a/xml/p10/node_cfir_pauw_cs_re.xml
+++ b/xml/p10/node_cfir_pauw_cs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="CFIR_PAUW_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_20" name="CFIR_PAUW_CS" reg_type="SCOM">
     <register name="CFIR_PAUW_CS">
         <instance addr="0x12040000" reg_inst="0"/>
         <instance addr="0x13040000" reg_inst="1"/>
@@ -8,14 +8,6 @@
         <instance addr="0x12040040" reg_inst="0"/>
         <instance addr="0x13040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RE">
-        <instance addr="0x12040001" reg_inst="0"/>
-        <instance addr="0x13040001" reg_inst="1"/>
-    </register>
-    <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_CS"/>
@@ -25,15 +17,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml b/xml/p10/node_cfir_pauw_cs_p10_10.xml
similarity index 69%
copy from xml/p10/node_cfir_pauw_cs_re_p10_10.xml
copy to xml/p10/node_cfir_pauw_cs_p10_10.xml
index 15b7ce8..83c6bf6 100644
--- a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_pauw_cs_p10_10.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="CFIR_PAUW_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_10" name="CFIR_PAUW_CS" reg_type="SCOM">
     <register name="CFIR_PAUW_CS">
         <instance addr="0x12040000" reg_inst="0"/>
         <instance addr="0x13040000" reg_inst="1"/>
@@ -8,14 +8,6 @@
         <instance addr="0x12040040" reg_inst="0"/>
         <instance addr="0x13040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PAUW_RE">
-        <instance addr="0x12040001" reg_inst="0"/>
-        <instance addr="0x13040001" reg_inst="1"/>
-    </register>
-    <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_CS"/>
@@ -25,15 +17,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PAUW_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PAUW_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_pauw_cs_re.xml b/xml/p10/node_cfir_pauw_re.xml
similarity index 67%
rename from xml/p10/node_cfir_pauw_cs_re.xml
rename to xml/p10/node_cfir_pauw_re.xml
index 83d6b6f..4e6831a 100644
--- a/xml/p10/node_cfir_pauw_cs_re.xml
+++ b/xml/p10/node_cfir_pauw_re.xml
@@ -1,13 +1,5 @@
 <?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_CS">
-        <instance addr="0x12040000" reg_inst="0"/>
-        <instance addr="0x13040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_CS_MASK">
-        <instance addr="0x12040040" reg_inst="0"/>
-        <instance addr="0x13040040" reg_inst="1"/>
-    </register>
+<attn_node model_ec="P10_20" name="CFIR_PAUW_RE" reg_type="SCOM">
     <register name="CFIR_PAUW_RE">
         <instance addr="0x12040001" reg_inst="0"/>
         <instance addr="0x13040001" reg_inst="1"/>
@@ -16,15 +8,6 @@
         <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -34,6 +17,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml b/xml/p10/node_cfir_pauw_re_p10_10.xml
similarity index 69%
rename from xml/p10/node_cfir_pauw_cs_re_p10_10.xml
rename to xml/p10/node_cfir_pauw_re_p10_10.xml
index 15b7ce8..72c4d78 100644
--- a/xml/p10/node_cfir_pauw_cs_re_p10_10.xml
+++ b/xml/p10/node_cfir_pauw_re_p10_10.xml
@@ -1,13 +1,5 @@
 <?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_CS">
-        <instance addr="0x12040000" reg_inst="0"/>
-        <instance addr="0x13040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PAUW_CS_MASK">
-        <instance addr="0x12040040" reg_inst="0"/>
-        <instance addr="0x13040040" reg_inst="1"/>
-    </register>
+<attn_node model_ec="P10_10" name="CFIR_PAUW_RE" reg_type="SCOM">
     <register name="CFIR_PAUW_RE">
         <instance addr="0x12040001" reg_inst="0"/>
         <instance addr="0x13040001" reg_inst="1"/>
@@ -16,15 +8,6 @@
         <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -34,6 +17,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="PAU_LOCAL_FIR" node_inst="2,3" pos="4">Attention from PAU_LOCAL_FIR</bit>
     <bit child_node="PAU_FIR_0" node_inst="4,6" pos="5">Attention from PAU_FIR_0</bit>
     <bit child_node="PAU_FIR_1" node_inst="4,6" pos="6">Attention from PAU_FIR_1</bit>
diff --git a/xml/p10/node_cfir_pci_cs_re.xml b/xml/p10/node_cfir_pci_cs.xml
similarity index 67%
copy from xml/p10/node_cfir_pci_cs_re.xml
copy to xml/p10/node_cfir_pci_cs.xml
index 218f6ea..e004e2f 100644
--- a/xml/p10/node_cfir_pci_cs_re.xml
+++ b/xml/p10/node_cfir_pci_cs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_CS_RE" reg_type="SCOM">
+<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_CS" reg_type="SCOM">
     <register name="CFIR_PCI_CS">
         <instance addr="0x08040000" reg_inst="0"/>
         <instance addr="0x09040000" reg_inst="1"/>
@@ -8,14 +8,6 @@
         <instance addr="0x08040040" reg_inst="0"/>
         <instance addr="0x09040040" reg_inst="1"/>
     </register>
-    <register name="CFIR_PCI_RE">
-        <instance addr="0x08040001" reg_inst="0"/>
-        <instance addr="0x09040001" reg_inst="1"/>
-    </register>
-    <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_CS"/>
@@ -25,15 +17,6 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
-    <rule attn_type="RE" node_inst="0:1">
-        <expr type="and">
-            <expr type="reg" value1="CFIR_PCI_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_PCI_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
     <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
     <bit child_node="PCI_ETU_FIR" node_inst="0,3" pos="5">Attention from PCI_ETU_FIR 0</bit>
     <bit child_node="PCI_ETU_FIR" node_inst="1,4" pos="6">Attention from PCI_ETU_FIR 1</bit>
diff --git a/xml/p10/node_cfir_pci_cs_re.xml b/xml/p10/node_cfir_pci_re.xml
similarity index 68%
rename from xml/p10/node_cfir_pci_cs_re.xml
rename to xml/p10/node_cfir_pci_re.xml
index 218f6ea..f4cb1f5 100644
--- a/xml/p10/node_cfir_pci_cs_re.xml
+++ b/xml/p10/node_cfir_pci_re.xml
@@ -1,13 +1,5 @@
 <?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_CS">
-        <instance addr="0x08040000" reg_inst="0"/>
-        <instance addr="0x09040000" reg_inst="1"/>
-    </register>
-    <register name="CFIR_PCI_CS_MASK">
-        <instance addr="0x08040040" reg_inst="0"/>
-        <instance addr="0x09040040" reg_inst="1"/>
-    </register>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_PCI_RE" reg_type="SCOM">
     <register name="CFIR_PCI_RE">
         <instance addr="0x08040001" reg_inst="0"/>
         <instance addr="0x09040001" reg_inst="1"/>
@@ -16,15 +8,6 @@
         <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
@@ -34,6 +17,7 @@
             <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
         </expr>
     </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
     <bit child_node="PCI_LOCAL_FIR" node_inst="0,1" pos="4">Attention from PCI_LOCAL_FIR</bit>
     <bit child_node="PCI_ETU_FIR" node_inst="0,3" pos="5">Attention from PCI_ETU_FIR 0</bit>
     <bit child_node="PCI_ETU_FIR" node_inst="1,4" pos="6">Attention from PCI_ETU_FIR 1</bit>
diff --git a/xml/p10/node_cfir_tp_cs.xml b/xml/p10/node_cfir_tp_cs.xml
new file mode 100644
index 0000000..edaab89
--- /dev/null
+++ b/xml/p10/node_cfir_tp_cs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_CS" reg_type="SCOM">
+    <register name="CFIR_TP_CS">
+        <instance addr="0x01040000" reg_inst="0"/>
+    </register>
+    <register name="CFIR_TP_CS_MASK">
+        <instance addr="0x01040040" reg_inst="0"/>
+    </register>
+    <rule attn_type="CS" node_inst="0">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_TP_CS"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_TP_CS_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
+    <bit child_node="OCC_FIR" node_inst="0" pos="5">Attention from OCC_FIR</bit>
+    <bit child_node="PBAO_FIR" node_inst="0" pos="6">Attention from PBAO_FIR</bit>
+</attn_node>
diff --git a/xml/p10/node_cfir_tp_cs_re.xml b/xml/p10/node_cfir_tp_cs_re.xml
deleted file mode 100644
index 67c607d..0000000
--- a/xml/p10/node_cfir_tp_cs_re.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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_CS">
-        <instance addr="0x01040000" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_CS_MASK">
-        <instance addr="0x01040040" reg_inst="0"/>
-    </register>
-    <register name="CFIR_TP_RE">
-        <instance addr="0x01040001" reg_inst="0"/>
-    </register>
-    <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_CS"/>
-            <expr type="not">
-                <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_RE"/>
-            <expr type="not">
-                <expr type="reg" value1="CFIR_TP_RE_MASK"/>
-            </expr>
-            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
-        </expr>
-    </rule>
-    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
-    <bit child_node="OCC_FIR" node_inst="0" pos="5">Attention from OCC_FIR</bit>
-    <bit child_node="PBAO_FIR" node_inst="0" pos="6">Attention from PBAO_FIR</bit>
-</attn_node>
diff --git a/xml/p10/node_cfir_tp_re.xml b/xml/p10/node_cfir_tp_re.xml
new file mode 100644
index 0000000..28d1b09
--- /dev/null
+++ b/xml/p10/node_cfir_tp_re.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<attn_node model_ec="P10_10,P10_20" name="CFIR_TP_RE" reg_type="SCOM">
+    <register name="CFIR_TP_RE">
+        <instance addr="0x01040001" reg_inst="0"/>
+    </register>
+    <register name="CFIR_TP_RE_MASK">
+        <instance addr="0x01040041" reg_inst="0"/>
+    </register>
+    <rule attn_type="RE" node_inst="0">
+        <expr type="and">
+            <expr type="reg" value1="CFIR_TP_RE"/>
+            <expr type="not">
+                <expr type="reg" value1="CFIR_TP_RE_MASK"/>
+            </expr>
+            <expr type="int" value1="0x0FFFFFFFFFFFFFFF"/>
+        </expr>
+    </rule>
+    <bit pos="2">recovery with any local checkstop</bit>
+    <bit child_node="TP_LOCAL_FIR" node_inst="0" pos="4">Attention from TP_LOCAL_FIR</bit>
+    <bit child_node="OCC_FIR" node_inst="0" pos="5">Attention from OCC_FIR</bit>
+    <bit child_node="PBAO_FIR" node_inst="0" pos="6">Attention from PBAO_FIR</bit>
+</attn_node>
diff --git a/xml/p10/node_gfir_cs.xml b/xml/p10/node_gfir_cs.xml
index bacd3b5..5d76a48 100644
--- a/xml/p10/node_gfir_cs.xml
+++ b/xml/p10/node_gfir_cs.xml
@@ -6,27 +6,27 @@
     <rule attn_type="CS" node_inst="0">
         <expr type="reg" value1="GFIR_CS"/>
     </rule>
-    <bit child_node="CFIR_TP_CS_RE" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_CS_RE" node_inst="0" pos="2">Attention from N0 chiplet</bit>
+    <bit child_node="CFIR_TP_CS" node_inst="0" pos="1">Attention from TP chiplet</bit>
+    <bit child_node="CFIR_N0_CS" node_inst="0" pos="2">Attention from N0 chiplet</bit>
     <bit child_node="CFIR_N1_CS" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS_RE" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS_RE" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS_RE" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS_RE" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS_RE" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS_RE" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
+    <bit child_node="CFIR_PCI_CS" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
+    <bit child_node="CFIR_PCI_CS" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
+    <bit child_node="CFIR_MC_CS" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
+    <bit child_node="CFIR_MC_CS" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
+    <bit child_node="CFIR_MC_CS" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
+    <bit child_node="CFIR_MC_CS" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
+    <bit child_node="CFIR_PAUE_CS" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
+    <bit child_node="CFIR_PAUE_CS" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
+    <bit child_node="CFIR_PAUW_CS" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
+    <bit child_node="CFIR_PAUW_CS" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
+    <bit child_node="CFIR_IOHS_CS" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
     <bit child_node="CFIR_EQ_CS" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
     <bit child_node="CFIR_EQ_CS" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
     <bit child_node="CFIR_EQ_CS" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
diff --git a/xml/p10/node_gfir_re.xml b/xml/p10/node_gfir_re.xml
index a02e9e8..af76e13 100644
--- a/xml/p10/node_gfir_re.xml
+++ b/xml/p10/node_gfir_re.xml
@@ -6,27 +6,27 @@
     <rule attn_type="RE" node_inst="0">
         <expr type="reg" value1="GFIR_RE"/>
     </rule>
-    <bit child_node="CFIR_TP_CS_RE" node_inst="0" pos="1">Attention from TP chiplet</bit>
-    <bit child_node="CFIR_N0_CS_RE" node_inst="0" pos="2">Attention from N0 chiplet</bit>
+    <bit child_node="CFIR_TP_RE" node_inst="0" pos="1">Attention from TP chiplet</bit>
+    <bit child_node="CFIR_N0_RE" node_inst="0" pos="2">Attention from N0 chiplet</bit>
     <bit child_node="CFIR_N1_RE" node_inst="0" pos="3">Attention from N1 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS_RE" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
-    <bit child_node="CFIR_PCI_CS_RE" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS_RE" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
-    <bit child_node="CFIR_PAUE_CS_RE" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS_RE" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
-    <bit child_node="CFIR_PAUW_CS_RE" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
+    <bit child_node="CFIR_PCI_RE" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
+    <bit child_node="CFIR_PCI_RE" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
+    <bit child_node="CFIR_MC_RE" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
+    <bit child_node="CFIR_MC_RE" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
+    <bit child_node="CFIR_MC_RE" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
+    <bit child_node="CFIR_MC_RE" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
+    <bit child_node="CFIR_PAUE_RE" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
+    <bit child_node="CFIR_PAUE_RE" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
+    <bit child_node="CFIR_PAUW_RE" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
+    <bit child_node="CFIR_PAUW_RE" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
+    <bit child_node="CFIR_IOHS_RE" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
     <bit child_node="CFIR_EQ_RE" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
     <bit child_node="CFIR_EQ_RE" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
     <bit child_node="CFIR_EQ_RE" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>
diff --git a/xml/p10/node_gfir_spa.xml b/xml/p10/node_gfir_spa.xml
index cdfd1a1..ea66b91 100644
--- a/xml/p10/node_gfir_spa.xml
+++ b/xml/p10/node_gfir_spa.xml
@@ -11,22 +11,22 @@
     <bit child_node="CFIR_N1_SPA" node_inst="0" pos="3">Attention from N1 chiplet</bit>
     <bit child_node="CFIR_PCI_SPA_HA" node_inst="0" pos="8">Attention from PCI 0 chiplet</bit>
     <bit child_node="CFIR_PCI_SPA_HA" node_inst="1" pos="9">Attention from PCI 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
-    <bit child_node="CFIR_MC_CS_RE_SPA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
+    <bit child_node="CFIR_MC_SPA" node_inst="0" pos="12">Attention from MC 0 chiplet</bit>
+    <bit child_node="CFIR_MC_SPA" node_inst="1" pos="13">Attention from MC 1 chiplet</bit>
+    <bit child_node="CFIR_MC_SPA" node_inst="2" pos="14">Attention from MC 2 chiplet</bit>
+    <bit child_node="CFIR_MC_SPA" node_inst="3" pos="15">Attention from MC 3 chiplet</bit>
     <bit child_node="CFIR_PAUE_SPA" node_inst="0" pos="16">Attention from PAU 0 chiplet</bit>
     <bit child_node="CFIR_PAUE_SPA" node_inst="1" pos="17">Attention from PAU 1 chiplet</bit>
     <bit child_node="CFIR_PAUW_SPA" node_inst="0" pos="18">Attention from PAU 2 chiplet</bit>
     <bit child_node="CFIR_PAUW_SPA" node_inst="1" pos="19">Attention from PAU 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
-    <bit child_node="CFIR_IOHS_CS_RE_SPA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="0" pos="24">Attention from IOHS 0 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="1" pos="25">Attention from IOHS 1 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="2" pos="26">Attention from IOHS 2 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="3" pos="27">Attention from IOHS 3 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="4" pos="28">Attention from IOHS 4 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="5" pos="29">Attention from IOHS 5 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="6" pos="30">Attention from IOHS 6 chiplet</bit>
+    <bit child_node="CFIR_IOHS_SPA" node_inst="7" pos="31">Attention from IOHS 7 chiplet</bit>
     <bit child_node="CFIR_EQ_SPA" node_inst="0" pos="32">Attention from EQ 0 chiplet</bit>
     <bit child_node="CFIR_EQ_SPA" node_inst="1" pos="33">Attention from EQ 1 chiplet</bit>
     <bit child_node="CFIR_EQ_SPA" node_inst="2" pos="34">Attention from EQ 2 chiplet</bit>