diff --git a/code/classes/SCDclass_mdsobjcontainer.m b/code/classes/SCDclass_mdsobjcontainer.m
index ee77709cd4c2b1d391ef6b6fb684ce100058a4ce..1f6dc24ef8b879112410118318a45e0f501f2a9f 100644
--- a/code/classes/SCDclass_mdsobjcontainer.m
+++ b/code/classes/SCDclass_mdsobjcontainer.m
@@ -250,9 +250,9 @@ classdef SCDclass_mdsobjcontainer
               prevServer = ''; % init 
               
               % Header for MDS for loader
-              loaderStr = sprintf('\n\n+MDSLoader = {\n Class=SPCMDSLoader \n Shot=%d\n',shot);
+              loaderStr = sprintf('\n\n+MDSParameters = {\n Class=MDSObjLoader \n Shot=%d\n',shot);
               fprintf("%s",loaderStr);
-              
+         
               for ii=1:obj.numparams
                 mymdsparam = obj.mdsparams(iorder(ii));
 
diff --git a/code/classes/SCDclass_mdspar.m b/code/classes/SCDclass_mdspar.m
index 67bbeac17eb997849cb1b81d56ac03559bec59b6..5235f766fad71dea5975462110a93247c776b2a7 100644
--- a/code/classes/SCDclass_mdspar.m
+++ b/code/classes/SCDclass_mdspar.m
@@ -19,6 +19,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
         modelname           % name of the Simulink model using the parameter
         getcommand          % full command for getting the value (callable by matlab eval)
         classname           % class name for logging
+        marteclassname      % class name for generating MARTe2 cfg file
         cparser             % constructor parameters parser
         
         assignvar           % actualizedata specific
@@ -179,15 +180,18 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
         
         function entrystring = genMARTe2entrycommon(obj, shot)
             obj=obj.actualizetdiexpr(shot);
-            entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.classname,obj.tdiexprused);
+            entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.marteclassname,obj.tdiexprused);
         end
 
         function str = genMARTe2MDSsourcestr(obj)
-          str = sprintf(' +MDSSource = {\n  Class=SPCMDSSource\n  Server=%s\n  Tree=%s',obj.mdsserver,obj.mdstree);
+          %str = sprintf(' +MDSSource = {\n  Class=SPCMDSSource\n  Server=%s\n  Tree=%s',obj.mdsserver,obj.mdstree);
+          str = sprintf(' +Connection_%s = {\n  Class=MDSObjConnection\n  Tree=%s',obj.mdsserver,obj.mdstree);
+        
         end
     end
     
     
+      
     % Abstract method actually implemented by child classes
     methods (Abstract)
         
diff --git a/code/classes/SCDclass_mdspar3Dmatrix.m b/code/classes/SCDclass_mdspar3Dmatrix.m
index 693520eb1b96ed2f1feb327896c030f29d362abd..bc8b2ced141f8dd07eac26897f1cee8c700926c0 100644
--- a/code/classes/SCDclass_mdspar3Dmatrix.m
+++ b/code/classes/SCDclass_mdspar3Dmatrix.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdspar3Dmatrix < SCDclass_mdspar
             obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
             % Constructor parser customization results here
             obj.classname=mfilename;
+            obj.marteclassname='MDSPar3DMatrix';
         end
         
         function actualizedata(obj, shot)                           
diff --git a/code/classes/SCDclass_mdsparfixdimvector.m b/code/classes/SCDclass_mdsparfixdimvector.m
index a4739a6a301b60eba04cf2bf92eb1bed4be608c8..aa3518a202ad54068412b7671448b9bf7ac0c8ce 100644
--- a/code/classes/SCDclass_mdsparfixdimvector.m
+++ b/code/classes/SCDclass_mdsparfixdimvector.m
@@ -16,6 +16,7 @@ classdef SCDclass_mdsparfixdimvector < SCDclass_mdspar
             % Constructor parser customization results here
             obj.dimension=destdimension;
             obj.classname=mfilename;
+            obj.marteclassname='MDSParFixDimVector';
         end
         
         function actualizedata(obj, shot)            
