Added naming service interface with a default implementation and specializations for C and C++ code generators.

Refactoring of code generators.

plugins/org.yakindu.sct.generator.c/library/FeatureTypeLibrary.xmi

@@ -5,4 +5,21 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen"
     xsi:schemaLocation="http://www.yakindu.org/sct/statechart/SGen ../../org.yakindu.sct.model.sgen/model/emf/sgen.ecore"
-    name="C Generator"/>
+    name="C Generator">
+  <types name="IdentifierSettings"
+      optional="true">
+    <parameters
+        name="moduleName"
+        optional="true"/>
+    <parameters
+        name="functionPrefix"
+        optional="true"/>
+    <parameters
+        name="maxIdentifierLength"
+        optional="true"
+        parameterType="INTEGER"/>
+    <parameters
+        name="separator"
+        optional="true"/>
+  </types>
+</sgen:FeatureTypeLibrary>

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java

@@ -16,6 +16,7 @@ import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
 import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
 
@@ -42,12 +43,14 @@ public class CCodeGenerator extends GenericJavaBasedGenerator {
 	}
 
 	@Override
-	protected Module createModule(GeneratorEntry entry) {
+	protected Module createModule(final GeneratorEntry entry) {
 		Module module = super.createModule(entry);
 		return Modules.override(module).with(new Module() {
 			public void configure(Binder binder) {
 				binder.bind(ICodegenTypeSystemAccess.class)
 						.to(CTypeSystemAccess.class);
+				binder.bind(INamingService.class).to(CNamingService.class);
+				binder.bind(GeneratorEntry.class).toInstance(entry);
 			}
 		});
 	}

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CKeywords.java

@@ -10,8 +10,15 @@
  */
 package org.yakindu.sct.generator.c;
 
-public interface CKeywords {
-	public static final String[] KEYWORDS = { "alignas", "alignof", "and",
+/**
+ * Helper class which contains an array with c language keywords
+ * 
+ * @author Markus Mühlbrandt
+ * 
+ */
+public final class CKeywords {
+
+	public static final String[] C_KEYWORDS = { "alignas", "alignof", "and",
 			"and_eq", "asm", "auto", "bitand", "bitor", "bool", "break",
 			"case", "catch", "char", "char16_t", "char32_t", "class", "compl",
 			"const", "constexpr", "const_cast", "continue", "decltype",

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CNamingService.xtend

@@ -0,0 +1,91 @@
+package org.yakindu.sct.generator.c
+
+import com.google.inject.Inject
+import java.util.Arrays
+import java.util.Map
+import org.yakindu.base.base.NamedElement
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.extensions.SExecExtensions
+import org.yakindu.sct.model.sexec.naming.DefaultNamingService
+import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+
+import static org.yakindu.sct.generator.c.CKeywords.*
+
+class CNamingService extends DefaultNamingService {
+	
+	@Inject
+	extension GenmodelEntries
+	
+	@Inject
+	extension SExecExtensions
+	
+	var protected GeneratorEntry entry
+	
+	@Inject
+	new (GeneratorEntry entry) {
+		this.entry = entry
+	}
+	
+	override Map<NamedElement, String> getShortNameMap(ExecutionFlow flow) {
+		if (entry.identifierLength != null) {
+			maxLength = entry.identifierLength
+		}
+		
+		if (entry.separator != null) {
+			separator = entry.separator.charAt(0)
+		}
+		
+		return super.getShortNameMap(flow)
+	}
+	
+	override protected prefix(Step it, char separator) {
+		var prefix = flow.name.toFirstLower
+		if (entry.functionPrefix != null) {
+			prefix = entry.functionPrefix
+		}
+		switch (it) {
+			case isCheckFunction: prefix + separator + "check"
+			case isEntryAction: prefix + separator + "enact"
+			case isExitAction: prefix + separator + "exact"
+			case isEffect: prefix + separator + "effect"
+			case isEnterSequence: prefix + separator + "enseq"
+			case isDeepEnterSequence: prefix + separator + "dhenseq"
+			case isShallowEnterSequence: prefix + separator + "shenseq"
+			case isExitSequence: prefix + separator + "exseq"
+			case isReactSequence: prefix + separator + "react"
+			default: ""
+		}
+	}
+	
+	override protected prefix(ExecutionState it, char separator) {
+		if (entry.functionPrefix != null) {
+			entry.functionPrefix
+		} else {
+			super.prefix(it, separator).toFirstUpper
+		}
+	}
+	
+	override protected prefix(TimeEventSpec it, State state, char separator) {
+		if (entry.functionPrefix != null) {
+			entry.functionPrefix
+		} else {
+			super.prefix(it, state, separator).toFirstLower
+		}
+	}
+	
+	override asEscapedIdentifier(String it) {
+		var s = it
+		if (s.isKeyword) {
+			s = s + separator +'ID'
+		}
+		return s.asIdentifier
+	}
+	
+	override boolean isKeyword(String name) {
+		return !Arrays::asList(C_KEYWORDS).findFirst[it.equalsIgnoreCase(name)].nullOrEmpty
+	}
+}

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/ExpressionCode.xtend

@@ -42,6 +42,7 @@ import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
 import org.yakindu.sct.model.stext.types.ISTextTypeInferrer
 import org.yakindu.sct.model.stext.types.ISTextTypeSystem
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class ExpressionCode {
 	 
@@ -49,6 +50,7 @@ class ExpressionCode {
 	@Inject extension Navigation
 	@Inject extension ISTextTypeSystem
 	@Inject extension ISTextTypeInferrer
+	@Inject extension INamingService
 	
 	/* Refering to declared elements */
 	
@@ -160,7 +162,7 @@ class ExpressionCode {
 		'''«value.definition.event.valueAccess»'''
 	
 	def dispatch CharSequence code (ActiveStateReferenceExpression it)
-		'''«flow.nameOfIsActiveFunction»(«scHandle», «value.fullyQualifiedName»)'''
+		'''«flow.nameOfIsActiveFunction»(«scHandle», «value.shortName»)'''
 	
 	def dispatch CharSequence code (ParenthesizedExpression it)
 		'''(«expression.code»)'''

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/FlowCode.xtend

@@ -25,17 +25,17 @@ import org.yakindu.sct.model.sexec.Sequence
 import org.yakindu.sct.model.sexec.StateSwitch
 import org.yakindu.sct.model.sexec.Step
 import org.yakindu.sct.model.sexec.UnscheduleTimeEvent
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class FlowCode {
 	
 	@Inject extension Naming
 	@Inject extension Navigation
 	@Inject extension ExpressionCode
-	
-	
+	@Inject extension INamingService
  
 	def stepComment(Step it) '''
-		«IF comment != null && ! comment.empty»
+		«IF !comment.nullOrEmpty»
 			/* «comment» */
 		«ENDIF»
 	'''
@@ -66,7 +66,7 @@ class FlowCode {
 			switch(«scHandle»->stateConfVector[ «stateConfigurationIdx» ]) {
 		«ENDIF»
 			«FOR caseid : cases»
-				case «caseid.state.name.asIdentifier» : {
+				case «caseid.state.shortName» : {
 					«caseid.step.code»
 					break;
 				}
@@ -77,19 +77,19 @@ class FlowCode {
 
 	def dispatch CharSequence code(ScheduleTimeEvent it) '''
 		«stepComment»
-		«flow.type.toFirstLower»_setTimer( (sc_eventid) &(«scHandle»->timeEvents.«timeEvent.name.asIdentifier»_raised) , «timeValue.code», «IF timeEvent.periodic»bool_true«ELSE»bool_false«ENDIF»);
+		«flow.type.toFirstLower»_setTimer( (sc_eventid) &(«scHandle»->timeEvents.«timeEvent.shortName»_raised) , «timeValue.code», «IF timeEvent.periodic»bool_true«ELSE»bool_false«ENDIF»);
 	'''
 
 	def dispatch CharSequence code(UnscheduleTimeEvent it) '''
 		«stepComment»
-		«flow.type.toFirstLower»_unsetTimer( (sc_eventid) &(«scHandle»->timeEvents.«timeEvent.name.asIdentifier»_raised) );		
+		«flow.type.toFirstLower»_unsetTimer( (sc_eventid) &(«scHandle»->timeEvents.«timeEvent.shortName»_raised) );		
 	'''
 
 	def dispatch CharSequence code(Execution it) 
 		'''«statement.code»;'''
 	
 	def dispatch CharSequence code(Call it) 
-		'''«step.functionName»(«scHandle»);'''
+		'''«step.shortName»(«scHandle»);'''
 
 	def dispatch CharSequence code(Sequence it) '''
 		«IF !steps.nullOrEmpty»«stepComment»«ENDIF»
@@ -102,7 +102,7 @@ class FlowCode {
 		'''«IF condition != null»«condition.code»«ELSE»bool_true«ENDIF»'''
 	
 	def dispatch CharSequence code(CheckRef it) 
-		'''«IF check != null»«check.functionName»(«scHandle»)«ELSE»bool_true«ENDIF»'''
+		'''«IF check != null»«check.shortName»(«scHandle»)«ELSE»bool_true«ENDIF»'''
 
 	def dispatch CharSequence code(If it) '''
 		«stepComment»
@@ -115,7 +115,7 @@ class FlowCode {
 	'''
 	
 	def dispatch CharSequence code(EnterState it) '''
-		«scHandle»->stateConfVector[«state.stateVector.offset»] = «state.name.asEscapedIdentifier»;
+		«scHandle»->stateConfVector[«state.stateVector.offset»] = «state.shortName»;
 		«scHandle»->stateConfVectorPosition = «state.stateVector.offset»;
 	'''
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/GenmodelEntries.xtend

@@ -12,6 +12,7 @@ package org.yakindu.sct.generator.c
 import org.yakindu.sct.generator.core.features.ICoreFeatureConstants
 import org.yakindu.sct.model.sgen.FeatureParameterValue
 import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.generator.c.features.CFeatureConstants
 
 class GenmodelEntries {
 	
@@ -29,4 +30,43 @@ class GenmodelEntries {
 		}
 		return null
 	}
+	
+	def private getIdentifierSettingsFeature(GeneratorEntry it) {
+		getFeatureConfiguration(CFeatureConstants::FEATURE_IDENTIFIER_SETTINGS)
+	}
+	
+	def private FeatureParameterValue getMaxIdentifierLengthParameter(GeneratorEntry it) {
+		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_MAX_IDENTIFIER_LENGTH)
+	}
+	
+	def getIdentifierLength(GeneratorEntry it) {
+		if (maxIdentifierLengthParameter != null) {
+			return Integer.valueOf(maxIdentifierLengthParameter.stringValue)
+		}
+		return null
+	}
+	
+	def private FeatureParameterValue getSeparatorParameter(GeneratorEntry it) {
+		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_SEPARATOR)
+	}
+	
+	def getSeparator(GeneratorEntry it) {
+		return separatorParameter?.stringValue
+	}
+	
+	def private FeatureParameterValue getFunctionPrefixParameter(GeneratorEntry it) {
+		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_FUNCTION_PREFIX)
+	}
+	
+	def getFunctionPrefix(GeneratorEntry it) {
+		return functionPrefixParameter?.stringValue
+	}
+	
+	def private FeatureParameterValue getModuleNameParameter(GeneratorEntry it) {
+		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_MODULE_NAME)
+	}
+	
+	def getModuleName(GeneratorEntry it) {
+		return moduleNameParameter?.stringValue
+	}
 }

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/Naming.xtend

@@ -11,37 +11,30 @@
 package org.yakindu.sct.generator.c
 
 import com.google.inject.Inject
-import java.util.Arrays
-import java.util.List
 import org.eclipse.emf.ecore.EObject
+import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.ExecutionNode
-import org.yakindu.sct.model.sexec.ExecutionScope
-import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sexec.naming.INamingService
 import org.yakindu.sct.model.sgraph.Event
-import org.yakindu.sct.model.stext.naming.StextNameProvider
+import org.yakindu.sct.model.sgraph.Scope
 import org.yakindu.sct.model.sgraph.State
-import java.util.regex.Pattern
-import java.util.regex.Matcher
-import org.yakindu.sct.generator.c.CKeywords
-import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.OperationDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
-
-class Naming implements CKeywords{
+import org.yakindu.sct.model.stext.naming.StextNameProvider
+import org.yakindu.sct.model.stext.stext.EventDefinition
+import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.stext.stext.InternalScope
+import org.yakindu.sct.model.stext.stext.OperationDefinition
+import org.yakindu.sct.model.stext.stext.VariableDefinition
 
-	@Inject
-	extension Navigation
+class Naming {
+	
+	@Inject extension Navigation
 	
 	@Inject extension ICodegenTypeSystemAccess
 	
-	@Inject
-	private StextNameProvider provider
+	@Inject private StextNameProvider provider
+	
+	@Inject extension INamingService
 	
 	def getFullyQualifiedName(State state) {
 		provider.getFullyQualifiedName(state).toString.asEscapedIdentifier
@@ -159,90 +152,26 @@ class Naming implements CKeywords{
 	
 	def asSetter(VariableDefinition it) {
 		scope.functionPrefix + '_set_' + name.asIdentifier.toFirstLower	
-	}
-
+	}
+	
 	def asFunction(OperationDefinition it) {
 		scope.functionPrefix + '_' + name.asIdentifier.toFirstLower	
 	}
-		
-	
-	def functionName(Step it) {
-		switch (it) {
-			case isCheckFunction : asCheckFunction
-			case isEntryAction: asEntryActionFunction
-			case isExitAction : asExitActionFunction
-			case isEffect : asEffectFunction
-			case isEnterSequence : asEnterSequenceFunction
-			case isDeepEnterSequence : asDeepEnterSequenceFunction
-			case isShallowEnterSequence : asShallowEnterSequenceFunction
-			case isExitSequence : asExitSequenceFunction
-			case isReactSequence : asReactFunction
-			default : ""
-		} 
-	}
-	
-	
-	def asCheckFunction(Step it) { functionName(newArrayList('check', elementName, reaction.name)) }
-	 
-	def asEffectFunction(Step it) { functionName(newArrayList('effect', elementName, reaction.name)) }
-	 
-	def asEntryActionFunction(Step it) { functionName('entryaction') }
-	
-	def asExitActionFunction(Step it) { functionName('exitaction') }
-	 
-	def asEnterSequenceFunction(Step it) { functionName('entersequence') }
-		 
-	def asDeepEnterSequenceFunction(Step it) { functionName('deepentersequence') }
-	 
-	def asShallowEnterSequenceFunction(Step it) { functionName('shallowentersequence') }
-	 
-	def asExitSequenceFunction(Step it) { functionName('exitsequence') }
-	 
-	def asReactFunction(Step it) { functionName('react') }
-	
-	
-	def functionName(Step it, String fName) { functionName(newArrayList(fName, elementName)) }
-	
-	def functionName(EObject it, List<String> segments) {
-		flow.functionPrefix + segments.fold("", [s, seg | s + if (seg.empty) "" else "_" + seg]).asIdentifier
-	}
-
-	def dispatch String elementName(EObject it) { eContainer.elementName }
 	
-	def dispatch String elementName(ExecutionScope it) { (if (superScope != null && ! superScope.elementName.empty) superScope.elementName + "_" else "") + name }	
+	def raised(CharSequence it) { it + '_raised' }
 	
-	def dispatch String elementName(ExecutionState it) { (if (superScope != null && ! superScope.elementName.empty) superScope.elementName + "_" else "") + simpleName }	
+	def value(CharSequence it)  { it + '_value' }
 	
-	def dispatch String elementName(ExecutionNode it) { name }	
+	def h(String it) { it + ".h" }
 	
-	def dispatch String elementName(ExecutionFlow it) { "" }
-	
-	def raised(CharSequence it) { it + '_raised' }	
-	def value(CharSequence it)  { it + '_value' }	
-	
-	
-	
-	def h(String it) { it + ".h" }
 	def c(String it) { it + ".c" }
 	
 	def define(String it) { it.replaceAll('\\.', '_').toUpperCase }
-	
-	
-	def asIdentifier(String it) {
-		replaceAll('[^a-z&&[^A-Z&&[^0-9]]]', '_')
-	}
-	
-	def asEscapedIdentifier(String it) {
-		var s = it
-		if (s.isCKeyword) {
-			s = s + '_ID'
-		}
-		return s.asIdentifier
-	} 
-	
+		
 	def dispatch scopeDescription(Scope it) '''scope'''
 	
-	def dispatch scopeDescription(InterfaceScope it) '''«IF name==null || name.empty»default interface scope«ELSE»interface scope '«name»'«ENDIF»'''
+	def dispatch scopeDescription(InterfaceScope it) '''«IF name==null || name.empty»default interface scope«ELSE»interface scope '«name»'«ENDIF»'''
+	
 	def dispatch scopeDescription(InternalScope it) '''internal scope'''
 	
 	def scHandleDecl(EObject it) { flow.type + '* ' + scHandle }
@@ -254,34 +183,18 @@ class Naming implements CKeywords{
 		else ''
 	}
 	
-	/** todo externalize */
 	def dispatch access (VariableDefinition it) 
 		'''«scHandle»->«scope.instance».«name.asEscapedIdentifier»'''
 
-	/** todo externalize */
 	def dispatch access (OperationDefinition it) 
 		'''«asFunction»'''
-		
-	/** todo externalize */
+	
 	def dispatch access (Event it) 
 		'''«scHandle»->«scope.instance».«name.asIdentifier.raised»'''
 				
 	def dispatch access (EObject it) 
-		'''#error cannot access elements of type «getClass().name» '''
-		
+		'''#error cannot access elements of type «getClass().name»'''
 	
 	def valueAccess(Event it) 
 		'''«scHandle»->«scope.instance».«name.asIdentifier.value»'''
-		
-	def boolean isCKeyword(String name) {
-		var String lowName = name.toLowerCase();
-		for (String keyword : Arrays::asList(KEYWORDS)) {
-			var Pattern pattern = Pattern::compile("^" + keyword + "$");
-			var Matcher matcher = pattern.matcher(lowName);
-			if (matcher.find()) {
-				return true;
-			}
-		}
-		return false;
-	}
 }

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/Statemachine.xtend

@@ -12,18 +12,19 @@ package org.yakindu.sct.generator.c
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
+import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sexec.TimeEvent
+import org.yakindu.sct.model.sexec.naming.INamingService
+import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sgraph.Declaration
 import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.sct.model.sgraph.Statechart
 import org.yakindu.sct.model.stext.stext.Direction
-import org.yakindu.sct.model.stext.stext.StatechartScope
+import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
-import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.model.stext.stext.StatechartScope
+import org.yakindu.sct.model.stext.stext.VariableDefinition
 
 class Statemachine {
 	
@@ -31,8 +32,10 @@ class Statemachine {
 	@Inject extension Navigation
 	@Inject extension ICodegenTypeSystemAccess
 	@Inject extension GenmodelEntries
+	@Inject extension INamingService
 	
 	def generateStatemachineH(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
+		 flow.initializeNamingService
 		 fsa.generateFile(flow.module.h, flow.statemachineHContent(entry) )
 	}
 	
@@ -93,7 +96,7 @@ class Statemachine {
 		//! enumeration of all states 
 		typedef enum {
 			«FOR state : states »
-			«state.name.asEscapedIdentifier» ,
+			«state.shortName»,
 			«ENDFOR»
 			«last_state»
 		} «statesEnumType»;

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/StatemachineC.xtend

@@ -19,6 +19,7 @@ import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.Step
 import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class StatemachineC {
 	
@@ -27,11 +28,13 @@ class StatemachineC {
 	@Inject extension FlowCode
 	@Inject extension GenmodelEntries
 	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension INamingService
 	
 	def generateStatemachineC(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
+		flow.initializeNamingService
 		var content = flow.statemachineCContent(entry)
 		var target = flow.module.c
-		 fsa.generateFile(target , content)
+		fsa.generateFile(target , content)
 	}
 	
 	def statemachineCContent(ExecutionFlow it, GeneratorEntry entry) '''
@@ -150,8 +153,8 @@ class StatemachineC {
 				switch («scHandle»->stateConfVector[handle->stateConfVectorPosition]) {
 				«FOR state : states»
 					«IF state.reactSequence!=null»
-					case «state.name.asEscapedIdentifier» : {
-						«state.reactSequence.functionName»(«scHandle»);
+					case «state.shortName» : {
+						«state.reactSequence.shortName»(«scHandle»);
 						break;
 					}
 					«ENDIF»
@@ -180,10 +183,10 @@ class StatemachineC {
 		sc_boolean «nameOfIsActiveFunction»(«scHandleDecl», «statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
-				case «s.name.asIdentifier» : 
-					return (sc_boolean) («IF s.leaf»«scHandle»->stateConfVector[«s.stateVector.offset»] == «s.name.asIdentifier»
-					«ELSE»«scHandle»->stateConfVector[«s.stateVector.offset»] >= «s.name.asIdentifier»
-						&& «scHandle»->stateConfVector[«s.stateVector.offset»] <= «s.subStates.last.name.asIdentifier»«ENDIF»);
+				case «s.shortName» : 
+					return (sc_boolean) («IF s.leaf»«scHandle»->stateConfVector[«s.stateVector.offset»] == «s.shortName»
+					«ELSE»«scHandle»->stateConfVector[«s.stateVector.offset»] >= «s.shortName»
+						&& «scHandle»->stateConfVector[«s.stateVector.offset»] <= «s.subStates.last.shortName»«ENDIF»);
 				«ENDFOR»
 				default: return bool_false;
 			}
@@ -257,11 +260,11 @@ class StatemachineC {
 	'''
 	
 	def dispatch functionPrototype(Check it) '''
-		static sc_boolean «asCheckFunction»(«scHandleDecl»);
+		static sc_boolean «shortName»(«scHandleDecl»);
 	'''
 	
 	def dispatch functionPrototype(Step it) '''
-		static void «functionName»(«scHandleDecl»);
+		static void «shortName»(«scHandleDecl»);
 	'''	
 	
 	
@@ -292,7 +295,7 @@ class StatemachineC {
 	
 	def dispatch functionImplementation(Check it) '''
 		«stepComment»
-		static sc_boolean «asCheckFunction»(«scHandleDecl») {
+		static sc_boolean «shortName»(«scHandleDecl») {
 			return «code»;
 		}
 		
@@ -300,7 +303,7 @@ class StatemachineC {
 	
 	def dispatch functionImplementation(Step it) '''
 		«stepComment»
-		static void «functionName»(«scHandleDecl») {
+		static void «shortName»(«scHandleDecl») {
 			«code»
 		}
 		

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/StatemachineRequired.xtend

@@ -19,6 +19,7 @@ import org.yakindu.sct.model.stext.stext.StatechartScope
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class StatemachineRequired {
 
@@ -26,6 +27,7 @@ class StatemachineRequired {
 	@Inject extension Navigation
 	@Inject extension ICodegenTypeSystemAccess
 	@Inject extension GenmodelEntries
+	@Inject extension INamingService
 	
 	def generateStatemachineClientH(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
 		 fsa.generateFile(flow.module.client.h, flow.statemachineClientHContent(entry) )

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/features/CDefaultFeatureValueProvider.java

@@ -13,18 +13,26 @@ package org.yakindu.sct.generator.c.features;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.yakindu.sct.generator.core.features.AbstractDefaultFeatureValueProvider;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
 import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
+import org.yakindu.sct.model.sgen.GeneratorEntry;
+import org.yakindu.sct.model.sgraph.Statechart;
 
 /**
+ * Feature value provider for c code generator.
  * 
  * @author andreas muelder - Initial contribution and API
+ * @author Markus Mühlbrandt - Added additional features
  * 
  */
 public class CDefaultFeatureValueProvider extends
 		AbstractDefaultFeatureValueProvider {
 
+	private static final String INVALID_IDENTIFIER_REGEX = "[^a-z&&[^A-Z&&[^0-9]]]";
+	private static final String VALID_IDENTIFIER_REGEX = "[_a-zA-Z][_a-zA-Z0-9]*";
+
 	public boolean isProviderFor(FeatureTypeLibrary library) {
 		return CFeatureConstants.LIBRARY_NAME.equals(library.getName());
 	}
@@ -32,11 +40,48 @@ public class CDefaultFeatureValueProvider extends
 	@Override
 	protected void setDefaultValue(FeatureParameterValue parameterValue,
 			EObject contextElement) {
-		// TODO: Implement my default properties
+
+		GeneratorEntry entry = (GeneratorEntry) contextElement;
+		Statechart statechart = (Statechart) entry.getElementRef();
+
+		if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_MODULE_NAME)) {
+			parameterValue.setValue(asIdentifier(statechart.getName(), "_"));
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_FUNCTION_PREFIX)) {
+			parameterValue.setValue(StringExtensions.toFirstLower(asIdentifier(
+					statechart.getName(), "_")));
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_MAX_IDENTIFIER_LENGTH)) {
+			parameterValue.setValue("31");
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_SEPARATOR)) {
+			parameterValue.setValue("_");
+		}
 	}
 
-	public IStatus validateParameterValue(FeatureParameterValue value) {
+	/**
+	 * Executes some validations on the given {@link FeatureParameterValue}
+	 */
+	public IStatus validateParameterValue(FeatureParameterValue parameter) {
+		String parameterName = parameter.getParameter().getName();
+		if (CFeatureConstants.PARAMETER_MODULE_NAME.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid module name");
+			}
+		} else if (CFeatureConstants.PARAMETER_FUNCTION_PREFIX.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid function prefix name");
+			}
+		} else if (CFeatureConstants.PARAMETER_SEPARATOR.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid separator");
+			}
+		}
 		return Status.OK_STATUS;
 	}
 
+	private String asIdentifier(String it, String separator) {
+		return it.replaceAll(INVALID_IDENTIFIER_REGEX, separator);
+	}
 }

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/features/CFeatureConstants.java

@@ -13,8 +13,19 @@ package org.yakindu.sct.generator.c.features;
 /**
  * 
  * @author holger willebrandt - Initial contribution and API
+ * @author Markus Mühlbrandt - Additional feature identifiers
  * 
  */
 public interface CFeatureConstants {
 	public static final String LIBRARY_NAME = "C Generator";
+	
+	public static final String FEATURE_IDENTIFIER_SETTINGS = "IdentifierSettings";
+	
+	public static final String PARAMETER_MODULE_NAME = "moduleName";
+	
+	public static final String PARAMETER_FUNCTION_PREFIX = "functionPrefix";
+	
+	public static final String PARAMETER_MAX_IDENTIFIER_LENGTH = "maxIdentifierLength";
+	
+	public static final String PARAMETER_SEPARATOR = "separator";
 }

plugins/org.yakindu.sct.generator.cpp/library/FeatureTypeLibrary.xmi

@@ -5,4 +5,21 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:sgen="http://www.yakindu.org/sct/statechart/SGen"
     xsi:schemaLocation="http://www.yakindu.org/sct/statechart/SGen ../../org.yakindu.sct.model.sgen/model/emf/sgen.ecore"
-    name="CPP Generator"/>
+    name="CPP Generator">
+  <types name="IdentifierSettings"
+      optional="true">
+    <parameters
+        name="moduleName"
+        optional="true"/>
+    <parameters
+        name="functionPrefix"
+        optional="true"/>
+    <parameters
+        name="maxIdentiefierLength"
+        optional="true"
+        parameterType="INTEGER"/>
+    <parameters
+        name="separator"
+        optional="true"/>
+  </types>
+</sgen:FeatureTypeLibrary>

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java

@@ -16,6 +16,7 @@ import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
 import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
 
@@ -42,12 +43,14 @@ public class CppCodeGenerator extends GenericJavaBasedGenerator {
 	}
 
 	@Override
-	protected Module createModule(GeneratorEntry entry) {
+	protected Module createModule(final GeneratorEntry entry) {
 		Module module = super.createModule(entry);
 		return Modules.override(module).with(new Module() {
 			public void configure(Binder binder) {
 				binder.bind(ICodegenTypeSystemAccess.class).to(
 						CTypeSystemAccess.class);
+				binder.bind(INamingService.class).to(CppNamingService.class);
+				binder.bind(GeneratorEntry.class).toInstance(entry);
 			}
 		});
 	}

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppKeywords.java

@@ -0,0 +1,8 @@
+package org.yakindu.sct.generator.cpp;
+
+
+public final class CppKeywords {
+	
+	public static final String[] CPP_KEYWORDS = { "clearInEvents", "clearOutEvents", "enter",
+		"exit", "runCycle"};
+}

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppNamingService.xtend

@@ -0,0 +1,70 @@
+package org.yakindu.sct.generator.cpp
+
+import com.google.inject.Inject
+import java.util.Arrays
+import org.yakindu.sct.generator.c.CNamingService
+import org.yakindu.sct.generator.c.GenmodelEntries
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.extensions.SExecExtensions
+import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+
+import static org.yakindu.sct.generator.cpp.CppKeywords.*
+
+class CppNamingService extends CNamingService {
+
+	@Inject extension GenmodelEntries
+
+	@Inject extension SExecExtensions
+
+	@Inject
+	new(GeneratorEntry entry) {
+		super(entry)
+	}
+
+	override protected prefix(Step it, char separator) {
+		var prefix = ""
+		if (entry.functionPrefix != null) {
+			prefix = entry.functionPrefix + separator
+		}
+		switch (it) {
+			case isCheckFunction: prefix + "check"
+			case isEntryAction: prefix + "enact"
+			case isExitAction: prefix + "exact"
+			case isEffect: prefix + "effect"
+			case isEnterSequence: prefix + "enseq"
+			case isDeepEnterSequence: prefix + "dhenseq"
+			case isShallowEnterSequence: prefix + "shenseq"
+			case isExitSequence: prefix + "exseq"
+			case isReactSequence: prefix + "react"
+			default: ""
+		}
+	}
+
+	override protected prefix(ExecutionState it, char separator) {
+		if (entry.functionPrefix != null) {
+			entry.functionPrefix
+		} else {
+			""
+		}
+	}
+
+	override protected prefix(State it, char separator) {
+		""
+	}
+
+	override protected prefix(TimeEventSpec it, State state, char separator) {
+		if (entry.functionPrefix != null) {
+			entry.functionPrefix
+		} else {
+			""
+		}
+	}
+
+	override isKeyword(String name) {
+		var isKeyword = !Arrays::asList(CPP_KEYWORDS).findFirst[it.equalsIgnoreCase(name)].nullOrEmpty
+		return isKeyword || super.isKeyword(name)
+	}
+}

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/ExpressionCode.xtend

@@ -32,6 +32,7 @@ import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
 import org.yakindu.sct.model.stext.types.ISTextTypeInferrer
 import org.yakindu.sct.model.stext.types.ISTextTypeSystem
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class ExpressionCode {
 	
@@ -39,6 +40,7 @@ class ExpressionCode {
 	@Inject extension Navigation
 	@Inject extension ISTextTypeSystem
 	@Inject extension ISTextTypeInferrer
+	@Inject extension INamingService
 	
 	/* Refering to declared elements */
 	
@@ -155,7 +157,7 @@ class ExpressionCode {
 		'''«value.definition.event.valueAccess»'''
 	
 	def dispatch CharSequence code (ActiveStateReferenceExpression it)
-		'''«flow.nameOfIsActiveFunction»(«value.fullyQualifiedName»)'''
+		'''«flow.nameOfIsActiveFunction»(«value.shortName»)'''
 	
 	def dispatch CharSequence code (ParenthesizedExpression it)
 		'''(«expression.code»)'''

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/FlowCode.xtend

@@ -13,12 +13,14 @@ import org.yakindu.sct.model.sexec.EnterState
 import org.yakindu.sct.model.sexec.ExitState
 import org.yakindu.sct.model.sexec.Execution
 import org.yakindu.sct.model.sexec.Sequence
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class FlowCode extends org.yakindu.sct.generator.c.FlowCode {
 	
 	@Inject extension Naming
 	@Inject extension Navigation
 	@Inject extension ExpressionCode
+	@Inject extension INamingService
 	
 	override dispatch CharSequence code(SaveHistory it) '''
 		«stepComment»
@@ -42,7 +44,7 @@ class FlowCode extends org.yakindu.sct.generator.c.FlowCode {
 			switch(stateConfVector[ «stateConfigurationIdx» ]) {
 		«ENDIF»
 			«FOR caseid : cases»
-				case «caseid.state.name.asIdentifier» : {
+				case «caseid.state.shortName» : {
 					«caseid.step.code»
 					break;
 				}
@@ -65,31 +67,23 @@ class FlowCode extends org.yakindu.sct.generator.c.FlowCode {
 		'''«statement.code»;'''
 	
 	override dispatch CharSequence code(Call it) 
-		'''«step.functionName»();'''
+		'''«step.shortName»();'''
 	
 	override dispatch CharSequence code(Sequence it) '''
-		«IF comment != null»
-			{
-				«stepComment»
-				«FOR s : steps»
-					«s.code»
-				«ENDFOR»
-			}
-		«ELSE»
-			«FOR s : steps»
-				«s.code»
-			«ENDFOR»
-		«ENDIF»
+		«IF !steps.nullOrEmpty»«stepComment»«ENDIF»
+		«FOR s : steps»
+			«s.code»
+		«ENDFOR»
 	'''	
 	
 	override dispatch CharSequence code(Check it) 
 		'''«IF condition != null»«condition.code»«ELSE»true«ENDIF»'''
 	
 	override dispatch CharSequence code(CheckRef it) 
-		'''«IF check != null»«check.functionName»()«ELSE»true«ENDIF»'''
+		'''«IF check != null»«check.shortName»()«ELSE»true«ENDIF»'''
 	
 	override dispatch CharSequence code(EnterState it) '''
-		stateConfVector[«state.stateVector.offset»] = «state.name.asEscapedIdentifier»;
+		stateConfVector[«state.stateVector.offset»] = «state.shortName»;
 		stateConfVectorPosition = «state.stateVector.offset»;
 	'''
 

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/Naming.xtend

@@ -9,23 +9,23 @@
  */
 package org.yakindu.sct.generator.cpp
 
-import java.util.List
-import org.eclipse.emf.ecore.EObject
+import com.google.inject.Inject
+import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.TimeEvent
+import org.yakindu.sct.model.sgraph.Event
 import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.stext.stext.InternalScope
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.sgraph.Event
-import com.google.inject.Inject
-import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class Naming extends org.yakindu.sct.generator.c.Naming {
 	
-	@Inject extension Navigation;
-	@Inject extension ICodegenTypeSystemAccess;
+	@Inject extension Navigation
+	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension INamingService
 	
 	def cpp(String it) { it + ".cpp" }
 	
@@ -91,11 +91,11 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 	}
 	
 	override asRaiser(EventDefinition it) {
-		'raise_' + name.asIdentifier.toFirstLower	
+		'raise_' + name.asIdentifier.toFirstLower
 	}
 	
 	override asRaised(EventDefinition it) {
-		'isRaised_' + name.asIdentifier.toFirstLower	
+		'isRaised_' + name.asIdentifier.toFirstLower
 	}
 	
 	override asGetter(EventDefinition it) {
@@ -110,10 +110,6 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 		'set_' + name.asIdentifier.toFirstLower	
 	}
 	
-	override functionName(EObject it, List<String> segments) {
-		segments.fold("", [s, seg | s + if (seg.empty) "" else "_" + seg]).asIdentifier
-	}
-	
 	override nameOfRaiseTimeEventFunction(ExecutionFlow it) {
 		"raiseTimeEvent"
 	}
@@ -122,7 +118,6 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 		"isActive"
 	}
 	
-
 	override dispatch access (OperationDefinition it) 
 		'''«asFunction»'''
 		

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineHeader.xtend

@@ -30,6 +30,7 @@ import java.util.List
 import org.yakindu.sct.model.sexec.Step
 import org.yakindu.sct.model.sexec.Check
 import org.yakindu.sct.model.stext.stext.StatechartScope
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class StatemachineHeader extends Statemachine {
 	
@@ -37,6 +38,7 @@ class StatemachineHeader extends Statemachine {
 	@Inject extension Navigation
 	@Inject extension ICodegenTypeSystemAccess
 	@Inject extension GenmodelEntries
+	@Inject extension INamingService
 	
 	def generateStatemachineHeader(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
 		 fsa.generateFile(flow.module().h, flow.statemachineHContent(entry) )
@@ -172,7 +174,7 @@ class StatemachineHeader extends Statemachine {
 	'''
 	
 	def protected identifier(Parameter parameter) {
-		if (parameter.name.isCKeyword()) {
+		if (parameter.name.isKeyword) {
 			return parameter.name + "Arg"
 		}
 		else {
@@ -296,10 +298,10 @@ class StatemachineHeader extends Statemachine {
 	'''
 	
 	def dispatch functionPrototype(Check it) '''
-		sc_boolean «asCheckFunction»();
+		sc_boolean «shortName»();
 	'''
 	
 	def dispatch functionPrototype(Step it) '''
-		void «functionName»();
+		void «shortName»();
 	'''	
 }

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineImplementation.xtend

@@ -21,6 +21,7 @@ import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.generator.c.GenmodelEntries
import org.yakindu.sct.model.stext.stext.StatechartScope
 import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.sexec.naming.INamingService
 
 class StatemachineImplementation {
 	
@@ -28,7 +29,8 @@ class StatemachineImplementation {
 	@Inject extension Navigation
 	@Inject extension FlowCode
 	@Inject extension GenmodelEntries
-	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension INamingService
 	
 	def generateStatemachineImplemenation(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
 		 fsa.generateFile(flow.module.cpp, flow.statemachineContent(entry) )
@@ -61,8 +63,8 @@ class StatemachineImplementation {
 
 		«isActiveFunction»
 		
-		«interfaceFunctions»
-				
+		«interfaceFunctions»
+		
 		«functionImplementations»
 	'''
 	
@@ -170,8 +172,8 @@ class StatemachineImplementation {
 				switch (stateConfVector[stateConfVectorPosition]) {
 				«FOR state : states»
 					«IF state.reactSequence!=null»
-					case «state.name.asEscapedIdentifier» : {
-						«state.reactSequence.functionName»();
+					case «state.shortName.asEscapedIdentifier» : {
+						«state.reactSequence.shortName»();
 						break;
 					}
 					«ENDIF»
@@ -208,10 +210,10 @@ class StatemachineImplementation {
 		sc_boolean «module»::«nameOfIsActiveFunction»(«statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
-				case «s.name.asIdentifier» : 
-					return (sc_boolean) («IF s.leaf»stateConfVector[«s.stateVector.offset»] == «s.name.asIdentifier»
-					«ELSE»stateConfVector[«s.stateVector.offset»] >= «s.name.asIdentifier»
-						&& stateConfVector[«s.stateVector.offset»] <= «s.subStates.last.name.asIdentifier»«ENDIF»);
+				case «s.shortName.asEscapedIdentifier» : 
+					return (sc_boolean) («IF s.leaf»stateConfVector[«s.stateVector.offset»] == «s.shortName.asEscapedIdentifier»
+					«ELSE»stateConfVector[«s.stateVector.offset»] >= «s.shortName.asEscapedIdentifier»
+						&& stateConfVector[«s.stateVector.offset»] <= «s.subStates.last.shortName.asEscapedIdentifier»«ENDIF»);
 				«ENDFOR»
 				default: return false;
 			}
@@ -342,7 +344,7 @@ class StatemachineImplementation {
 	
 	def dispatch functionImplementation(Check it) '''
 		«stepComment»
-		sc_boolean «execution_flow.module»::«asCheckFunction»() {
+		sc_boolean «execution_flow.module»::«shortName»() {
 			return «code»;
 		}
 		
@@ -350,7 +352,7 @@ class StatemachineImplementation {
 	
 	def dispatch functionImplementation(Step it) '''
 		«stepComment»
-		void «execution_flow.module»::«functionName»() {
+		void «execution_flow.module»::«shortName»() {
 			«code»
 		}
 		

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/features/CPPDefaultFeatureValueProvider.java

@@ -13,9 +13,13 @@ package org.yakindu.sct.generator.cpp.features;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.xbase.lib.StringExtensions;
+import org.yakindu.sct.generator.c.features.CFeatureConstants;
 import org.yakindu.sct.generator.core.features.AbstractDefaultFeatureValueProvider;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
 import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
+import org.yakindu.sct.model.sgen.GeneratorEntry;
+import org.yakindu.sct.model.sgraph.Statechart;
 
 /**
  * 
@@ -24,6 +28,9 @@ import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
  */
 public class CPPDefaultFeatureValueProvider extends
 		AbstractDefaultFeatureValueProvider {
+	
+	private static final String INVALID_IDENTIFIER_REGEX = "[^a-z&&[^A-Z&&[^0-9]]]";
+	private static final String VALID_IDENTIFIER_REGEX = "[_a-zA-Z][_a-zA-Z0-9]*";
 
 	public boolean isProviderFor(FeatureTypeLibrary library) {
 		return CPPFeatureConstants.LIBRARY_NAME.equals(library.getName());
@@ -31,12 +38,45 @@ public class CPPDefaultFeatureValueProvider extends
 
 	@Override
 	protected void setDefaultValue(FeatureParameterValue parameterValue,
-			EObject object) {
-		//TODO: Implement my default properties
+			EObject contextElement) {
+		GeneratorEntry entry = (GeneratorEntry) contextElement;
+		Statechart statechart = (Statechart) entry.getElementRef();
+
+		if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_MODULE_NAME)) {
+			parameterValue.setValue(asIdentifier(statechart.getName(), "_"));
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_FUNCTION_PREFIX)) {
+			parameterValue.setValue(StringExtensions.toFirstLower(asIdentifier(
+					statechart.getName(), "_")));
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_MAX_IDENTIFIER_LENGTH)) {
+			parameterValue.setValue("31");
+		} else if (parameterValue.getParameter().getName()
+				.equals(CFeatureConstants.PARAMETER_SEPARATOR)) {
+			parameterValue.setValue("_");
+		}
 	}
 
-	public IStatus validateParameterValue(FeatureParameterValue value) {
+	public IStatus validateParameterValue(FeatureParameterValue parameter) {
+		String parameterName = parameter.getParameter().getName();
+		if (CFeatureConstants.PARAMETER_MODULE_NAME.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid module name");
+			}
+		} else if (CFeatureConstants.PARAMETER_FUNCTION_PREFIX.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid function prefix name");
+			}
+		} else if (CFeatureConstants.PARAMETER_SEPARATOR.equals(parameterName)) {
+			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
+				return error("Invalid separator");
+			}
+		}
 		return Status.OK_STATUS;
 	}
-
+	
+	private String asIdentifier(String it, String separator) {
+		return it.replaceAll(INVALID_IDENTIFIER_REGEX, separator);
+	}
 }

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/features/CPPFeatureConstants.java

@@ -17,4 +17,5 @@ package org.yakindu.sct.generator.cpp.features;
  */
 public interface CPPFeatureConstants {
 	public static final String LIBRARY_NAME = "CPP Generator";
+	
 }

plugins/org.yakindu.sct.model.sexec/META-INF/MANIFEST.MF

@@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.yakindu.sct.model.sexec,
  org.yakindu.sct.model.sexec.extensions,
  org.yakindu.sct.model.sexec.impl,
+ org.yakindu.sct.model.sexec.naming,
  org.yakindu.sct.model.sexec.transformation,
  org.yakindu.sct.model.sexec.util
 Require-Bundle: org.eclipse.core.runtime,

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/extensions/SExecExtensions.xtend

@@ -273,4 +273,68 @@ class SExecExtensions {
 		steps.filter(s | s.name == null || s.name.trim == "" ||  s.name.trim == "default" ).head
 	}
 	
+	/**
+	 * Tries to find the next super ExecutionScope from the eContainer hierarchy.
+	 * 
+	 * @return
+	 * 		The super ExecutionScope or null
+	 */
+	def ExecutionScope parentExecutionScope(EObject it) {
+		if (it != null) {
+			if (it instanceof ExecutionScope) {
+				return it as ExecutionScope
+			} else {
+				return parentExecutionScope(it.eContainer)
+			}
+		}
+		return null
+	}
+	
+	/**
+	 * Calculates the depth of a step within the ExecutionScope hierarchy. If the
+	 * Step is directly below the ExecutionFlow it has a depth of 0.
+	 * 
+	 * @return
+	 * 		The depth of the element
+	 */
+	def int getScopeDepth(Step it) {
+		return parentExecutionScope.scopeDepth
+	}
+	
+	/**
+	 * Calculates the depth of a ExecutionScope.
+	 * The ExecutionFlow has as root element a depth of 0.
+	 * 
+	 * * @return
+	 * 		The depth of the element
+	 */
+	def int getScopeDepth(ExecutionScope it) {
+		var scopeDepth = 0
+
+		if (it instanceof ExecutionFlow) {
+			return 0
+		} else {
+			scopeDepth = superScope.getScopeDepth + 1
+		}
+		return scopeDepth
+	}
+	
+	/**
+	 * returns all functions of an ExecutionFlow.
+	 */
+	def List<Step> getAllFunctions(ExecutionFlow it) {
+		var functions = new ArrayList<Step>
+		functions.addAll(checkFunctions)
+		functions.addAll(effectFunctions)
+		functions.addAll(entryActionFunctions)
+		functions.addAll(exitActionFunctions)
+		functions.addAll(enterSequenceFunctions)
+		functions.addAll(exitSequenceFunctions)
+		functions.addAll(reactFunctions)
+		return functions
+	}
+	
+	def getTimeEvent(ExecutionFlow flow, String timeEventName) {
+		flow.timeEvents.findFirst[name.compareTo(timeEventName) == 0]
+	}
 }

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/DefaultNamingService.xtend

@@ -0,0 +1,373 @@
+package org.yakindu.sct.model.sexec.naming
+
+import javax.inject.Inject
+import org.yakindu.base.base.NamedElement
+import java.util.Map
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import java.util.HashMap
+import org.yakindu.sct.model.sexec.extensions.SExecExtensions
+import java.util.Comparator
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.ExecutionScope
+import org.yakindu.sct.model.sexec.transformation.StatechartExtensions
+import org.eclipse.xtext.naming.IQualifiedNameProvider
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.stext.stext.TimeEventSpec
+import org.yakindu.sct.model.sgraph.Statechart
+import org.yakindu.sct.model.sgraph.CompositeElement
+import org.yakindu.sct.model.sgraph.Vertex
+import org.yakindu.sct.model.sexec.transformation.SgraphExtensions
+import org.yakindu.sct.model.sexec.ExecutionNode
+import org.eclipse.emf.ecore.EObject
+import java.util.List
+
+class StepDepthComparator implements Comparator<Step> {
+	@Inject
+	extension SExecExtensions
+
+	override compare(Step arg0, Step arg1) {
+		return arg0.scopeDepth - arg1.scopeDepth
+	}
+}
+
+class ExecutionScopeDepthComparator implements Comparator<ExecutionScope> {
+	@Inject
+	extension SExecExtensions
+
+	override compare(ExecutionScope o1, ExecutionScope o2) {
+		return o1.scopeDepth - o2.scopeDepth
+	}
+}
+
+enum NameShorteningStrategy {
+	STANDARD,
+	REMOVE_VOWELS,
+	INDEX_POSITION
+}
+
+class DefaultNamingService implements INamingService {
+
+	@Inject extension SExecExtensions
+	@Inject extension SgraphExtensions
+	@Inject extension StatechartExtensions
+	@Inject extension IQualifiedNameProvider
+	@Inject extension StepDepthComparator stepDepthComparator
+	@Inject extension ExecutionScopeDepthComparator executionScopeDepthComparator
+	@Inject extension NamingHelper
+
+	var protected int maxLength = 31
+
+	var protected char separator = '_'
+
+	var private Map<NamedElement, String> map
+
+	var protected ExecutionFlow activeFlow
+	
+	var protected Statechart activeStatechart
+
+	new(int maxLength, char separator) {
+		this.maxLength = maxLength
+		this.separator = separator
+	}
+
+	new() {
+		this.maxLength = 31
+		this.separator = '_'
+	}
+	
+	override void initializeNamingService(Statechart statechart) {
+		if (map == null || activeStatechart != statechart) {
+			activeFlow = null
+			activeStatechart = statechart
+			map = statechart.createShortNameMap(maxLength, separator)
+		}
+	}
+	
+	override void initializeNamingService(ExecutionFlow flow) {
+		if (map == null || activeFlow != flow) {
+			activeFlow = flow
+			activeStatechart = null
+			map = flow.createShortNameMap(maxLength, separator)
+		}
+	}
+	
+	override getShortNameMap(Statechart statechart) {
+		if (map == null || activeStatechart != statechart) {
+			statechart.initializeNamingService()
+		}
+		return map
+	}
+	
+	override Map<NamedElement, String> getShortNameMap(ExecutionFlow flow) {
+		if (map == null || activeFlow != flow) {
+			flow.initializeNamingService()
+		}
+		return map
+	}
+	
+	override getShortName(NamedElement element) {
+		if (map == null || !map.containsKey(element)) {
+			var statechart = element.statechart
+			if (statechart != null) {
+				statechart.initializeNamingService
+			}
+			else {
+				element.flow?.initializeNamingService
+			}
+		}
+		map?.get(element)
+	}
+	
+	def Map<NamedElement, String> createShortNameMap(Statechart statechart, int maxLength, char separator) {
+		var HashMap<NamedElement, String> map = new HashMap<NamedElement, String>
+		map.addShortVertexNames(statechart, maxLength, separator)
+		return map;
+	}
+	
+	def protected void addShortVertexNames(Map<NamedElement, String> map, CompositeElement element, int maxLength,
+		char separator) {
+		for (region : element.regions) {
+			for (vertex : region.vertices) {
+				switch vertex {
+					State :
+						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength, separator)
+					default:
+						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength, separator)
+				}
+			}
+		}
+		for (region : element.regions) {
+			for (vertex : region.vertices) {
+				if (vertex instanceof CompositeElement) {
+					map.addShortVertexNames(vertex as CompositeElement, maxLength, separator)
+				}
+			}
+		}
+	}
+
+	def Map<NamedElement, String> createShortNameMap(ExecutionFlow flow, int maxLength, char separator) {
+		var HashMap<NamedElement, String> map = new HashMap<NamedElement, String>
+		map.addShortStateNames(flow, maxLength, separator)
+		map.addShortFctNames(flow, maxLength, separator)
+		map.addShortTimeEventNames(flow, maxLength, separator)
+		return map;
+	}
+
+	def protected void addShortStateNames(Map<NamedElement, String> map, ExecutionFlow flow, int maxLength,
+		char separator) {
+		for (s : flow.states.sort(executionScopeDepthComparator)) {
+			map.putShortName(s, s.prefix(separator), s.suffix(separator), maxLength, separator)
+		}
+	}
+
+	def protected void addShortFctNames(Map<NamedElement, String> map, ExecutionFlow flow, int maxLength, char separator) {
+		for (s : flow.allFunctions.sort(stepDepthComparator)) {
+			map.putShortName(s, s.prefix(separator), s.suffix(separator), maxLength, separator)
+		}
+	}
+
+	def protected void addShortTimeEventNames(Map<NamedElement, String> map, ExecutionFlow flow, int maxLength,
+		char separator) {
+		for (executionState : flow.states.sort(executionScopeDepthComparator)) {
+			if (executionState.sourceElement instanceof State) {
+				var state = executionState.sourceElement as State
+				var timeEventSpecs = state.timeEventSpecs
+				for (tes : timeEventSpecs) {
+					var timeEvent = flow.getTimeEvent(
+						state.fullyQualifiedName + "_time_event_" + timeEventSpecs.indexOf(tes))
+					if (timeEvent != null) {
+						map.put(timeEvent,
+							executionState.getShortName(tes.prefix(state, separator), tes.suffix(state, separator),
+								map.values.toList, maxLength, separator))
+					}
+				}
+			}
+		}
+	}
+
+	def protected void putShortName(Map<NamedElement, String> map, NamedElement element, String prefix, String suffix,
+		int maxLength, char separator) {
+		if (!map.containsKey(element)) {
+			map.put(element, element.getShortName(prefix, suffix, map.values.toList, maxLength, separator))
+		}
+	}
+
+	def protected prefix(Step it, char separator) {
+		var prefix = flow.name.toFirstLower
+		switch (it) {
+			case isCheckFunction: prefix + separator + "check"
+			case isEntryAction: prefix + separator + "enact"
+			case isExitAction: prefix + separator + "exact"
+			case isEffect: prefix + separator + "effect"
+			case isEnterSequence: prefix + separator + "enseq"
+			case isDeepEnterSequence: prefix + separator + "dhenseq"
+			case isShallowEnterSequence: prefix + separator + "shenseq"
+			case isExitSequence: prefix + separator + "exseq"
+			case isReactSequence: prefix + separator + "react"
+			default: ""
+		}
+	}
+
+	def protected suffix(Step it, char separator) {
+		""
+	}
+
+	def protected prefix(ExecutionState it, char separator) {
+		flow.name
+	}
+
+	def protected suffix(ExecutionState it, char separator) {
+		""
+	}
+
+	def protected prefix(TimeEventSpec it, State state, char separator) {
+		activeFlow.name
+	}
+
+	def protected suffix(TimeEventSpec it, State state, char separator) {
+		"tev" + state.timeEventSpecs.indexOf(it)
+	}
+	
+	def protected prefix(State it, char separator) {
+		activeStatechart.name
+	}
+	
+	def protected prefix(Vertex it, char separator) {
+		""
+	}
+
+	def protected suffix(Vertex it, char separator) {
+		""
+	}
+	
+	override asIdentifier(String string) {
+		string.replaceAll('[^a-z&&[^A-Z&&[^0-9]]]', separator.toString)
+	}
+	
+	override asEscapedIdentifier(String string) {
+		string.asIdentifier
+	}
+	
+	override isKeyword(String string) {
+		return false
+	}
+	
+	def protected String getShortName(NamedElement element, String prefix, String suffix, List<String> nameList, int maxLength,
+		char separator) {
+		var shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::STANDARD, separator)
+
+		//second reduction removing vowels
+		if (shortName.length > maxLength) {
+			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::REMOVE_VOWELS,
+				separator);
+		}
+
+		//third reduction using index position as name
+		if (shortName.length > maxLength) {
+			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::INDEX_POSITION,
+				separator);
+		}
+
+		//fourth reduction using hash value
+		if (shortName.length > maxLength) {
+
+			//Important: FQN has to be the same if the input model is a Statechart or an ExecutionFlow
+			shortName = prefix + separator + element.fqElementName.asIdentifier.getHash(maxLength)
+		}
+		return shortName
+	}
+
+	def protected String createShortName(NamedElement element, String prefix, String suffix, List<String> nameList,
+		NameShorteningStrategy nameShorteningType, char separator) {
+
+		var name = element.elementName(nameShorteningType)
+
+		if (!suffix.nullOrEmpty) {
+			if (!name.nullOrEmpty) {
+				name = name + separator + suffix
+
+			} else {
+				name = suffix
+			}
+		}
+
+		var shortName = prefix
+		if (!name.nullOrEmpty) {
+			if (prefix.nullOrEmpty) {
+				shortName = name.asEscapedIdentifier
+			} else {
+				shortName = (prefix + separator + name).asEscapedIdentifier
+			}
+		}
+		
+		if (nameList.containsName(shortName)) {
+			switch element {
+				ExecutionScope:
+					shortName = element.superScope.createShortName(prefix, name, nameList, nameShorteningType, separator)
+				Step:
+					shortName = element.parentExecutionScope.superScope.createShortName(prefix, name, nameList,
+						nameShorteningType, separator)
+				default: {
+					if (element.eContainer instanceof NamedElement) {
+						shortName = (element.eContainer as NamedElement).createShortName(prefix, name, nameList,
+							nameShorteningType, separator)
+					}
+				}
+			}
+		}
+		return shortName;
+	}
+	
+	def protected dispatch String elementName(ExecutionScope it, NameShorteningStrategy nameShorteningType) {
+		switch nameShorteningType {
+			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::REMOVE_VOWELS: return name.removeVowels
+			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition
+		}
+	}
+
+	def protected dispatch String elementName(ExecutionState it, NameShorteningStrategy nameShorteningType) {
+		switch nameShorteningType {
+			case NameShorteningStrategy::STANDARD: return simpleName
+			case NameShorteningStrategy::REMOVE_VOWELS: return simpleName.removeVowels
+			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition
+		}
+	}
+
+	def protected dispatch String elementName(ExecutionNode it, NameShorteningStrategy nameShorteningType) {
+		simpleName
+	}
+
+	def protected dispatch String elementName(ExecutionFlow it, NameShorteningStrategy nameShorteningType) {
+		""
+	}
+
+	def protected dispatch String elementName(Step it, NameShorteningStrategy nameShorteningType) {
+		eContainer.elementName(nameShorteningType)
+	}
+
+	def protected dispatch String elementName(NamedElement it, NameShorteningStrategy nameShorteningType) {
+		var ret = name
+		if (ret.nullOrEmpty) {
+			ret = it.class.simpleName
+		}
+		switch nameShorteningType {
+			case NameShorteningStrategy::STANDARD: return ret
+			case NameShorteningStrategy::REMOVE_VOWELS: return ret.removeVowels
+			case NameShorteningStrategy::INDEX_POSITION: return ret.removeVowels
+		}
+	}
+
+	def protected dispatch String elementName(EObject it, NameShorteningStrategy nameShorteningType) {
+		eContainer.elementName(nameShorteningType)
+	}
+
+	def protected asIndexPosition(ExecutionScope it) {
+		superScope.subScopes.indexOf(it).toString;
+	}
+
+	def protected removeVowels(String it) {
+		replaceAll('[aeiou]', '')
+	}
+}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/INamingService.java

@@ -0,0 +1,79 @@
+package org.yakindu.sct.model.sexec.naming;
+
+import java.util.Map;
+
+import org.yakindu.base.base.NamedElement;
+import org.yakindu.sct.model.sexec.ExecutionFlow;
+import org.yakindu.sct.model.sgraph.Statechart;
+
+/**
+ * 
+ * @author Markus Mühlbrandt
+ * 
+ */
+public interface INamingService {
+
+	/**
+	 * Initializes the service.
+	 * 
+	 * @param statechart
+	 */
+	void initializeNamingService(Statechart statechart);
+
+	/**
+	 * Initializes the service.
+	 * 
+	 * @param flow
+	 */
+	void initializeNamingService(ExecutionFlow flow);
+
+	/**
+	 * Returns a map which stores a short name (value) for a NamedElement (key).
+	 * 
+	 * @param statechart
+	 * @return
+	 */
+	Map<NamedElement, String> getShortNameMap(Statechart statechart);
+
+	/**
+	 * Returns a map which stores a short name (value) for a NamedElement (key).
+	 * 
+	 * @param flow
+	 * @return
+	 */
+	Map<NamedElement, String> getShortNameMap(ExecutionFlow flow);
+
+	/**
+	 * Returns a short name for the given element. The naming service has to be
+	 * initialized before.
+	 * 
+	 * @param element
+	 * @return
+	 */
+	String getShortName(NamedElement element);
+
+	/**
+	 * Convert string to a valid identifier (e.g. removes blanks and invalid
+	 * characters)
+	 * 
+	 * @param string
+	 * @return
+	 */
+	String asIdentifier(String string);
+	
+	/**
+	 * If the given string equals a target language keyword it is escaped.
+	 * 
+	 * @param string
+	 * @return
+	 */
+	String asEscapedIdentifier(String string);
+	
+	/**
+	 * Checks if the given string is a target language keyword
+	 * 
+	 * @param string
+	 * @return
+	 */
+	boolean isKeyword(String string);
+}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/NamingHelper.xtend

@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2014 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
+package org.yakindu.sct.model.sexec.naming
+
+import java.io.UnsupportedEncodingException
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.util.Formatter
+import org.eclipse.emf.ecore.EObject
+import org.yakindu.base.base.NamedElement
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionNode
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sgraph.Statechart
+import java.util.List
+
+/**
+ * Helper class with methods to create meaningful short names for {@link ExecutionFlow}
+ * elements. Intended to be used within generators to match target language identifier
+ * character length restrictions.
+ * 
+ * @author Markus Muehlbrandt
+ * 
+ */
+class NamingHelper {
+
+	def dispatch String fqElementName(ExecutionState it) {
+		(if(superScope != null && ! superScope.fqElementName.empty) superScope.fqElementName + "_" else "") + simpleName
+	}
+
+	def dispatch String fqElementName(EObject it) {
+		eContainer.fqElementName
+	}
+
+	def dispatch String fqElementName(ExecutionNode it) {
+		name
+	}
+
+	def dispatch String fqElementName(ExecutionFlow it) {
+		""
+	}
+
+	def dispatch String fqElementName(Statechart it) {
+		""
+	}
+
+	def dispatch String fqElementName(NamedElement it) {
+		(if(eContainer instanceof NamedElement && !(eContainer as NamedElement).fqElementName.nullOrEmpty) (eContainer as NamedElement).
+			fqElementName + "_" else "") + name
+	}
+	
+	def containsName(List<String> it, String shortName) {
+		findFirst[compareTo(shortName) == 0] != null
+	}
+	
+	def String getHash(String text, int length) {
+		if (length <= 0) {
+			return ""
+		}
+
+		var hash = getHash(text)
+
+		if (length > hash.length()) {
+			hash = hash.substring(0, hash.length())
+		} else {
+			hash = hash.substring(0, length)
+		}
+
+		return hash.replace('0', 'a').replace('1', 'b').replace('2', 'c').replace('3', 'd').replace('4', 'e').
+			replace('5', 'f').replace('6', 'g').replace('7', 'h').replace('8', 'i').replace('9', 'j')
+	}
+
+	def String getHash(String text) {
+		var sha1 = ""
+		try {
+			var MessageDigest crypt = MessageDigest.getInstance("SHA-1")
+			crypt.reset
+			crypt.update(text.getBytes("UTF-8"))
+			sha1 = byteToHex(crypt.digest)
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace()
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace
+		}
+		return sha1
+	}
+
+	def String byteToHex(byte[] hash) {
+		var Formatter formatter = new Formatter
+		for (byte b : hash) {
+			formatter.format("%02x", b)
+		}
+		var String result = formatter.toString
+		formatter.close
+		return result
+	}
+}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SequencerModule.java

@@ -3,6 +3,8 @@ package org.yakindu.sct.model.sexec.transformation;
 import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.service.AbstractGenericModule;
 import org.yakindu.base.types.ITypeSystem;
+import org.yakindu.sct.model.sexec.naming.DefaultNamingService;
+import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sgraph.naming.SGraphNameProvider;
 import org.yakindu.sct.model.stext.types.ISTextTypeInferrer;
 import org.yakindu.sct.model.stext.types.ISTextTypeSystem;
@@ -17,6 +19,7 @@ import com.google.inject.name.Names;
  * @author andreas muelder - Initial contribution and API
  * @author Alexander Nyßen (alexander.nyssen@itemis.de) - Refactored to
  *         AbstractGenericModule to allow subclasses to overwrite bindings
+ * @author Markus Mühlbrandt - Added binding to DefaultNamingService
  */
 public class SequencerModule extends AbstractGenericModule {
 
@@ -47,5 +50,9 @@ public class SequencerModule extends AbstractGenericModule {
 	public Class<? extends ISTextTypeInferrer> bindISTextTypeInferrer() {
 		return STextDefaultTypeInferrer.class;
 	}
+	
+	public Class<? extends INamingService> bindINamingService() {
+		return DefaultNamingService.class;
+	}
 
 }

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SgraphExtensions.xtend

@@ -13,7 +13,7 @@ import org.yakindu.sct.model.sgraph.EntryKind
 import org.yakindu.sct.model.sgraph.Transition
 import org.yakindu.sct.model.stext.stext.EntryPointSpec
 import org.yakindu.sct.model.stext.stext.ExitPointSpec
-
+import org.yakindu.sct.model.sgraph.Statechart
 
 class SgraphExtensions {
 	
@@ -126,4 +126,23 @@ class SgraphExtensions {
 		r.requireDeepHistory || r.requireShallowHistory
 	}
 	
+	/**
+	 * Tries to find the parent {@link Statechart} Object of the element.
+	 * 
+	 * @param element
+	 * @return
+	 * 		The parent statechart or null.
+	 */
+	def Statechart getStatechart(EObject element){
+		var Statechart ret = null
+		if (element != null) {
+			if (element instanceof Statechart) {
+				return element as Statechart
+			}
+			else {
+				ret = getStatechart(element.eContainer)
+			}
+		}
+		return ret
+	}
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/AlwaysOncycle/AlwaysOncycle.cc

@@ -18,19 +18,19 @@ AlwaysOncycle handle;
 TEST(StatemachineTest, alwaysOncycleTest) {
 	alwaysOncycle_init(&handle);
 	alwaysOncycle_enter(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_StateA));
 	while (alwaysOncycleIface_get_value(&handle) < 5) {
 		alwaysOncycle_runCycle(&handle);
-		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_StateA));
 	}
 	alwaysOncycle_runCycle(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
+	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_StateB));
 	while (alwaysOncycleIface_get_value(&handle) < 5) {
 		alwaysOncycle_runCycle(&handle);
-		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
+		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_StateB));
 	}
 	alwaysOncycle_runCycle(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_StateA));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/AssignmentAsExpression/AssignmentAsExpression.cc

@@ -18,33 +18,33 @@ AssignmentAsExpression handle;
 TEST(StatemachineTest, simpleAssignment) {
 	assignmentAsExpression_init(&handle);
 	assignmentAsExpression_enter(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Add));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Add));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_b(&handle) == 5);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_a(&handle) == 9);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Subtract));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Subtract));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_d(&handle) == 6);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Multiply));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Multiply));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_e(&handle) == 15);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Divide));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Divide));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_g(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Modulo));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Modulo));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_i(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Shift));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Shift));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_j(&handle) == 16);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_k(&handle) == 4);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_And));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_bln_And));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_l(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Or));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_bln_Or));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_p(&handle) == 15);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Xor));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_bln_Xr));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_u(&handle) == 12);
 	assignmentAsExpression_exit(&handle);
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/BitExpressions/BitExpressions.cc

