diff --git a/algos/template/algo_template.slx b/algos/template/algo_template.slx
index 894f71bf35a571dbc347bd5711c3ca73277b9bc4..0d9487d857313fedf3d1ec534465b65454d469df 100644
Binary files a/algos/template/algo_template.slx and b/algos/template/algo_template.slx differ
diff --git a/algos/template/algo_template_inBus_def.m b/algos/template/algo_template_inBus_def.m
index f0e2a2fbdc6450ccfabf5e5e43ec8543f79adfc6..9cf6ec1c29c05725798261f335cdc3aa5f60574f 100644
--- a/algos/template/algo_template_inBus_def.m
+++ b/algos/template/algo_template_inBus_def.m
@@ -1,7 +1,7 @@
 % Bus object: SCDalgo_template_inBus 
 clear elems;
 elems(1) = Simulink.BusElement;
-elems(1).Name = 'simple_signal';
+elems(1).Name = 'signal1';
 elems(1).Dimensions = 1;
 elems(1).DimensionsMode = 'Fixed';
 elems(1).DataType = 'single';
@@ -12,6 +12,18 @@ elems(1).Max = [];
 elems(1).DocUnits = '';
 elems(1).Description = '';
 
+elems(2) = Simulink.BusElement;
+elems(2).Name = 'signal2';
+elems(2).Dimensions = 1;
+elems(2).DimensionsMode = 'Fixed';
+elems(2).DataType = 'single';
+elems(2).SampleTime = -1;
+elems(2).Complexity = 'real';
+elems(2).Min = [];
+elems(2).Max = [];
+elems(2).DocUnits = '';
+elems(2).Description = '';
+
 algo_template_inBus = Simulink.Bus;
 algo_template_inBus.HeaderFile = '';
 algo_template_inBus.Description = '';
diff --git a/algos/template/algo_template_outBus_def.m b/algos/template/algo_template_outBus_def.m
index 9d52f054c0c7362275aca0625a11804eb3ac5e73..3acb8cd5d98cbcc0aa9c2deebd1c1f91dc8df786 100644
--- a/algos/template/algo_template_outBus_def.m
+++ b/algos/template/algo_template_outBus_def.m
@@ -4,7 +4,8 @@ elems(1) = Simulink.BusElement;
 elems(1).Name = 'signal1';
 elems(1).Dimensions = 1;
 elems(1).DimensionsMode = 'Fixed';
-elems(1).DataType = 'Bus:SCDBus_single_11_Vector';
+%elems(1).DataType = 'Bus:SCDBus_single_11_Vector';
+elems(1).DataType = 'single';
 elems(1).SampleTime = -1;
 elems(1).Complexity = 'real';
 elems(1).Min = [];
@@ -16,7 +17,8 @@ elems(2) = Simulink.BusElement;
 elems(2).Name = 'signal2';
 elems(2).Dimensions = 1;
 elems(2).DimensionsMode = 'Fixed';
-elems(2).DataType = 'Bus:SCDBus_int32_Scalar';
+%elems(2).DataType = 'Bus:SCDBus_int32_Scalar';
+elems(2).DataType = 'single';
 elems(2).SampleTime = -1;
 elems(2).Complexity = 'real';
 elems(2).Min = [];
diff --git a/algos/template/algoobj_template.m b/algos/template/algoobj_template.m
index 53d217392255665eef121bf2388810f8f4405f9a..c065ff9c78ca15e3157976541c9ab5e4f548baee 100644
--- a/algos/template/algoobj_template.m
+++ b/algos/template/algoobj_template.m
@@ -27,14 +27,14 @@ obj=obj.addparameter(SCDclass_mdsparnumeric('kb1','enable'          ,'srcsrv','s
 
 
 %% Wavegens
-obj=obj.addwavegenbasetruct('algo_template_inbus');
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch001','wg1'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch002','wg2'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+obj=obj.addwavegenbasetruct('algo_template_inbus1');
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch001','signal1'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch002','signal2'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
 
 %% 2nd wavegen base structure/signals
 obj=obj.addwavegenbasetruct('algo_template_inbus2');
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch003','wg1'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch004','wg2'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch003','signal1'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch004','signal2'        ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
 
 
 %% Buses