Clean up chiplet FIR register names for consistency

Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I17712f9d8e202f83338a5f87af60a8f12f0e3791
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>