@@ -18,12 +18,12 @@ BitExpressions handle;
 TEST(StatemachineTest, BitExpressions) {
 	bitExpressions_init(&handle);
 	bitExpressions_enter(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateA));
+	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_StateA));
 	EXPECT_TRUE(bitExpressionsIface_get_myBit1(&handle) == 5);
 	EXPECT_TRUE(bitExpressionsIface_get_myBit2(&handle) == 7);
 	bitExpressionsIface_raise_e1(&handle);
 	bitExpressions_runCycle(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateB));
+	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_StateB));
 	EXPECT_TRUE(bitExpressionsIface_get_leftBitshift(&handle) == 10);
 	EXPECT_TRUE(bitExpressionsIface_get_rightBitshift(&handle) == 2);
 	EXPECT_TRUE(bitExpressionsIface_get_complementBitshift(&handle) == - 6 );

test-plugins/org.yakindu.sct.generator.c.test/gtests/BooleanExpressions/BooleanExpressions.cc

@@ -18,12 +18,12 @@ BooleanExpressions handle;
 TEST(StatemachineTest, booleanExpressions) {
 	booleanExpressions_init(&handle);
 	booleanExpressions_enter(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateA));
+	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_StateA));
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool1(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool2(&handle) == false);
 	booleanExpressionsIface_raise_e1(&handle);
 	booleanExpressions_runCycle(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateB));
