diff --git a/xml/p10/node_eq_local_fir.xml b/xml/p10/node_eq_local_fir.xml
index 2f92278..9752f6f 100644
--- a/xml/p10/node_eq_local_fir.xml
+++ b/xml/p10/node_eq_local_fir.xml
@@ -21,12 +21,12 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM1 - internal error</bit>
     <bit pos="7">THERM1 - pcb error</bit>
     <bit pos="8">THERMTRIP1 - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP1 - Fatal temperature indicator</bit>
     <bit pos="10">VOLTTRIP1 - Voltage sense error</bit>
-    <bit pos="11">THERM2 - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="11">THERM2 - internal error</bit>
     <bit pos="12">THERM2 - pcb error</bit>
     <bit pos="13">THERMTRIP2 - Critical temperature indicator</bit>
     <bit pos="14">THERMTRIP2 - Fatal temperature indicator</bit>
diff --git a/xml/p10/node_iohs_local_fir.xml b/xml/p10/node_iohs_local_fir.xml
index a12b142..62f8000 100644
--- a/xml/p10/node_iohs_local_fir.xml
+++ b/xml/p10/node_iohs_local_fir.xml
@@ -21,7 +21,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - interal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -36,7 +36,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>
diff --git a/xml/p10/node_mc_local_fir.xml b/xml/p10/node_mc_local_fir.xml
index 858c19c..af2c27d 100644
--- a/xml/p10/node_mc_local_fir.xml
+++ b/xml/p10/node_mc_local_fir.xml
@@ -17,7 +17,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - internal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -32,7 +32,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>
diff --git a/xml/p10/node_n0_local_fir.xml b/xml/p10/node_n0_local_fir.xml
index 76e0d08..0c23279 100644
--- a/xml/p10/node_n0_local_fir.xml
+++ b/xml/p10/node_n0_local_fir.xml
@@ -14,7 +14,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - internal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -29,7 +29,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>
diff --git a/xml/p10/node_n1_local_fir.xml b/xml/p10/node_n1_local_fir.xml
index 93c14cb..b17e9b3 100644
--- a/xml/p10/node_n1_local_fir.xml
+++ b/xml/p10/node_n1_local_fir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_20" name="N1_LOCAL_FIR" reg_type="SCOM">
+<attn_node model_ec="P10_10,P10_20" name="N1_LOCAL_FIR" reg_type="SCOM">
     <local_fir config="W2" name="N1_LOCAL_FIR">
         <instance addr="0x03040100" reg_inst="0"/>
         <action attn_type="CS" config="000"/>
@@ -14,7 +14,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - internal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -29,7 +29,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>
@@ -64,11 +64,11 @@
     <bit pos="53">unused</bit>
     <bit pos="54">unused</bit>
     <bit pos="55">unused</bit>
-    <bit pos="56">PowerBus chip quiesce failed - triggered by firmware</bit>
-    <bit pos="57">PowerBus system quiesce failed - triggered by firmware</bit>
-    <bit pos="58">Deadman timer expired during master core wakeup by SBE - triggered by firmware</bit>
-    <bit pos="59">Switch from cache contained into system mode failed - triggered by firmware</bit>
-    <bit pos="60">Hypervisor / Hostboot / OPAL initiated Terminate Immediate (TI) - triggered by firmware</bit>
+    <bit pos="56">Firmware signaled power bus quiesce failed</bit>
+    <bit pos="57">Firmware signaled power bus system quiesce failed</bit>
+    <bit pos="58">Firmware signaled deadman timer tigger occurred</bit>
+    <bit pos="59">Fimware signaled power bus chip quiesce failed</bit>
+    <bit pos="60">Hypervisor / Hostboot / OPAL initiated Terminate Immediate</bit>
     <bit pos="61">reserved for software use</bit>
     <bit pos="62">reserved for software use</bit>
     <bit pos="63">ext_local_xstop</bit>
