diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
index 0126d7b..14b725f 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -42,55 +42,55 @@
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentPos" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
         <Variable SymbolicName="distance" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetPos" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
       </Component>
       <Component Name="AxisY">
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentPos" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
         <Variable SymbolicName="distance" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetPos" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
       </Component>
       <Component Name="AxisZ">
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentPos" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
         <Variable SymbolicName="distance" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetPos" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
       </Component>
       <Component Name="AxisB">
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentAng" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
         <Variable SymbolicName="revolutions" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetAng" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
       </Component>
       <Component Name="AxisC">
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentAng" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
         <Variable SymbolicName="revolutions" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetAng" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
       </Component>
       <Component Name="AxisV">
         <Variable SymbolicName="feedRate" BrowseName="feedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="override" BrowseName="override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="currentAng" BrowseName="currentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
+        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
         <Variable SymbolicName="revolutions" BrowseName="distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="targetAng" BrowseName="targetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
       </Component>
     </Component>
 
@@ -100,7 +100,7 @@
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="speed" BrowseName="speed" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="spindleRevs" BrowseName="spindleRevs" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="spindeActiveDuration" BrowseName="spindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
+        <Variable SymbolicName="SpindeActiveDuration" BrowseName="SpindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolChanges" BrowseName="toolChanges" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolId" BrowseName="toolId" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
       </Component>
@@ -108,7 +108,7 @@
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="speed" BrowseName="speed" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="spindleRevs" BrowseName="spindleRevs" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="spindeActiveDuration" BrowseName="spindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
+        <Variable SymbolicName="SpindeActiveDuration" BrowseName="SpindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolChanges" BrowseName="toolChanges" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolId" BrowseName="toolId" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
       </Component>
@@ -116,7 +116,7 @@
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="speed" BrowseName="speed" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="spindleRevs" BrowseName="spindleRevs" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="spindeActiveDuration" BrowseName="spindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
+        <Variable SymbolicName="SpindeActiveDuration" BrowseName="SpindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolChanges" BrowseName="toolChanges" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolId" BrowseName="toolId" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
       </Component>
@@ -124,7 +124,7 @@
         <Variable SymbolicName="load" BrowseName="load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
         <Variable SymbolicName="speed" BrowseName="speed" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="spindleRevs" BrowseName="spindleRevs" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="spindeActiveDuration" BrowseName="spindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
+        <Variable SymbolicName="SpindeActiveDuration" BrowseName="SpindeActiveDuration" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolChanges" BrowseName="toolChanges" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
         <Variable SymbolicName="toolId" BrowseName="toolId" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
       </Component>
diff --git a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
index 2d4eef9..de38d42 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
+++ b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
@@ -36,12 +36,12 @@ A|I|Axis_04_FeedOver|Axes:AxisB:override
 A|I|Axis_05_FeedOver|Axes:AxisC:override
 A|I|Axis_06_FeedOver|Axes:AxisV:override
 
-A|I|Axis_01_InvDDone|Axes:AxisX:inversions
-A|I|Axis_02_InvDDone|Axes:AxisY:inversions
-A|I|Axis_03_InvDDone|Axes:AxisZ:inversions
-A|I|Axis_04_InvDDone|Axes:AxisB:inversions
-A|I|Axis_05_InvDDone|Axes:AxisC:inversions
-A|I|Axis_06_InvDDone|Axes:AxisV:inversions
+A|I|Axis_01_InvDDone|Axes:AxisX:Inversions
+A|I|Axis_02_InvDDone|Axes:AxisY:Inversions
+A|I|Axis_03_InvDDone|Axes:AxisZ:Inversions
+A|I|Axis_04_InvDDone|Axes:AxisB:Inversions
+A|I|Axis_05_InvDDone|Axes:AxisC:Inversions
+A|I|Axis_06_InvDDone|Axes:AxisV:Inversions
 
 A|I|AV_Axis_01_Load|Axes:AxisX:load
 A|I|AV_Axis_02_Load|Axes:AxisY:load
@@ -50,12 +50,12 @@ A|I|AV_Axis_04_Load|Axes:AxisB:load
 A|I|AV_Axis_05_Load|Axes:AxisC:load
 A|I|AV_Axis_06_Load|Axes:AxisV:load
 
-A|I|Axis_01_PosAct|Axes:AxisX:currentPos
-A|I|Axis_02_PosAct|Axes:AxisY:currentPos
-A|I|Axis_03_PosAct|Axes:AxisZ:currentPos
-A|I|Axis_04_PosAct|Axes:AxisB:currentPos
-A|I|Axis_05_PosAct|Axes:AxisC:currentPos
-A|I|Axis_06_PosAct|Axes:AxisV:currentPos
+A|I|Axis_01_PosAct|Axes:AxisX:CurrentPos
+A|I|Axis_02_PosAct|Axes:AxisY:CurrentPos
+A|I|Axis_03_PosAct|Axes:AxisZ:CurrentPos
+A|I|Axis_04_PosAct|Axes:AxisB:CurrentAng
+A|I|Axis_05_PosAct|Axes:AxisC:CurrentAng
+A|I|Axis_06_PosAct|Axes:AxisV:CurrentAng
 
 A|I|Path_01_FeedOverr|Axes:override
 A|I|Path_01_FeedRate|Axes:feedRate