+	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_StateB));
 	EXPECT_TRUE(booleanExpressionsIface_get_and(&handle) == false);
 	EXPECT_TRUE(booleanExpressionsIface_get_or(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_not(&handle) == false);

test-plugins/org.yakindu.sct.generator.c.test/gtests/CKeywords/CKeywords.cc

@@ -18,12 +18,12 @@ CKeywords handle;
 TEST(StatemachineTest, CKeywordsTest) {
 	cKeywords_init(&handle);
 	cKeywords_enter(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_char));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_char));
 	cKeywordsIface_raise_auto(&handle);
 	cKeywords_runCycle(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const_switch_case));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const_switch_case_enum_asm));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_const));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_case));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_asm));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/Choice/Choice.cc

@@ -18,65 +18,65 @@ Choice handle;
 TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
 }
 TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
 }
 TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
 }
 TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
 }
 TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_h(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepEntry/DeepEntry.cc

@@ -26,13 +26,13 @@ TEST(StatemachineTest, enterToSubstate) {
 	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 2);
 	deepEntryIface_raise_e(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_BB));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_C));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_C));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_BB));
 	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepHistory/DeepHistory.cc

@@ -26,16 +26,16 @@ TEST(StatemachineTest, deepHistoryTest) {
 	deepHistory_runCycle(&handle);
 	deepHistoryIface_raise_event7(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State1));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State9));
 	deepHistoryIface_raise_event2(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State1));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State9));
 	deepHistoryIface_raise_event1(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State1));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State9));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/DynamicChoice/DynamicChoice.cc

