diff --git a/AgentBin/CMS.xml b/AgentBin/CMS.xml
index cfa45eb..94a594e 100644
--- a/AgentBin/CMS.xml
+++ b/AgentBin/CMS.xml
@@ -43,8 +43,8 @@
                 <DataItem category="SAMPLE" id="Axis_01_DistDone" name="Distanza TOTALE percorsa dall'asse X (1)" nativeUnits="METER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_01_InvDDone" name="Num cambi direzione asse X (1)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_01_Value" category="SAMPLE" name="Sonda Temperatura asse 1" units="DEGREE" />-->
-                <DataItem category="CONDITION" id="AX01_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX01_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_01_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_01_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Linear>
             <Linear id="Axis_02" name="Asse Y">
@@ -66,8 +66,8 @@
                 <DataItem category="SAMPLE" id="Axis_02_DistDone" name="Distanza TOTALE percorsa dall'asse Y (2)" nativeUnits="METER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_02_InvDDone" name="Num cambi direzione asse Y (2)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_02_Value" category="SAMPLE" name="Sonda Temperatura asse 2" units="DEGREE" />-->
-                <DataItem category="CONDITION" id="AX02_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX02_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_02_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_02_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Linear>
             <Linear id="Axis_03" name="Asse Z">
@@ -89,8 +89,8 @@
                 <DataItem category="SAMPLE" id="Axis_03_DistDone" name="Distanza TOTALE percorsa dall'asse Z (3)" nativeUnits="METER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_03_InvDDone" name="Num cambi direzione asse X (3)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_03_Value" category="SAMPLE" name="Sonda Temperatura asse 3" units="DEGREE" />-->
-                <DataItem category="CONDITION" id="AX03_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX03_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_03_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_03_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Linear>
             <Linear id="Axis_06" name="Asse U">
@@ -112,8 +112,8 @@
                 <DataItem category="SAMPLE" id="Axis_06_DistDone" name="Distanza TOTALE percorsa dall'asse U (6)" nativeUnits="METER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_06_InvDDone" name="Num cambi direzione asse U (6)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_06_Value" category="SAMPLE" name="Sonda Temperatura asse 6" units="DEGREE" />-->
-                <DataItem category="CONDITION" id="AX06_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX06_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_06_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_06_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Linear>
             <Rotary id="Axis_04" name="Asse B">
@@ -132,8 +132,8 @@
                 <!--<DataItem category="SAMPLE" id="Axis_04_Battery" name="Valore batteria asse J (4)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
                 <DataItem category="SAMPLE" id="Axis_04_DistDone" name="Num Giri asse J (4) nel periodo di rilevazione" nativeUnits="COUNT" type="LENGHT" units="COUNT"/>
                 <DataItem category="SAMPLE" id="Axis_04_InvDDone" name="Num cambi direzione asse J (4)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
-                <DataItem category="CONDITION" id="AX04_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX04_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_04_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_04_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Rotary>
             <Rotary id="Axis_05" name="Asse C (5)">
@@ -152,8 +152,8 @@
                 <!--<DataItem category="SAMPLE" id="Axis_05_Battery" name="Valore batteria asse K (5)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
                 <DataItem category="SAMPLE" id="Axis_05_DistDone" name="Num Giri asse k (5) nel periodo di rilevazione" nativeUnits="COUNT" type="LENGHT" units="COUNT"/>
                 <DataItem category="SAMPLE" id="Axis_05_InvDDone" name="Num cambi direzione asse K (5)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
-                <DataItem category="CONDITION" id="AX05_CNC" type="SYSTEM"/>
-                <DataItem category="CONDITION" id="AX05_PLC" type="LOGIC"/>
+                <DataItem category="CONDITION" id="Axis_05_AlarmCNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Axis_05_AlarmPLC" type="LOGIC"/>
               </DataItems>
             </Rotary>
           </Components>
@@ -167,7 +167,7 @@
             <Path id="Path_01" name="Path 01">
               <DataItems>
                 <DataItem category="EVENT" id="Path_01_Type" type="MESSAGE"/>
-                <DataItem category="EVENT" id="Path_01_ActiveAxes" type="ACTIVE_AXES"/>
+                <!--<DataItem category="EVENT" id="Path_01_ActiveAxes" type="ACTIVE_AXES"/>-->
                 <DataItem category="EVENT" id="Path_01_CodG_Act" type="MESSAGE"/>
                 <DataItem category="EVENT" id="Path_01_SubMode" type="MESSAGE"/>
                 <DataItem category="EVENT" id="Path_01_PartId" type="PART_ID"/>