diff --git a/xml/p10/node_n1_local_fir_p10_10.xml b/xml/p10/node_n1_local_fir_p10_10.xml
deleted file mode 100644
index 4a25a61..0000000
--- a/xml/p10/node_n1_local_fir_p10_10.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="P10_10" name="N1_LOCAL_FIR" reg_type="SCOM">
-    <local_fir config="W2" name="N1_LOCAL_FIR">
-        <instance addr="0x03040100" reg_inst="0"/>
-        <action attn_type="CS" config="000"/>
-        <action attn_type="RE" config="010"/>
-        <action attn_type="SPA" config="100"/>
-        <action attn_type="UCS" config="110"/>
-        <action attn_type="HA" config="001"/>
-    </local_fir>
-    <bit pos="0">CFIR - Parity or PCB access error</bit>
-    <bit pos="1">CPLT_CTRL - PCB access error</bit>
-    <bit pos="2">CC - PCB access error</bit>
-    <bit pos="3">CC - Clock Control Error</bit>
-    <bit pos="4">PSC - PSCOM access error</bit>
-    <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
-    <bit pos="7">THERM - pcb error</bit>
-    <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
-    <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
-    <bit pos="10">VOLTTRIP - Voltage sense error</bit>
-    <bit pos="11">DBG - scom parity fail</bit>
-    <bit pos="12">reserved</bit>
-    <bit pos="13">reserved</bit>
-    <bit pos="14">reserved</bit>
-    <bit pos="15">reserved</bit>
-    <bit pos="16">reserved</bit>
-    <bit pos="17">reserved</bit>
-    <bit pos="18">reserved</bit>
-    <bit pos="19">reserved</bit>
-    <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
-    <bit pos="22">unused</bit>
-    <bit pos="23">unused</bit>
-    <bit pos="24">unused</bit>
-    <bit pos="25">unused</bit>
-    <bit pos="26">unused</bit>
-    <bit pos="27">unused</bit>
-    <bit pos="28">unused</bit>
-    <bit pos="29">unused</bit>
-    <bit pos="30">unused</bit>
-    <bit pos="31">unused</bit>
-    <bit pos="32">unused</bit>
-    <bit pos="33">unused</bit>
-    <bit pos="34">unused</bit>
-    <bit pos="35">unused</bit>
-    <bit pos="36">unused</bit>
-    <bit pos="37">unused</bit>
-    <bit pos="38">unused</bit>
-    <bit pos="39">unused</bit>
-    <bit pos="40">unused</bit>
-    <bit pos="41">unused</bit>
-    <bit pos="42">unused</bit>
-    <bit pos="43">unused</bit>
-    <bit pos="44">unused</bit>
-    <bit pos="45">unused</bit>
-    <bit pos="46">unused</bit>
-    <bit pos="47">unused</bit>
-    <bit pos="48">unused</bit>
-    <bit pos="49">unused</bit>
-    <bit pos="50">unused</bit>
-    <bit pos="51">unused</bit>
-    <bit pos="52">unused</bit>
-    <bit pos="53">unused</bit>
-    <bit pos="54">unused</bit>
-    <bit pos="55">unused</bit>
-    <bit pos="56">PowerBus chip quiesce failed - triggered by firmware</bit>
-    <bit pos="57">PowerBus system quiesce failed - triggered by firmware</bit>
-    <bit pos="58">Deadman timer expired during master core wakeup by SBE - triggered by firmware</bit>
-    <bit pos="59">reserved for software use</bit>
-    <bit pos="60">reserved for software use</bit>
-    <bit pos="61">reserved for software use</bit>
-    <bit pos="62">reserved for software use</bit>
-    <bit pos="63">ext_local_xstop</bit>
-</attn_node>
diff --git a/xml/p10/node_pau_local_fir.xml b/xml/p10/node_pau_local_fir.xml
index 2ab83c4..2b28afd 100644
--- a/xml/p10/node_pau_local_fir.xml
+++ b/xml/p10/node_pau_local_fir.xml
@@ -17,7 +17,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - internal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -32,7 +32,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>
diff --git a/xml/p10/node_pci_local_fir.xml b/xml/p10/node_pci_local_fir.xml
index 8c4afdf..9ad29de 100644
--- a/xml/p10/node_pci_local_fir.xml
+++ b/xml/p10/node_pci_local_fir.xml
@@ -15,7 +15,7 @@
     <bit pos="3">CC - Clock Control Error</bit>
     <bit pos="4">PSC - PSCOM access error</bit>
     <bit pos="5">PSC - internal or ring interface error</bit>
-    <bit pos="6">THERM - pwr_comp_err, skitter_comp_err, scan_init_version_reg_parity_err_out , count_state_err_out</bit>
+    <bit pos="6">THERM - internal error</bit>
     <bit pos="7">THERM - pcb error</bit>
     <bit pos="8">THERMTRIP - Critical temperature indicator</bit>
     <bit pos="9">THERMTRIP - Fatal temperature indicator</bit>
@@ -30,7 +30,7 @@
     <bit pos="18">reserved</bit>
     <bit pos="19">reserved</bit>
     <bit pos="20">Trace00 - scom parity err</bit>
-    <bit pos="21">Trace01 - scom parity err - Unused in Axon,PCI</bit>
+    <bit pos="21">Trace01 - scom parity err</bit>
     <bit pos="22">unused</bit>
     <bit pos="23">unused</bit>
     <bit pos="24">unused</bit>