@@ -18,9 +18,9 @@ DynamicChoice handle;
 TEST(StatemachineTest, DynamicChoiceTest) {
 	dynamicChoice_init(&handle);
 	dynamicChoice_enter(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_Start));
+	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_Start));
 	dynamicChoice_runCycle(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_A));
+	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EnterState/EnterState.cc

@@ -18,26 +18,26 @@ EnterState handle;
 TEST(StatemachineTest, defaultEntry) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
 	enterStateIface_raise_e(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_E));
 }
 TEST(StatemachineTest, namedEntryThroughNamedTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
 	enterStateIface_raise_f(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_F));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_F));
 }
 TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
 	enterStateIface_raise_g(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_E));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryChoice/EntryChoice.cc

@@ -20,7 +20,7 @@ TEST(StatemachineTest, EntryChoiceTest) {
 	entryChoice_enter(&handle);
 	entryChoice_runCycle(&handle);
 	entryChoice_runCycle(&handle);
-	EXPECT_TRUE(entryChoice_isActive(&handle, EntryChoice_main_region_A));
+	EXPECT_TRUE(entryChoice_isActive(&handle, EntryChoice_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitOnSelfTransition/ExitOnSelfTransition.cc

@@ -18,7 +18,7 @@ ExitOnSelfTransition handle;
 TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	exitOnSelfTransition_init(&handle);
 	exitOnSelfTransition_enter(&handle);
-	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_main_region_A));
+	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_A));
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 1);
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 0);
 	exitOnSelfTransitionIface_raise_e(&handle);

