diff --git a/algos/template/marte2cfg/algo_template_create_marte2_cfg.m b/algos/template/marte2cfg/algo_template_create_marte2_cfg.m
index 7240f932c04f15cdb26355cb7903dd8337b4a989..3ce395fb1c281da9d4f498b44d4de1251886f0ad 100644
--- a/algos/template/marte2cfg/algo_template_create_marte2_cfg.m
+++ b/algos/template/marte2cfg/algo_template_create_marte2_cfg.m
@@ -11,7 +11,7 @@
 % source MDSplus shotnumber
 mdssrcshot=-1;
 % destination MDSplus shotnumber (-1 stands for increment current by 1)
-mdsdstshot=2;
+mdsdstshot=1;
 % verbosity level
 verbosity=2;
 
diff --git a/algos/template/marte2cfg/data_states.cfgsrc b/algos/template/marte2cfg/data_states.cfgsrc
index aa749ae8471223304771d88dbca0f9455e6cf9e5..9e567dadc0ada0a62a60666636bf6d7aa39aa960 100644
--- a/algos/template/marte2cfg/data_states.cfgsrc
+++ b/algos/template/marte2cfg/data_states.cfgsrc
@@ -40,10 +40,10 @@
                 }
             */
             
-                Thread1_Cycletime       = { NodeName = "ST.CH01" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
-                GAMSimulink1_ReadTime   = { NodeName = "ST.CH02" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
-                GAMSimulink1_ExecTime   = { NodeName = "ST.CH03" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
-                GAMSimulink1_WriteTime  = { NodeName = "ST.CH04" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
+                Thread1_Cycletime       = { NodeName = "template.system.CH01" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
+                GAMSimulink1_ReadTime   = { NodeName = "template.system.CH02" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
+                GAMSimulink1_ExecTime   = { NodeName = "template.system.CH03" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
+                GAMSimulink1_WriteTime  = { NodeName = "template.system.CH04" Period = 1 AutomaticSegmentation = 0 MakeSegmentAfterNWrites = 2000 SamplePhase = 0 }
                 
                 >OUTPUTBUSMDSWRITER<
             }
diff --git a/algos/template/marte2cfg/rtapp-simulinkwrapper.cfgsrc b/algos/template/marte2cfg/rtapp-simulinkwrapper.cfgsrc
index c9b4a80bbef973f8c622510f40902248622a66b1..7239fec5196670934de12e9e582491f8130345b5 100644
--- a/algos/template/marte2cfg/rtapp-simulinkwrapper.cfgsrc
+++ b/algos/template/marte2cfg/rtapp-simulinkwrapper.cfgsrc
@@ -10,7 +10,7 @@
             NonVirtualBusMode = "Structured" 
                                             
 			InputSignals = {		
-				realtime	= { DataSource = DDB1 Type = float32 NumberOfElements = 1 NumberOfDimensions=0 Alias = wavegen_0 }
+				realtime	= { DataSource = DDB1 Type = float32 NumberOfElements = 1 NumberOfDimensions=0 Alias = zero }
                 >INPUTBUSSTRUCT<
  			}
  			OutputSignals = {