diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte
index 7d61734..c4014f5 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/disabled.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte
index 94e756a..c099b32 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/error.marte
@@ -5,8 +5,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte
index 50bf852..96b47dc 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitPermit = {
     Class = StateMachineEvent
-    NextState = "WAITPERMIT"
-    NextStateError = "ERROR"
+    NextState = WAITPERMIT
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte
index 9a361f8..d1efd1c 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_prep.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitPermit = {
     Class = StateMachineEvent
-    NextState = "WAITPERMIT"
-    NextStateError = "ERROR"
+    NextState = WAITPERMIT
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte
index 4b167b5..5c9c9a3 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitPermit = {
     Class = StateMachineEvent
-    NextState = "WAITPERMIT"
-    NextStateError = "ERROR"
+    NextState = WAITPERMIT
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte
index af96a50..a5fb92c 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waithvon_sdn_prep.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitPermit = {
     Class = StateMachineEvent
-    NextState = "WAITPERMIT"
-    NextStateError = "ERROR"
+    NextState = WAITPERMIT
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte
index 0c6e9ae..f0deb4c 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitpermit.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitReady = {
     Class = StateMachineEvent
-    NextState = "WAITREADY"
-    NextStateError = "ERROR"
+    NextState = WAITREADY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitHVON = {
     Class = StateMachineEvent
-    NextState = "WAITHVON"
-    NextStateError = "ERROR"
+    NextState = WAITHVON
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoWaitHVON_SDN = {
     Class = StateMachineEvent
-    NextState = "WAITHVON_SDN"
-    NextStateError = "ERROR"
+    NextState = WAITHVON_SDN
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -145,8 +145,8 @@
   }
   +GoWaitHVON_PREP = {
     Class = StateMachineEvent
-    NextState = "WAITHVON_PREP"
-    NextStateError = "ERROR"
+    NextState = WAITHVON_PREP
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -192,8 +192,8 @@
   }
   +GoWaitHVON_SDN_PREP = {
     Class = StateMachineEvent
-    NextState = "WAITHVON_SDN_PREP"
-    NextStateError = "ERROR"
+    NextState = WAITHVON_SDN_PREP
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -239,8 +239,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte
index a6788a7..d066dd7 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitready.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitStandby = {
     Class = StateMachineEvent
-    NextState = "WAITSTANDBY"
-    NextStateError = "ERROR"
+    NextState = WAITSTANDBY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoWaitPermit = {
     Class = StateMachineEvent
-    NextState = "WAITPERMIT"
-    NextStateError = "ERROR"
+    NextState = WAITPERMIT
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte
index b85c8d5..fc376d0 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/waitstandby.marte
@@ -4,8 +4,8 @@
   Class = ReferenceContainer
   +GoWaitReady = {
     Class = StateMachineEvent
-    NextState = "WAITREADY"
-    NextStateError = "ERROR"
+    NextState = WAITREADY
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -51,8 +51,8 @@
   }
   +GoDisabled = {
     Class = StateMachineEvent
-    NextState = "DISABLED"
-    NextStateError = "ERROR"
+    NextState = DISABLED
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
@@ -98,8 +98,8 @@
   }
   +GoError = {
     Class = StateMachineEvent
-    NextState = "ERROR"
-    NextStateError = "ERROR"
+    NextState = ERROR
+    NextStateError = ERROR
     +StopCurrentStateExecutionMsg = {
       Class = Message
       Destination = RTApp
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/rt_statemachines.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/rt_statemachines.marte
index 699eda8..b441577 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/rt_statemachines.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread3/rt_statemachines.marte
@@ -62,6 +62,7 @@
       DataSource = EPICSCAInput
       Type = uint32
     }
+
   }
   OutputSignals = {
     RTSMValue = {