test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitState/ExitState.cc

@@ -18,33 +18,33 @@ ExitState handle;
 TEST(StatemachineTest, defaultExit) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
 	exitStateIface_raise_e(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_E));
 }
 TEST(StatemachineTest, namedExitThroughNamedTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
 	exitStateIface_raise_f(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_F));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_F));
 }
 TEST(StatemachineTest, namedExitThroughDefaultTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
 	exitStateIface_raise_g(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_E));
 }
 TEST(StatemachineTest, remainInA) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/FeatureCalls/FeatureCalls.cc

@@ -18,9 +18,9 @@ FeatureCalls handle;
 TEST(StatemachineTest, FeatureCalls) {
 	featureCalls_init(&handle);
 	featureCalls_enter(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
+	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_A));
 	featureCalls_runCycle(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
+	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/Guard/Guard.cc

@@ -18,22 +18,22 @@ Guard handle;
 TEST(StatemachineTest, guardTest) {
 	guard_init(&handle);
 	guard_enter(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
 	guardIface_raise_event2(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedEntry/GuardedEntry.cc

@@ -19,42 +19,42 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	EXPECT_TRUE(guardedEntryIface_get_guard(&handle) == false);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == false);
 }
 TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == true);
 }
 TEST(StatemachineTest, EntryTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_B));
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) );
 }
 TEST(StatemachineTest, EntryNotTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_B));
 	guardedEntryIface_set_guard(&handle, false);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
 	EXPECT_TRUE(!guardedEntryIface_get_done(&handle) );
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedExit/GuardedExit.cc

