C/C++ generator considers moduleName and statemachine features now.

plugins/org.yakindu.sct.doc.user/help/04_Reference/reference.textile

@@ -589,7 +589,7 @@ h4. IdentifierSettings
 The *IdentifierSettings* feature allows the configuration of module names and identifier character length:
 
 # __moduleName__  (String, optional): The name for the header and implementation. The statechart name is used in default.
-# __functionPrefix__  (Boolean, optional): A prefix which is added before function and state names.
+# __statemachinePrefix__  (Boolean, optional): A prefix which is added before function, state names and types.
 # __maxIdentifierLength (Integer, optional): The maximum character length of an identifier. In default 31 chars are used which matches ANSI C99 standard.
 # __separator__ (String, optional): To specify a separator to replace whitescpaces and illegal characters.
 
@@ -598,7 +598,7 @@ Example configuration:
 bc(prettyprint).. 
 feature IdentifierSettings {
 	moduleName =  "MyStatechart" 
-	functionPrefix =  "myStatechart" 
+	statemachinePrefix =  "myStatechart" 
 	maxIdentifierLength = 31
 	separator =  "_" 
 }

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

@@ -12,7 +12,7 @@
         name="moduleName"
         optional="true"/>
     <parameters
-        name="functionPrefix"
+        name="statemachinePrefix"
         optional="true"/>
     <parameters
         name="maxIdentifierLength"

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

