diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
index 22ee7aa6e021abc2763143040badf174a39feeda..d5565ec7868426ad4cd0d9cb46407ed1ad4ba118 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
@@ -1,6 +1,5 @@
 package ui;
 
-import myutil.TraceManager;
 import org.junit.*;
 import tmltranslator.compareTMLTest.CompareTML;
 import ui.tmlcompd.TMLComponentTaskDiagramPanel;
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
index ad4a9b72a5e0b3cdbb8875b5d809166de6a99e74..9075629d18335151545c57caaf8f731332854802 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec1.tml
@@ -116,19 +116,19 @@ TASK Application__PrimitiveComp5
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -150,19 +150,19 @@ TASK Application__PrimitiveComp5_
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_0 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
index f57ccb9e7f49c227f9ebf457615ca741895459e2..cd2e3a44410e9bbc0aa5a7367c1b13d3837bf1a1 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec2.tml
@@ -134,19 +134,19 @@ TASK Application__PrimitiveComp5
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -168,19 +168,19 @@ TASK Application__PrimitiveComp5_
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_0 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -202,19 +202,19 @@ TASK Application__PrimitiveComp5_0
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_1 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
index e887ed115b23c4680eed707b233982d8917ad538..81c1c456981e7a5a197bb83726df53b0caf2d933 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec3.tml
@@ -135,19 +135,19 @@ TASK Application__PrimitiveComp5
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -169,19 +169,19 @@ TASK Application__PrimitiveComp5_
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_0 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -203,19 +203,19 @@ TASK Application__PrimitiveComp5_0
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_1 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -237,19 +237,19 @@ TASK Application__PrimitiveComp5_1
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_2 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
diff --git a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
index 7072799baaa95a1d887c9ed76540774c7a651f7f..5c57d1f1a8e6e28d94dbbbfb8bd1d3b60e0aeedb 100644
--- a/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
+++ b/ttool/src/test/resources/tmltranslator/expected/expected_spec4.tml
@@ -136,19 +136,19 @@ TASK Application__PrimitiveComp5
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -170,19 +170,19 @@ TASK Application__PrimitiveComp5_
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_0 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -204,19 +204,19 @@ TASK Application__PrimitiveComp5_0
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_1 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ
@@ -238,19 +238,19 @@ TASK Application__PrimitiveComp5_1
     //Local variables
     int attr1
     bool attr2
-    int loop__0 = 0
+    int loop_0 = 0
     
     //Behavior
     WRITE Application__channel3_2 1
     EXECI 10
     EXECI 10 20
     DELAY 10 ms isActiveDelay false
-    EXECC 100 encryption1 ADV 100 100 0 0
-    EXECC 100 encryption1 ADV 100 100 0 0
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
+    EXECC 100 encryption1 ADV 100 100 0 0 - -
     DELAY 10 20 ms isActiveDelay false
     RANDOM 0 attr1 0 10
     FOR( ; ; )
-        FOR(loop__0 = 0; loop__0<10; loop__0 = loop__0 + 1)
+        FOR(loop_0 = 0; loop_0<10; loop_0 = loop_0 + 1)
             FOR(attr1=0; attr1<5; attr1 = attr1+1)
                 attr1=10
                 RANDOMSEQ