@@ -18,21 +18,21 @@ GuardedExit handle;
 TEST(StatemachineTest, ExitTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_A));
 	EXPECT_TRUE(!guardedExitIface_get_guard(&handle) );
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_B));
 	EXPECT_TRUE(!guardedExitIface_get_done(&handle) );
 }
 TEST(StatemachineTest, ExitNotTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_A));
 	guardedExitIface_set_guard(&handle, true);
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_B));
 	EXPECT_TRUE(guardedExitIface_get_done(&handle) );
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithoutInitialStep/HistoryWithoutInitialStep.cc

@@ -18,43 +18,43 @@ HistoryWithoutInitialStep handle;
 TEST(StatemachineTest, enterThroughInitialEntry) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
 }
 TEST(StatemachineTest, enterCThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
 }
 TEST(StatemachineTest, enterDThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/IntegerExpressions/IntegerExpressions.cc

@@ -18,7 +18,7 @@ IntegerExpressions handle;
 TEST(StatemachineTest, integerExpressions) {
 	integerExpressions_init(&handle);
 	integerExpressions_enter(&handle);
-	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_main_region_StateA));
+	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_StateA));
 	EXPECT_TRUE(integerExpressionsIface_get_myInt1(&handle) == 10);
 	EXPECT_TRUE(integerExpressionsIface_get_myInt2(&handle) == 5);
 	integerExpressionsIface_raise_e1(&handle);

test-plugins/org.yakindu.sct.generator.c.test/gtests/InternalEventLifeCycle/InternalEventLifeCycle.cc

@@ -18,22 +18,22 @@ InternalEventLifeCycle handle;
 TEST(StatemachineTest, InternalEventLifeCycleTest) {
 	internalEventLifeCycle_init(&handle);
 	internalEventLifeCycle_enter(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
 	internalEventLifeCycleIface_raise_e(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_D));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_D));
 	internalEventLifeCycleIface_raise_f(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/Parenthesis/Parenthesis.cc

@@ -18,7 +18,7 @@ Parenthesis handle;
 TEST(StatemachineTest, simple) {
 	parenthesis_init(&handle);
 	parenthesis_enter(&handle);
-	EXPECT_TRUE(parenthesis_isActive(&handle, Parenthesis_mainRegion_A));
+	EXPECT_TRUE(parenthesis_isActive(&handle, Parenthesis_A));
 	EXPECT_TRUE(parenthesisIface_get_erg(&handle) == 8);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/PriorityValues/PriorityValues.cc

@@ -21,16 +21,16 @@ TEST(StatemachineTest, transitionPriority) {
 	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_A));
 	priorityValuesIface_raise_event1(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_C));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_C));
 }
 TEST(StatemachineTest, regionPriority) {
 	priorityValues_init(&handle);
 	priorityValues_enter(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_A));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_A));
 	priorityValuesIface_raise_event2(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_B));
-	EXPECT_TRUE(!priorityValues_isActive(&handle, PriorityValues_main_region_E));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_B));
+	EXPECT_TRUE(!priorityValues_isActive(&handle, PriorityValues_E));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/RaiseEvent/RaiseEvent.cc

@@ -18,13 +18,13 @@ RaiseEvent handle;
 TEST(StatemachineTest, raiseEvent) {
 	raiseEvent_init(&handle);
 	raiseEvent_enter(&handle);
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_SateA));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateA));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_SateA));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_StateA));
 	raiseEventIface_raise_e2(&handle);
 	raiseEvent_runCycle(&handle);
 	raiseEvent_runCycle(&handle);
 	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_StateB));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateB));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_StateB));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/STextKeywordsInStatesAndRegions/STextKeywordsInStatesAndRegions.cc