@@ -44,8 +44,8 @@ class CNamingService extends DefaultNamingService {
 	
 	override protected prefix(Step it, char separator) {
 		var prefix = flow.name.toFirstLower
-		if (entry.functionPrefix != null) {
-			prefix = entry.functionPrefix
+		if (entry.statemachinePrefix != null) {
+			prefix = entry.statemachinePrefix
 		}
 		switch (it) {
 			case isCheckFunction: prefix + separator + "check"
@@ -62,18 +62,18 @@ class CNamingService extends DefaultNamingService {
 	}
 	
 	override protected prefix(ExecutionState it, char separator) {
-		if (entry.functionPrefix != null) {
-			entry.functionPrefix
+		if (entry.statemachinePrefix.nullOrEmpty) {
+			super.prefix(it, separator).toFirstUpper			
 		} else {
-			super.prefix(it, separator).toFirstUpper
+			entry.statemachinePrefix
 		}
 	}
 	
 	override protected prefix(TimeEventSpec it, State state, char separator) {
-		if (entry.functionPrefix != null) {
-			entry.functionPrefix
-		} else {
+		if (entry.statemachinePrefix.nullOrEmpty) {
 			super.prefix(it, state, separator).toFirstLower
+		} else {
+			entry.statemachinePrefix
 		}
 	}
 	

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

@@ -162,7 +162,7 @@ class ExpressionCode {
 		'''«value.definition.event.valueAccess»'''
 	
 	def dispatch CharSequence code (ActiveStateReferenceExpression it)
-		'''«flow.nameOfIsActiveFunction»(«scHandle», «value.shortName»)'''
+		'''«flow.activeFctID»(«scHandle», «value.shortName»)'''
 	
 	def dispatch CharSequence code (ParenthesizedExpression it)
 		'''(«expression.code»)'''

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

@@ -54,12 +54,12 @@ class GenmodelEntries {
 		return separatorParameter?.stringValue
 	}
 	
-	def private FeatureParameterValue getFunctionPrefixParameter(GeneratorEntry it) {
-		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_FUNCTION_PREFIX)
+	def private FeatureParameterValue getStatemachinePrefixParameter(GeneratorEntry it) {
+		identifierSettingsFeature?.getParameterValue(CFeatureConstants::PARAMETER_STATEMACHINE_PREFIX)
 	}
 	
-	def getFunctionPrefix(GeneratorEntry it) {
-		return functionPrefixParameter?.stringValue
+	def getStatemachinePrefix(GeneratorEntry it) {
+		return statemachinePrefixParameter?.stringValue
 	}
 	
 	def private FeatureParameterValue getModuleNameParameter(GeneratorEntry it) {

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

@@ -25,6 +25,7 @@ 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.sgen.GeneratorEntry
 
 class Naming {
 	
@@ -34,15 +35,26 @@ class Naming {
 	
 	@Inject private StextNameProvider provider
 	
-	@Inject extension INamingService
+	@Inject extension INamingService
+	
+	@Inject GeneratorEntry entry
+	
+	@Inject extension GenmodelEntries
 	
 	def getFullyQualifiedName(State state) {
 		provider.getFullyQualifiedName(state).toString.asEscapedIdentifier
 	}
 	
-	def module(ExecutionFlow it) {
-		name.asIdentifier.toFirstUpper	
-	}
+	def module(ExecutionFlow it) {
+		if (entry.moduleName.nullOrEmpty) {
+			return name.asIdentifier.toFirstUpper	
+		}
+		return entry.moduleName.toFirstUpper
+	}
+	
+//	def module(InterfaceScope it) {
+//		flow.type + (if (name.nullOrEmpty) 'Default' else name).asIdentifier.toFirstUpper	
+//	}
 	
 	def client(String it) {
 		it + "Required"	
@@ -56,57 +68,86 @@ class Naming {
 		'sc_types'	
 	}
 	
-	def dispatch type(ExecutionFlow it) {
-		name.asIdentifier.toFirstUpper	
-	}
-	
 	def timerType(ExecutionFlow it) {
 		'SCTimer'
 	}
 	
 	def statesEnumType(ExecutionFlow it) {
-		module + 'States'	
-	}
-	
-	def module(InterfaceScope it) {
-		flow.module + (if (name == null || name.empty) 'Default' else name).asIdentifier.toFirstUpper	
+		flow.type + 'States'	
 	}
 	
 	def dispatch type(InterfaceScope it) {
-		flow.module + 'Iface' + (if (name == null || name.empty) '' else name).asIdentifier.toFirstUpper	
+		flow.type + 'Iface' + (if (name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper	
+	}
+	
+	def dispatch type(InternalScope it) {
+		flow.type + 'Internal'	
+	}
+	
+	def dispatch type(Scope it) {
+		flow.type + 'TimeEvents'	
+	}
+	
+	def dispatch type(ExecutionFlow it) {
+		if (entry.statemachinePrefix.nullOrEmpty) {
+			return name.asIdentifier.toFirstUpper	
+		}
+		return entry.statemachinePrefix.toFirstUpper
 	}
 	
 	def dispatch instance(InterfaceScope it) {
-		'iface' + (if (name == null || name.empty) '' else name).asIdentifier.toFirstUpper	
+		'iface' + (if (name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper	
 	}
 	
 	def dispatch instance(Scope it) {
 		'timeEvents'
 	}
 	
-	def dispatch type(InternalScope it) {
-		flow.module + 'Internal'	
-	}
-	
-	def dispatch type(Scope it) {
-		flow.module + 'TimeEvents'	
-	}
-	
 	def dispatch instance(InternalScope it) {
 		'internal'
 	}
 	
 	def functionPrefix(Scope it) {
-		type.toFirstLower	
+		if (!entry.statemachinePrefix.nullOrEmpty) {
+			return entry.statemachinePrefix
+		}
+		return type.toFirstLower	
+	}
+	
+	def functionPrefix(ExecutionFlow it) {
+		if (!entry.statemachinePrefix.nullOrEmpty) {
+			return entry.statemachinePrefix + separator
+		}
+		type.toFirstLower + separator
 	}
+	
+	def separator() {
+		var sep = entry.separator
+		if (sep.nullOrEmpty) {
+			sep = "_"
+		}
+		return sep
+	}
+	
+	def clearInEventsFctID(ExecutionFlow it) {
+		functionPrefix + "clearInEvents"
+	}
+	
+	def clearOutEventsFctID(ExecutionFlow it) {
+		functionPrefix + "clearOutEvents"
+	}
 	
 	def dispatch last_state(ExecutionFlow it) {
-		module + "_last_state"
+		type + lastStateID
 	}
 	
 	def dispatch last_state(Step it) {
-		execution_flow.module + "_last_state"
-	}
+		execution_flow.module + lastStateID
+	}
+	
+	def lastStateID() {
+		separator + "last" + separator + "state"
+	} 
 	
 	def ExecutionFlow execution_flow(EObject element) {
 		var ret = element;
@@ -121,46 +162,42 @@ class Naming {
 		}
 		return null;
 	}
-	
-	def functionPrefix(ExecutionFlow it) {
-		type.toFirstLower	
-	}
 
-	def nameOfRaiseTimeEventFunction(ExecutionFlow it) {
-		type.toFirstLower + "_raiseTimeEvent"
+	def raiseTimeEventFctID(ExecutionFlow it) {
+		functionPrefix + "raiseTimeEvent"
 	}
 
-	def nameOfIsActiveFunction(ExecutionFlow it) {
-		type.toFirstLower + "_isActive"
+	def isActiveFctID(ExecutionFlow it) {
+		functionPrefix + "isActive"
 	}
 
 	def asRaiser(EventDefinition it) {
-		scope.functionPrefix + '_raise_' + name.asIdentifier.toFirstLower	
+		scope.functionPrefix + separator + 'raise' + separator + name.asIdentifier.toFirstLower	
 	}
 	
 	def asRaised(EventDefinition it) {
-		scope.functionPrefix + '_israised_' + name.asIdentifier.toFirstLower	
+		scope.functionPrefix + separator + 'israised' + separator + name.asIdentifier.toFirstLower	
 	}
 	
 	def asGetter(EventDefinition it) {
-		scope.functionPrefix + '_get_' + name.asIdentifier.toFirstLower	+ '_value'
+		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower + separator + 'value'
 	}
 	
 	def asGetter(VariableDefinition it) {
-		scope.functionPrefix + '_get_' + name.asIdentifier.toFirstLower	
+		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower	
 	}
 	
 	def asSetter(VariableDefinition it) {
-		scope.functionPrefix + '_set_' + name.asIdentifier.toFirstLower	
+		scope.functionPrefix + separator + 'set' + separator + name.asIdentifier.toFirstLower	
 	}
 	
 	def asFunction(OperationDefinition it) {
-		scope.functionPrefix + '_' + name.asIdentifier.toFirstLower	
+		scope.functionPrefix + separator + name.asIdentifier.toFirstLower	
 	}
 	
-	def raised(CharSequence it) { it + '_raised' }
+	def raised(CharSequence it) { it + separator + 'raised' }
 	
-	def value(CharSequence it)  { it + '_value' }
+	def value(CharSequence it)  { it + separator + 'value' }
 	
 	def h(String it) { it + ".h" }
 	

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

@@ -61,20 +61,20 @@ class Statemachine {
 			«statemachineTypeDecl»
 
 			/*! Initializes the «type» state machine data structures. Must be called before first usage.*/
-			extern void «type.toFirstLower»_init(«type»* handle);
+			extern void «functionPrefix»init(«type»* handle);
 			
 			/*! Activates the state machine */
-			extern void «type.toFirstLower»_enter(«type»* handle);
+			extern void «functionPrefix»enter(«type»* handle);
 			
 			/*! Deactivates the state machine */
-			extern void «type.toFirstLower»_exit(«type»* handle);
+			extern void «functionPrefix»exit(«type»* handle);
 			
 			/*! Performs a 'run to completion' step. */
-			extern void «type.toFirstLower»_runCycle(«type»* handle);
+			extern void «functionPrefix»runCycle(«type»* handle);
 
 			«IF timed»
 				/*! Raises a time event. */
-				extern void «nameOfRaiseTimeEventFunction»(«type»* handle, sc_eventid evid);
+				extern void «raiseTimeEventFctID»(«type»* handle, sc_eventid evid);
 			«ENDIF»
 			
 			«FOR s : it.scopes.filter( typeof(InterfaceScope) )»
@@ -83,7 +83,7 @@ class Statemachine {
 			«ENDFOR»
 			
 			/*! Checks if the specified state is active. */
-			extern sc_boolean «nameOfIsActiveFunction»(«scHandleDecl», «statesEnumType» state);
+			extern sc_boolean «activeFctID»(«scHandleDecl», «statesEnumType» state);
 			
 			#ifdef __cplusplus
 			}

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

@@ -75,7 +75,7 @@ class StatemachineC {
 	
 	
 	def initFunction(ExecutionFlow it) '''
-		void «type.toFirstLower»_init(«scHandleDecl»)
+		void «functionPrefix»init(«scHandleDecl»)
 		{
 			int i;
 
@@ -89,8 +89,8 @@ class StatemachineC {
 			
 			«scHandle»->stateConfVectorPosition = 0;
 		
-			clearInEvents(handle);
-			clearOutEvents(handle);
+			«clearInEventsFctID»(handle);
+			«clearOutEventsFctID»(handle);
 		
 			«initSequence.code»
 		
@@ -98,7 +98,7 @@ class StatemachineC {
 	'''
 	
 	def enterFunction(ExecutionFlow it) '''
-		void «type.toFirstLower»_enter(«scHandleDecl»)
+		void «functionPrefix»enter(«scHandleDecl»)
 		{
 			«enterSequences.defaultSequence.code»
 		}
@@ -112,7 +112,7 @@ class StatemachineC {
 	'''
 	
 	def clearInEventsFunction(ExecutionFlow it) '''
-		static void clearInEvents(«scHandleDecl») {
+		static void «clearInEventsFctID»(«scHandleDecl») {
 			«FOR scope : it.scopes»
 				«FOR event : scope.incomingEvents»
 				«event.access» = bool_false;
@@ -132,7 +132,7 @@ class StatemachineC {
 	'''
 	
 	def clearOutEventsFunction(ExecutionFlow it) '''
-		static void clearOutEvents(«scHandleDecl») {
+		static void «clearOutEventsFctID»(«scHandleDecl») {
 			«FOR scope : it.scopes»
 				«FOR event : scope.outgoingEvents»
 				«event.access» = bool_false;
@@ -142,9 +142,9 @@ class StatemachineC {
 	'''
 	
 	def runCycleFunction(ExecutionFlow it) '''
-		void «type.toFirstLower»_runCycle(«scHandleDecl») {
+		void «functionPrefix»runCycle(«scHandleDecl») {
 			
-			clearOutEvents(«scHandle»);
+			«clearOutEventsFctID»(«scHandle»);
 			
 			for («scHandle»->stateConfVectorPosition = 0;
 				«scHandle»->stateConfVectorPosition < «type.toUpperCase»_MAX_ORTHOGONAL_STATES;
@@ -164,13 +164,13 @@ class StatemachineC {
 				}
 			}
 			
-			clearInEvents(«scHandle»);
+			«clearInEventsFctID»(«scHandle»);
 		}
 	'''
 	
 	def raiseTimeEventFunction(ExecutionFlow it) '''
 		«IF timed»
-			void «nameOfRaiseTimeEventFunction»(«type»* handle, sc_eventid evid) {
+			void «raiseTimeEventFctID»(«type»* handle, sc_eventid evid) {
 				if ( ((intptr_t)evid) >= ((intptr_t)&(«scHandle»->timeEvents))
 					&&  ((intptr_t)evid) < ((intptr_t)&(«scHandle»->timeEvents)) + sizeof(«timeEventScope.type»)) {
 					*(sc_boolean*)evid = bool_true;
@@ -180,7 +180,7 @@ class StatemachineC {
 	'''
 	
 	def isActiveFunction(ExecutionFlow it) '''
-		sc_boolean «nameOfIsActiveFunction»(«scHandleDecl», «statesEnumType» state) {
+		sc_boolean «activeFctID»(«scHandleDecl», «statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
 				case «s.shortName» : 
@@ -247,8 +247,8 @@ class StatemachineC {
 		«enterSequenceFunctions.toPrototypes»
 		«exitSequenceFunctions.toPrototypes»
 		«reactFunctions.toPrototypes»
-		static void clearInEvents(«scHandleDecl»);
-		static void clearOutEvents(«scHandleDecl»);
+		static void «clearInEventsFctID»(«scHandleDecl»);
+		static void «clearOutEventsFctID»(«scHandleDecl»);
 		
 	'''
 	 

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

@@ -48,7 +48,7 @@ public class CDefaultFeatureValueProvider extends
 				.equals(CFeatureConstants.PARAMETER_MODULE_NAME)) {
 			parameterValue.setValue(asIdentifier(statechart.getName(), "_"));
 		} else if (parameterValue.getParameter().getName()
-				.equals(CFeatureConstants.PARAMETER_FUNCTION_PREFIX)) {
+				.equals(CFeatureConstants.PARAMETER_STATEMACHINE_PREFIX)) {
 			parameterValue.setValue(StringExtensions.toFirstLower(asIdentifier(
 					statechart.getName(), "_")));
 		} else if (parameterValue.getParameter().getName()
@@ -69,7 +69,7 @@ public class CDefaultFeatureValueProvider extends
 			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
 				return error("Invalid module name");
 			}
-		} else if (CFeatureConstants.PARAMETER_FUNCTION_PREFIX.equals(parameterName)) {
+		} else if (CFeatureConstants.PARAMETER_STATEMACHINE_PREFIX.equals(parameterName)) {
 			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
 				return error("Invalid function prefix name");
 			}

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

@@ -23,7 +23,7 @@ public interface CFeatureConstants {
 	
 	public static final String PARAMETER_MODULE_NAME = "moduleName";
 	
-	public static final String PARAMETER_FUNCTION_PREFIX = "functionPrefix";
+	public static final String PARAMETER_STATEMACHINE_PREFIX = "statemachinePrefix";
 	
 	public static final String PARAMETER_MAX_IDENTIFIER_LENGTH = "maxIdentifierLength";
 	

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

@@ -12,7 +12,7 @@
         name="moduleName"
         optional="true"/>
     <parameters
-        name="functionPrefix"
+        name="statemachinePrefix"
         optional="true"/>
     <parameters
         name="maxIdentiefierLength"

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

@@ -26,8 +26,8 @@ class CppNamingService extends CNamingService {
 
 	override protected prefix(Step it, char separator) {
 		var prefix = ""
-		if (entry.functionPrefix != null) {
-			prefix = entry.functionPrefix + separator
+		if (entry.statemachinePrefix != null) {
+			prefix = entry.statemachinePrefix + separator
 		}
 		switch (it) {
 			case isCheckFunction: prefix + "check"
@@ -44,8 +44,8 @@ class CppNamingService extends CNamingService {
 	}
 
 	override protected prefix(ExecutionState it, char separator) {
-		if (entry.functionPrefix != null) {
-			entry.functionPrefix
+		if (entry.statemachinePrefix != null) {
+			entry.statemachinePrefix
 		} else {
 			""
 		}
@@ -56,8 +56,8 @@ class CppNamingService extends CNamingService {
 	}
 
 	override protected prefix(TimeEventSpec it, State state, char separator) {
-		if (entry.functionPrefix != null) {
-			entry.functionPrefix
+		if (entry.statemachinePrefix != null) {
+			entry.statemachinePrefix
 		} else {
 			""
 		}

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

@@ -157,7 +157,7 @@ class ExpressionCode {
 		'''«value.definition.event.valueAccess»'''
 	
 	def dispatch CharSequence code (ActiveStateReferenceExpression it)
-		'''«flow.nameOfIsActiveFunction»(«value.shortName»)'''
+		'''«flow.activeFctID»(«value.shortName»)'''
 	
 	def dispatch CharSequence code (ParenthesizedExpression it)
 		'''(«expression.code»)'''

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

@@ -110,11 +110,11 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 		'set_' + name.asIdentifier.toFirstLower	
 	}
 	
-	override nameOfRaiseTimeEventFunction(ExecutionFlow it) {
+	override raiseTimeEventFctID(ExecutionFlow it) {
 		"raiseTimeEvent"
 	}
 	
-	override nameOfIsActiveFunction(ExecutionFlow it) {
+	override isActiveFctID(ExecutionFlow it) {
 		"isActive"
 	}
 	

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

@@ -74,7 +74,7 @@ class StatemachineHeader extends Statemachine {
 				«publicFunctionPrototypes»
 				
 				/*! Checks if the specified state is active. */
-				sc_boolean «nameOfIsActiveFunction»(«statesEnumType» state);
+				sc_boolean «activeFctID»(«statesEnumType» state);
 			
 			private:
 			
@@ -227,7 +227,7 @@ class StatemachineHeader extends Statemachine {
 		
 		«timerInterface»* getTimer();
 		
-		void «nameOfRaiseTimeEventFunction»(sc_eventid event);
+		void «raiseTimeEventFctID»(sc_eventid event);
 	'''
 	
 	override dispatch functionPrototypes(EventDefinition it) '''

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

@@ -198,7 +198,7 @@ class StatemachineImplementation {
 				return «timerInstance»;
 			}
 			
-			void «module»::«nameOfRaiseTimeEventFunction»(sc_eventid evid) {
+			void «module»::«raiseTimeEventFctID»(sc_eventid evid) {
 				if ((evid >= &timeEvents) && (evid < &timeEvents + sizeof(timeEvents))) {
 					*(sc_boolean*)evid = true;
 				}
@@ -207,7 +207,7 @@ class StatemachineImplementation {
 	'''
 	
 	def isActiveFunction(ExecutionFlow it) '''
-		sc_boolean «module»::«nameOfIsActiveFunction»(«statesEnumType» state) {
+		sc_boolean «module»::«activeFctID»(«statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
 				case «s.shortName.asEscapedIdentifier» : 

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

@@ -60,7 +60,7 @@ class TimedStatemachineInterface {
 				/*
 				* Callback method if a time event occurred.
 				*/
-				virtual void «nameOfRaiseTimeEventFunction»(sc_eventid event) = 0;
+				virtual void «raiseTimeEventFctID»(sc_eventid event) = 0;
 		};
 		
 		inline TimedStatemachineInterface::~TimedStatemachineInterface() {}

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

@@ -46,7 +46,7 @@ public class CPPDefaultFeatureValueProvider extends
 				.equals(CFeatureConstants.PARAMETER_MODULE_NAME)) {
 			parameterValue.setValue(asIdentifier(statechart.getName(), "_"));
 		} else if (parameterValue.getParameter().getName()
-				.equals(CFeatureConstants.PARAMETER_FUNCTION_PREFIX)) {
+				.equals(CFeatureConstants.PARAMETER_STATEMACHINE_PREFIX)) {
 			parameterValue.setValue(StringExtensions.toFirstLower(asIdentifier(
 					statechart.getName(), "_")));
 		} else if (parameterValue.getParameter().getName()
@@ -64,7 +64,7 @@ public class CPPDefaultFeatureValueProvider extends
 			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
 				return error("Invalid module name");
 			}
-		} else if (CFeatureConstants.PARAMETER_FUNCTION_PREFIX.equals(parameterName)) {
+		} else if (CFeatureConstants.PARAMETER_STATEMACHINE_PREFIX.equals(parameterName)) {
 			if (!parameter.getStringValue().matches(VALID_IDENTIFIER_REGEX)) {
 				return error("Invalid function prefix name");
 			}