diff --git a/code/classes/SCDclass_mdsparfixdimvectoridx.m b/code/classes/SCDclass_mdsparfixdimvectoridx.m
index 47479dbe1e4656d43d48ee7c1bf40b67e43faea6..f6dd7bb8a0f832bbf4be1ab07327ff746afe8aba 100644
--- a/code/classes/SCDclass_mdsparfixdimvectoridx.m
+++ b/code/classes/SCDclass_mdsparfixdimvectoridx.m
@@ -21,6 +21,7 @@ classdef SCDclass_mdsparfixdimvectoridx < SCDclass_mdspar
             obj.idxstart=srcinterval(1);
             obj.idxstop=srcinterval(end);
             obj.classname=mfilename;
+            obj.marteclassname='MDSParFixDimVectorIdx';
         end
 
         function actualizedata(obj, shot)                         
diff --git a/code/classes/SCDclass_mdsparfixdimvectorint.m b/code/classes/SCDclass_mdsparfixdimvectorint.m
index 3085ef1f355f09b5ca05f406f4acdcadc25c31ce..197d4d4989501fc670aefb375381692e4b644e9c 100644
--- a/code/classes/SCDclass_mdsparfixdimvectorint.m
+++ b/code/classes/SCDclass_mdsparfixdimvectorint.m
@@ -17,6 +17,7 @@ classdef SCDclass_mdsparfixdimvectorint < SCDclass_mdspar
             % Constructor parser customization results here
             obj.classname=mfilename;
             obj.dimension=destdimension;
+            obj.marteclassname='MDSParFixDimVectorInt';
         end
         
         function actualizedata(obj, shot)                        
diff --git a/code/classes/SCDclass_mdsparmatrix.m b/code/classes/SCDclass_mdsparmatrix.m
index 686ab6ed806c81eea323b60012594fa011230c4b..63b9c4093c591725670b42e0d94e9a1c37742948 100644
--- a/code/classes/SCDclass_mdsparmatrix.m
+++ b/code/classes/SCDclass_mdsparmatrix.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparmatrix < SCDclass_mdspar
             obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
             % Constructor parser customization results here
             obj.classname=mfilename;
+            obj.marteclassname='MDSParMatrix';
         end
         
         function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparscalar.m b/code/classes/SCDclass_mdsparscalar.m
index 360d0dac721a7e62cf0c35f3131e3732c1e17336..bc5993187f88a03eab3db80515d2a6326301a341 100644
--- a/code/classes/SCDclass_mdsparscalar.m
+++ b/code/classes/SCDclass_mdsparscalar.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparscalar < SCDclass_mdspar
             obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
             % Constructor parser customization results here
             obj.classname=mfilename;
+            obj.marteclassname='MDSParScalar';
         end
 
         function actualizedata(obj, shot) 
diff --git a/code/classes/SCDclass_mdsparscalarint.m b/code/classes/SCDclass_mdsparscalarint.m
index 67c58167ff57528eadecc23d89523538c52c6392..af6ac786fbe9114d4cd1b5d3331d973a53e83a57 100644
--- a/code/classes/SCDclass_mdsparscalarint.m
+++ b/code/classes/SCDclass_mdsparscalarint.m
@@ -11,6 +11,7 @@ classdef SCDclass_mdsparscalarint < SCDclass_mdspar
             obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
             % Constructor parser customization results here
             obj.classname=mfilename;
+            obj.marteclassname='MDSParScalarInt';
         end
         
         function actualizedata(obj, shot) 
diff --git a/code/classes/SCDclass_mdsparvector.m b/code/classes/SCDclass_mdsparvector.m
index e99b276e7d4abe68897efe57a7f1e2ad030defdd..8eed9399ced00af685d351f07e4ec44d8556d264 100644
--- a/code/classes/SCDclass_mdsparvector.m
+++ b/code/classes/SCDclass_mdsparvector.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparvector < SCDclass_mdspar
             obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
             % Constructor parser customization results here
             obj.classname=mfilename;
+            obj.marteclassname='MDSParVector';
         end
         
         function actualizedata(obj, shot)