@@ -18,466 +18,466 @@ STextKeywordsInStatesAndRegions handle;
 TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	sTextKeywordsInStatesAndRegions_init(&handle);
 	sTextKeywordsInStatesAndRegions_enter(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geegdacijbbifhadfejdbadaecdedbc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_djgeeeaefaihhdbehijdaefhdjgbcjd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbcahcbgifaegbehdafbeacecdbhaig));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_efadgdfaabdbiebaiacdjeffbeiiade));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abacdaffafabcjcigjfagcicacefcac));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_djgeeeaefaihhdbehijdaefhdjgbcjd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbcahcbgifaegbehdafbeacecdbhaig));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_efadgdfaabdbiebaiacdjeffbeiiade));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abacdaffafabcjcigjfagcicacefcac));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbcahcbgifaegbehdafbeacecdbhaig));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_efadgdfaabdbiebaiacdjeffbeiiade));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abacdaffafabcjcigjfagcicacefcac));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_efadgdfaabdbiebaiacdjeffbeiiade));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abacdaffafabcjcigjfagcicacefcac));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abacdaffafabcjcigjfagcicacefcac));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edecdajbecfbfhedbajdgfebecbbhff));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_debcgecidcaafdbcdhbiaiadjebfadj));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gffabcfafgjfghfcfheagfdjhcjihhd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_faabffabcbgfebjdaaiaeaaeajcbdhb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_gbiabeadabajfagdbdagddhbgdbhdda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_beadcbfdbgfcdhgdhadhaaabbbgagaf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cdahebgecdecadhefajfidcdecjgabf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edjifaeahjdgabeafcajahbffjechhi));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aceaffabbdfaccdacbfeijdbeeaabee));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fgjcddedcjgabebgifbidffiadbaghg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cfceadfadddcbfcaacacahdahdcecbb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hajaffiabaacbbbbhcfeaeifdiecdci));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_fibaagciibchcffagfeceefhdacbajb));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hajaffiabaacbbbbhcfeaeifdiecdci));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hbcjihcafgeicdididcfcebejdfbdcg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_jbjeabbdefjgafccfbieadadhcjbbcc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hajaffiabaacbbbbhcfeaeifdiecdci));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hbcjihcafgeicdididcfcebejdfbdcg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cegjehdeehedgbhebeafeaahbdbbffd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dgbffijbahaadbcfhfcbcjjhjfjedjb));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hajaffiabaacbbbbhcfeaeifdiecdci));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hbcjihcafgeicdididcfcebejdfbdcg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cegjehdeehedgbhebeafeaahbdbbffd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgfdjffdacibefafibccfgiagibffaa));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_geedfedfheciggiifgdfidiceeffcfg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_dfcddaihdbfjcgbbfhajdaccfadjgfc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgedcdfgajgehcecebcecdcjibfacdc));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_edebehdfcagacjahechfjabhbfgbbdf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_adijcigaceiehbcaecjcjdahideddcf));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_iaajgbfghbbbjfhfdaicdajbdjdhbeh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hdfchdhefeebebecdfdjddcdjgegadh));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_baegidahfcfbiafcbcbfjejhcacdede));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_idhcdeafgaecdjebdeefcbbbhgcedfe));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_abichjfbfafbeiadcffdjacgifcaida));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebfajighbfjbfbcacdbaheccaejcbbd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ffidcdcifdcjbgfadbcbbbffhaiceda));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ifcdcbcceahfjejggjdebheheeiaefd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_aadecidicccahfcdeccfcgegbedafad));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_eaibffbfbefcaddddfjacjdedjaedib));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_ebgaecjcacecgdccagiebjdabdaejab));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hajaffiabaacbbbbhcfeaeifdiecdci));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_hbcjihcafgeicdididcfcebejdfbdcg));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_cegjehdeehedgbhebeafeaahbdbbffd));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_bgfdjffdacibefafibccfgiagibffaa));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SameNameDifferentRegion/SameNameDifferentRegion.cc

@@ -18,15 +18,15 @@ SameNameDifferentRegion handle;
 TEST(StatemachineTest, sameNameDifferenRegionTest) {
 	sameNameDifferentRegion_init(&handle);
 	sameNameDifferentRegion_enter(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_SttA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_SttB));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistory/ShallowHistory.cc

@@ -26,28 +26,28 @@ TEST(StatemachineTest, shallowHistoryTest) {
 	shallowHistory_runCycle(&handle);
 	shallowHistoryIface_raise_event7(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State1));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
 	shallowHistoryIface_raise_event6(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State9));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State6));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State8));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
 	shallowHistoryIface_raise_event2(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State9));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State1));
 	shallowHistoryIface_raise_event1(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State6));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State1));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State6));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleEvent/SimpleEvent.cc

@@ -18,11 +18,11 @@ SimpleEvent handle;
 TEST(StatemachineTest, simpleEventTest) {
 	simpleEvent_init(&handle);
 	simpleEvent_enter(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_A)) << "Expected A to be active" ;
+	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_A)) << "Expected A to be active" ;
 	EXPECT_TRUE(5== 5);
 	simpleEventIface_raise_event1(&handle);
 	simpleEvent_runCycle(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_B)) << "Expected B to be active" ;
+	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_B)) << "Expected B to be active" ;
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleHierachy/SimpleHierachy.cc

@@ -18,13 +18,13 @@ SimpleHierachy handle;
 TEST(StatemachineTest, simpleHierachyTest) {
 	simpleHierachy_init(&handle);
 	simpleHierachy_enter(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_A));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_A));
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachy_runCycle(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B));
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B_subregion1_B1));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_B));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_B1));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/StateIsActive/StateIsActive.cc

@@ -18,13 +18,13 @@ StateIsActive handle;
 TEST(StatemachineTest, stateIsActive) {
 	stateIsActive_init(&handle);
 	stateIsActive_enter(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1A));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2A));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1A));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2A));
 	stateIsActiveIface_raise_event1(&handle);
 	stateIsActive_runCycle(&handle);
 	stateIsActive_runCycle(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1B));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2B));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1B));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartLocalReactions/StatechartLocalReactions.cc

@@ -18,15 +18,15 @@ StatechartLocalReactions handle;
 TEST(StatemachineTest, statechartLocalReactionsTest) {
 	statechartLocalReactions_init(&handle);
 	statechartLocalReactions_enter(&handle);
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
+	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S1));
+	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_a));
 	while (statechartLocalReactionsIface_get_myInt(&handle) < 10) {
-		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
+		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_a));
 		if (statechartLocalReactionsIface_get_myInt(&handle) %2== 0) {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));;
+					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S1));;
 				  }
 				else {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S2));;
+					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S2));;
 				}
 		statechartLocalReactions_runCycle(&handle);
 	}

test-plugins/org.yakindu.sct.generator.c.test/gtests/StaticChoice/StaticChoice.cc

@@ -18,7 +18,7 @@ StaticChoice handle;
 TEST(StatemachineTest, StaticChoiceTest) {
 	staticChoice_init(&handle);
 	staticChoice_enter(&handle);
-	EXPECT_TRUE(staticChoice_isActive(&handle, StaticChoice_main_region_Start));
+	EXPECT_TRUE(staticChoice_isActive(&handle, StaticChoice_Start));
 	staticChoice_runCycle(&handle);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressions.cc

@@ -19,13 +19,13 @@ TEST(StatemachineTest, StringExpressionsTest) {
 	stringExpressions_init(&handle);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedString(&handle) , "\"x\"") == 0);
 	stringExpressions_enter(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_main_region_StateA));
+	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_StateA));
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_myString(&handle) , "hello") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_myString2(&handle) , "world") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedString(&handle) , "'y'") == 0);
 	stringExpressionsIface_raise_e1(&handle);
 	stringExpressions_runCycle(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_main_region_StateB));
+	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_StateB));
 	EXPECT_TRUE(stringExpressionsIface_get_equals(&handle) == false);
 	EXPECT_TRUE(stringExpressionsIface_get_notEqual(&handle) == true);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedString(&handle) , "\"z\"") == 0);

test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncFork/SyncFork.cc

@@ -18,25 +18,25 @@ SyncFork handle;
 TEST(StatemachineTest, syncForkTest) {
 	syncFork_init(&handle);
 	syncFork_enter(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D1));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C2));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D2));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C2));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D2));
 	syncForkIface_raise_e(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D1));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncJoin/SyncJoin.cc

@@ -18,70 +18,70 @@ SyncJoin handle;
 TEST(StatemachineTest, syncJoin_C2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_B));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_A));
 }
 TEST(StatemachineTest, syncJoin_D2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_B));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
 }
 TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoin_init(&handle);
@@ -92,7 +92,7 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_A));
 	EXPECT_TRUE(syncJoinIface_get_x(&handle) == 1);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/TimedTransitions/TimedTransitions.cc

@@ -19,10 +19,10 @@ TimedTransitions handle;
 TEST(StatemachineTest, Timer01) {
 	timedTransitions_init(&handle);
 	timedTransitions_enter(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_Start));
+	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_Start));
 	// here should be waited 2030 Seconds
 	timedTransitions_runCycle(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_End));
+	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_End));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/TransitionWithoutCondition/TransitionWithoutCondition.cc

@@ -18,9 +18,9 @@ TransitionWithoutCondition handle;
 TEST(StatemachineTest, TransitionWithoutConditionTest) {
 	transitionWithoutCondition_init(&handle);
 	transitionWithoutCondition_enter(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_A));
+	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_A));
 	transitionWithoutCondition_runCycle(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_B));
+	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ValuedEvents/ValuedEvents.cc

@@ -19,8 +19,8 @@ TEST(StatemachineTest, valuedEventsTest) {
 	valuedEvents_init(&handle);
 	valuedEvents_enter(&handle);
 	valuedEvents_runCycle(&handle);
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_main_region_A));
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents__region1_C));
+	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_A));
+	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_C));
 	EXPECT_TRUE(valuedEventsIface_get_myVar(&handle) == 42);
 }
 

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/AlwaysOncycleTest/AlwaysOncycleTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,18 +16,18 @@ TEST(StatemachineTest, alwaysOncycleTest) {
 	AlwaysOncycle* statechart = new AlwaysOncycle();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
 	while (statechart->getSCInterface()->get_value()< 5) {
 		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::AlwaysOncycle_main_region_StateA));
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
 	}
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::AlwaysOncycle_main_region_StateB));
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
 	while (statechart->getSCInterface()->get_value()< 5) {
 		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::AlwaysOncycle_main_region_StateB));
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
 	}
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/AssignmentAsExpressionTest/AssignmentAsExpressionTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,33 +16,33 @@ TEST(StatemachineTest, simpleAssignment) {
 	AssignmentAsExpression* statechart = new AssignmentAsExpression();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Add));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Add));
 	EXPECT_TRUE(statechart->getSCInterface()->get_b()== 5);
 	EXPECT_TRUE(statechart->getSCInterface()->get_a()== 9);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Subtract));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Subtract));
 	EXPECT_TRUE(statechart->getSCInterface()->get_d()== 6);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Multiply));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Multiply));
 	EXPECT_TRUE(statechart->getSCInterface()->get_e()== 15);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Divide));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Divide));
 	EXPECT_TRUE(statechart->getSCInterface()->get_g()== 1);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Modulo));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Modulo));
 	EXPECT_TRUE(statechart->getSCInterface()->get_i()== 1);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_Shift));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Shift));
 	EXPECT_TRUE(statechart->getSCInterface()->get_j()== 16);
 	EXPECT_TRUE(statechart->getSCInterface()->get_k()== 4);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_boolean_And));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_And));
 	EXPECT_TRUE(statechart->getSCInterface()->get_l()== 1);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_boolean_Or));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Or));
 	EXPECT_TRUE(statechart->getSCInterface()->get_p()== 15);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::AssignmentAsExpression_main_region_boolean_Xor));
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Xor));
 	EXPECT_TRUE(statechart->getSCInterface()->get_u()== 12);
 	statechart->exit();
 	delete statechart;

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/BitExpressionsTest/BitExpressionsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,12 +16,12 @@ TEST(StatemachineTest, BitExpressions) {
 	BitExpressions* statechart = new BitExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::BitExpressions_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(BitExpressions::StateA));
 	EXPECT_TRUE(statechart->getSCInterface()->get_myBit1()== 5);
 	EXPECT_TRUE(statechart->getSCInterface()->get_myBit2()== 7);
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::BitExpressions_main_region_StateB));
+	EXPECT_TRUE(statechart->isActive(BitExpressions::StateB));
 	EXPECT_TRUE(statechart->getSCInterface()->get_leftBitshift()== 10);
 	EXPECT_TRUE(statechart->getSCInterface()->get_rightBitshift()== 2);
 	EXPECT_TRUE(statechart->getSCInterface()->get_complementBitshift()== - 6 );

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/BooleanExpressionsTest/BooleanExpressionsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,12 +16,12 @@ TEST(StatemachineTest, booleanExpressions) {
 	BooleanExpressions* statechart = new BooleanExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::BooleanExpressions_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(BooleanExpressions::StateA));
 	EXPECT_TRUE(statechart->getSCInterface()->get_myBool1()== true);
 	EXPECT_TRUE(statechart->getSCInterface()->get_myBool2()== false);
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::BooleanExpressions_main_region_StateB));
+	EXPECT_TRUE(statechart->isActive(BooleanExpressions::StateB));
 	EXPECT_TRUE(statechart->getSCInterface()->get_and()== false);
 	EXPECT_TRUE(statechart->getSCInterface()->get_or()== true);
 	EXPECT_TRUE(statechart->getSCInterface()->get_not()== false);

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/CKeywordsTest/CKeywordsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,11 +16,11 @@ TEST(StatemachineTest, CKeywordsTest) {
 	CKeywords* statechart = new CKeywords();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(CKeywords::CKeywords_auto_char));
