diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index 4d060b1..8f6de29 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -474,23 +474,23 @@ namespace MTC_Adapter
     /// <summary>
     /// Descrizione asse (nome assegnato)
     /// </summary>
-    public Event mAxDescr;
+    public MTConnect.Message mAxDescr;
     /// <summary>
     /// Processo di appartenenza
     /// </summary>
-    public Event mAxMainProc;
+    public MTConnect.Message mAxMainProc;
     /// <summary>
     /// Bit se sia master (=1) o slave (=0)
     /// </summary>
-    public Event mAxIsMaster;
+    public MTConnect.Message mAxIsMaster;
     /// <summary>
     /// ID del master
     /// </summary>
-    public Event mAxMastId;
+    public MTConnect.Message mAxMastId;
     /// <summary>
     /// Gruppo di appartenenza dell'asse
     /// </summary>
-    public Event mAxGrp;
+    public MTConnect.Message mAxGrp;
     /// <summary>
     /// Event tipo asse: lineare, rotazionale...
     /// </summary>
@@ -565,24 +565,22 @@ namespace MTC_Adapter
       {
         mAxType = new Event(string.Format("{0}_Type", ident));
         mAxType.Value = "LINEAR";
-
       }
       try
       {
-        mAxGrp = new Event(dataRefList[1].Key);
+        mAxGrp = new Message(dataRefList[1].Key);
         mAxGrp.Value = dataRefList[1].Value;
       }
       catch
       {
-        mAxGrp = new Event(string.Format("{0}_Grp", ident));
+        mAxGrp = new Message(string.Format("{0}_Grp", ident));
         mAxGrp.Value = "00";
-
       }
       // valori standard
-      mAxDescr = new Event(string.Format("{0}_Descr", ident));
-      mAxMainProc = new Event(string.Format("{0}_MainProc", ident));
-      mAxIsMaster = new Event(string.Format("{0}_IsMast", ident));
-      mAxMastId = new Event(string.Format("{0}_MastId", ident));
+      mAxDescr = new Message(string.Format("{0}_Descr", ident));
+      mAxMainProc = new Message(string.Format("{0}_MainProc", ident));
+      mAxIsMaster = new Message(string.Format("{0}_IsMast", ident));
+      mAxMastId = new Message(string.Format("{0}_MastId", ident));
       mAxDir = new Event(string.Format("{0}_Dir", ident));
       mAxLoad = new Sample(string.Format("{0}_Load", ident));
       mAxPosAct = new Sample(string.Format("{0}_PosAct", ident));