diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 767a3a0..4e2ffbf 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -618,7 +618,7 @@
 										Expression nextExp = dependingMember.getStateTransition().getNextStateExpression();
 										if (nextExp != null && outsideExp instanceof Term) {
 											if (nextExp instanceof Variable) {
-												outsideExp = ((Term) outsideExp).substitute((Variable) nextExp, new Field(JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(dependingMember.getResource().getResourceHierarchy())))); 
+												outsideExp = ((Term) outsideExp).substitute((Variable) nextExp, new Field(langSpec.toVariableName(getComponentName(dependingMember.getResource().getResourceHierarchy(), langSpec)))); 
 											} else {
 												// ToDo.
 											}
@@ -718,7 +718,7 @@
 																Expression nextExp = dependingMember.getStateTransition().getNextStateExpression();
 																if (nextExp != null && outsideExp instanceof Term) {
 																	if (nextExp instanceof Variable) {
-																		outsideExp = ((Term) outsideExp).substitute((Variable) nextExp, new Field(JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(dependingMember.getResource().getResourceHierarchy())))); 
+																		outsideExp = ((Term) outsideExp).substitute((Variable) nextExp, new Field(langSpec.toVariableName(getComponentName(dependingMember.getResource().getResourceHierarchy(), langSpec)))); 
 																	} else {
 																		// ToDo.
 																	}
@@ -907,7 +907,7 @@
 							updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getPullAccessor());
 							String newState = updateExp.toImplementation(sideEffects);
 							ResourceHierarchy resource = resourceNode.getResourceHierarchy();
-							if (JavaCodeGenerator.generatesComponent(resource)) {
+							if (generatesComponent(resource)) {
 								String updateStatement;
 								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
 									updateStatement = sideEffects[0];	
@@ -938,7 +938,7 @@
 										String newMap = selector.toImplementation(sideEffects2);
 										updateStatement = sideEffects[0] + sideEffects2[0];
 									} else {
-										String resourceName = JavaCodeGenerator.toVariableName(JavaCodeGenerator.getComponentName(resource));
+										String resourceName = langSpec.toVariableName(getComponentName(resource, langSpec));
 										updateStatement = sideEffects[0] + langSpec.getFieldAccessor(resourceName) + langSpec.getAssignment() + newState + langSpec.getStatementDelimiter();
 									}
 									if (updateStatement != null) {