+	EXPECT_TRUE(statechart->isActive(CKeywords::char_ID));
 	statechart->raise_auto();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(CKeywords::CKeywords_auto_const));
-	EXPECT_TRUE(statechart->isActive(CKeywords::CKeywords_auto_const_switch_case));
-	EXPECT_TRUE(statechart->isActive(CKeywords::CKeywords_auto_const_switch_case_enum_asm));
+	EXPECT_TRUE(statechart->isActive(CKeywords::const_ID));
+	EXPECT_TRUE(statechart->isActive(CKeywords::case_ID));
+	EXPECT_TRUE(statechart->isActive(CKeywords::asm_ID));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ChoiceTest/ChoiceTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,76 +16,76 @@ TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(true);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
+	EXPECT_TRUE(statechart->isActive(Choice::C));
 	delete statechart;
 }
 TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Choice::B));
 	delete statechart;
 }
 TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(true);
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
+	EXPECT_TRUE(statechart->isActive(Choice::C));
 	delete statechart;
 }
 TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(false);
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Choice::B));
 	delete statechart;
 }
 TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(true);
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
+	EXPECT_TRUE(statechart->isActive(Choice::C));
 	delete statechart;
 }
 TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(false);
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Choice::B));
 	delete statechart;
 }
 TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Choice::A));
 	statechart->getSCInterface()->set_c(true);
 	statechart->raise_h();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
+	EXPECT_TRUE(statechart->isActive(Choice::C));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DeclarationsTest/DeclarationsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DeepEntryTest/DeepEntryTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -24,13 +24,13 @@ TEST(StatemachineTest, enterToSubstate) {
 	EXPECT_TRUE(statechart->getSCInterface()->get_z()== 2);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(statechart->isActive(DeepEntry::BB));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::DeepEntry_r2_C));
+	EXPECT_TRUE(statechart->isActive(DeepEntry::C));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(statechart->isActive(DeepEntry::BB));
 	EXPECT_TRUE(statechart->getSCInterface()->get_y()== 1);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DeepHistoryTest/DeepHistoryTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -24,15 +24,15 @@ TEST(StatemachineTest, deepHistoryTest) {
 	statechart->runCycle();
 	statechart->raise_event7();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isActive(DeepHistory::State1));
+	EXPECT_TRUE(statechart->isActive(DeepHistory::State9));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepHistory::DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(statechart->isActive(DeepHistory::State1));
+	EXPECT_TRUE(!statechart->isActive(DeepHistory::State9));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isActive(DeepHistory::State1));
+	EXPECT_TRUE(statechart->isActive(DeepHistory::State9));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DynamicChoiceTest/DynamicChoice.sgen

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart DynamicChoice {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "DynamicChoiceTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart DynamicChoice {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "DynamicChoiceTest"
+		}
+	}
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DynamicChoiceTest/DynamicChoiceTest.cc

@@ -1,28 +1,23 @@
-/**
-* Copyright (c) 2014 committers of YAKINDU and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*     committers of YAKINDU - initial API and implementation
-*/
-#include <string>
-#include "gtest/gtest.h"
-#include "DynamicChoice.h"
-			
-
-DynamicChoice* statechart;
-
-	
-TEST(StatemachineTest, DynamicChoiceTest) {
-	statechart = new DynamicChoice();				
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::DynamicChoice_main_region_Start));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::DynamicChoice_main_region_A));
-	delete statechart;
-}
-
+/**
+* Copyright (c) 2014 committers of YAKINDU and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*     committers of YAKINDU - initial API and implementation
+*/
+#include <string>
+#include "gtest/gtest.h"
+#include "DynamicChoice.h"
+
+TEST(StatemachineTest, DynamicChoiceTest) {
+	DynamicChoice* statechart = new DynamicChoice();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(DynamicChoice::Start));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DynamicChoice::A));
+	delete statechart;
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/EnterStateTest/EnterStateTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,29 +16,29 @@ TEST(StatemachineTest, defaultEntry) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_A));
+	EXPECT_TRUE(statechart->isActive(EnterState::A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_B_r_E));
+	EXPECT_TRUE(statechart->isActive(EnterState::E));
 	delete statechart;
 }
 TEST(StatemachineTest, namedEntryThroughNamedTransition) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_A));
+	EXPECT_TRUE(statechart->isActive(EnterState::A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_B_r_F));
+	EXPECT_TRUE(statechart->isActive(EnterState::F));
 	delete statechart;
 }
 TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_A));
+	EXPECT_TRUE(statechart->isActive(EnterState::A));
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::EnterState_r_B_r_E));
+	EXPECT_TRUE(statechart->isActive(EnterState::E));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/EntryChoiceTest/EntryChoice.sgen

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart EntryChoice {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "EntryChoiceTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart EntryChoice {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "EntryChoiceTest"
+		}
+	}
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/EntryChoiceTest/EntryChoiceTest.cc

@@ -1,28 +1,23 @@
-/**
-* Copyright (c) 2014 committers of YAKINDU and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*     committers of YAKINDU - initial API and implementation
-*/
-#include <string>
-#include "gtest/gtest.h"
-#include "EntryChoice.h"
-			
-
-EntryChoice* statechart;
-
-	
-TEST(StatemachineTest, EntryChoiceTest) {
-	statechart = new EntryChoice();				
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryChoice::EntryChoice_main_region_A));
-	delete statechart;
-}
-
+/**
+* Copyright (c) 2014 committers of YAKINDU and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*     committers of YAKINDU - initial API and implementation
+*/
+#include <string>
+#include "gtest/gtest.h"
+#include "EntryChoice.h"
+
+TEST(StatemachineTest, EntryChoiceTest) {
+	EntryChoice* statechart = new EntryChoice();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(EntryChoice::A));
+	delete statechart;
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ExitOnSelfTransitionTest/ExitOnSelfTransitionTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	ExitOnSelfTransition* statechart = new ExitOnSelfTransition();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::ExitOnSelfTransition_main_region_A));
+	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 1);
 	EXPECT_TRUE(statechart->getSCInterface()->get_exitCount()== 0);
 	statechart->raise_e();

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ExitStateTest/ExitStateTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,38 +16,38 @@ TEST(StatemachineTest, defaultExit) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_A));
+	EXPECT_TRUE(statechart->isActive(ExitState::A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_E));
+	EXPECT_TRUE(statechart->isActive(ExitState::E));
 	delete statechart;
 }
 TEST(StatemachineTest, namedExitThroughNamedTransition) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_A));
+	EXPECT_TRUE(statechart->isActive(ExitState::A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_F));
+	EXPECT_TRUE(statechart->isActive(ExitState::F));
 	delete statechart;
 }
 TEST(StatemachineTest, namedExitThroughDefaultTransition) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_A));
+	EXPECT_TRUE(statechart->isActive(ExitState::A));
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_E));
+	EXPECT_TRUE(statechart->isActive(ExitState::E));
 	delete statechart;
 }
 TEST(StatemachineTest, remainInA) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_A));
+	EXPECT_TRUE(statechart->isActive(ExitState::A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::ExitState_r_A));
+	EXPECT_TRUE(statechart->isActive(ExitState::A));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/FeatureCallsTest/FeatureCallsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,8 +16,8 @@ TEST(StatemachineTest, FeatureCalls) {
 	FeatureCalls* statechart = new FeatureCalls();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::FeatureCalls_main_region_A));
+	EXPECT_TRUE(statechart->isActive(FeatureCalls::A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::FeatureCalls_main_region_A));
+	EXPECT_TRUE(statechart->isActive(FeatureCalls::A));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/GuardTest/GuardTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,21 +16,21 @@ TEST(StatemachineTest, guardTest) {
 	Guard* statechart = new Guard();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Guard::A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Guard::A));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Guard::B));
 	statechart->raise_return();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Guard::A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_B));
+	EXPECT_TRUE(statechart->isActive(Guard::B));
 	statechart->raise_return();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::Guard_main_region_A));
+	EXPECT_TRUE(statechart->isActive(Guard::A));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/GuardedEntryTest/GuardedEntryTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 	statechart->init();
 	EXPECT_TRUE(statechart->getSCInterface()->get_guard()== false);
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_done()== false);
 	delete statechart;
 }
@@ -26,7 +26,7 @@ TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	statechart->init();
 	statechart->getSCInterface()->set_guard(true);
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_done()== true);
 	delete statechart;
 }
@@ -34,15 +34,15 @@ TEST(StatemachineTest, EntryTakenInTransition) {
 	GuardedEntry* statechart = new GuardedEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_B));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::B));
 	statechart->getSCInterface()->set_guard(true);
 	statechart->getSCInterface()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_done());
 	delete statechart;
 }
@@ -50,15 +50,15 @@ TEST(StatemachineTest, EntryNotTakenInTransition) {
 	GuardedEntry* statechart = new GuardedEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_B));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::B));
 	statechart->getSCInterface()->set_guard(false);
 	statechart->getSCInterface()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
 	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/GuardedExitTest/GuardedExitTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,11 +16,11 @@ TEST(StatemachineTest, ExitTaken) {
 	GuardedExit* statechart = new GuardedExit();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
 	EXPECT_TRUE(!statechart->getSCInterface()->get_guard());
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_B));
+	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
 	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
 	delete statechart;
 }
@@ -28,11 +28,11 @@ TEST(StatemachineTest, ExitNotTaken) {
 	GuardedExit* statechart = new GuardedExit();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_A));
+	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
 	statechart->getSCInterface()->set_guard(true);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_B));
+	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
 	EXPECT_TRUE(statechart->getSCInterface()->get_done());
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/HistoryWithoutInitialStepTest/HistoryWithoutInitialStepTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,46 +16,46 @@ TEST(StatemachineTest, enterThroughInitialEntry) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
 	delete statechart;
 }
 TEST(StatemachineTest, enterCThroughHistory) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
 	delete statechart;
 }
 TEST(StatemachineTest, enterDThroughHistory) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
 	statechart->raise_e1();
 	statechart->runCycle();
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/InEventLifeCycleTest/InEventLifeCycleTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/IntegerExpressionsTest/IntegerExpressionsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ TEST(StatemachineTest, integerExpressions) {
 	IntegerExpressions* statechart = new IntegerExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(IntegerExpressions::IntegerExpressions_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(IntegerExpressions::StateA));
 	EXPECT_TRUE(statechart->getSCInterface()->get_myInt1()== 10);
 	EXPECT_TRUE(statechart->getSCInterface()->get_myInt2()== 5);
 	statechart->raise_e1();

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/InternalEventLifeCycleTest/InternalEventLifeCycleTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,21 +16,21 @@ TEST(StatemachineTest, InternalEventLifeCycleTest) {
 	InternalEventLifeCycle* statechart = new InternalEventLifeCycle();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::D));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::D));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LogicalAndTestsTest/LogicalAndTestsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LogicalOrTestsTest/LogicalOrTestsTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/NamedInterfaceAccessTest/NamedInterfaceAccessTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/OutEventLifeCycleTest/OutEventLifeCycleTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ParenthesisTest/ParenthesisTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@ TEST(StatemachineTest, simple) {
 	Parenthesis* statechart = new Parenthesis();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Parenthesis::Parenthesis_mainRegion_A));
+	EXPECT_TRUE(statechart->isActive(Parenthesis::A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_erg()== 8);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/PriorityValuesTest/PriorityValuesTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,20 +16,20 @@ TEST(StatemachineTest, transitionPriority) {
 	PriorityValues* statechart = new PriorityValues();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::PriorityValues_main_region_A));
+	EXPECT_TRUE(statechart->isActive(PriorityValues::main_region_A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::PriorityValues_main_region_C));
+	EXPECT_TRUE(statechart->isActive(PriorityValues::C));
 	delete statechart;
 }
 TEST(StatemachineTest, regionPriority) {
 	PriorityValues* statechart = new PriorityValues();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::PriorityValues_someRegion_A));
+	EXPECT_TRUE(statechart->isActive(PriorityValues::A));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::PriorityValues_someRegion_B));
-	EXPECT_TRUE(!statechart->isActive(PriorityValues::PriorityValues_main_region_E));
+	EXPECT_TRUE(statechart->isActive(PriorityValues::B));
+	EXPECT_TRUE(!statechart->isActive(PriorityValues::E));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/RaiseEventTest/RaiseEventTest.cc

@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2013 committers of YAKINDU and others.
+* Copyright (c) 2014 committers of YAKINDU and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -16,12 +16,12 @@ TEST(StatemachineTest, raiseEvent) {
 	RaiseEvent* statechart = new RaiseEvent();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::RaiseEvent_second_region_SateA));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::RaiseEvent_main_region_StateA));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::SateA));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateA));
 	statechart->raise_e2();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::RaiseEvent_second_region_StateB));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::RaiseEvent_main_region_StateB));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::second_region_StateB));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateB));
 	delete statechart;
 }