diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index 285af81..67ea910 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -18,6 +18,7 @@
 import models.algebra.Expression;
 import models.algebra.InvalidMessage;
 import models.algebra.ParameterizedIdentifierIsFutureWork;
+import models.algebra.Position;
 import models.algebra.Term;
 import models.algebra.Type;
 import models.algebra.UnificationFailed;
@@ -312,8 +313,25 @@
 					if (message instanceof Term) {
 						// Declare an input method in this component.
 						ArrayList<VariableDeclaration> params = new ArrayList<>();
-						for (Variable var: message.getVariables().values()) {
-							params.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));
+						for (Map.Entry<Position, Variable> varEnt: message.getVariables().entrySet()) {
+							Variable var = varEnt.getValue();
+							String refVarName = null;
+							for (ChannelMember refCm: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+								Expression varExp = refCm.getStateTransition().getMessageExpression().getSubTerm(varEnt.getKey());
+								if (varExp != null && varExp instanceof Variable) {
+									if (refCm.getStateTransition().getCurStateExpression().contains(varExp)) {
+										refVarName = refCm.getResource().getResourceName();
+										break;
+									}
+								}
+							}
+							if (refVarName != null) {
+								// var has come from a reference resource.
+								params.add(langSpec.newVariableDeclaration(var.getType(), refVarName));
+							} else {
+								// var has not come from reference resource.
+								params.add(langSpec.newVariableDeclaration(var.getType(), var.getName()));
+							}
 						}
 						input = langSpec.newMethodDeclaration(((Term) message).getSymbol().getImplName(), false, null, params);
 						component.addMethod(input);
@@ -358,8 +376,20 @@
 					if (mainInput != null) {
 						List<String> args = new ArrayList<>();
 						if (message instanceof Term) {
-							for (Variable var: message.getVariables().values()) {
-								args.add(var.getName());
+							for (Map.Entry<Position, Variable> varEnt: message.getVariables().entrySet()) {
+								String refVarName = null;
+								for (ChannelMember rc: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+									Expression varExp = rc.getStateTransition().getMessageExpression().getSubTerm(varEnt.getKey());
+									if (varExp != null && rc.getStateTransition().getCurStateExpression().contains(varExp)) {
+										refVarName = rc.getResource().getResourceName();
+										break;
+									}
+								}
+								if (refVarName != null) {
+									args.add(refVarName);
+								} else {
+									args.add(varEnt.getValue().getName());									
+								}
 							}
 						}
 						mainInput.addStatement(langSpec.getMethodInvocation(langSpec.getFieldAccessor(resName), input.getName(), args) + langSpec.getStatementDelimiter());
@@ -370,7 +400,7 @@
 						try {
 							String[] sideEffects = new String[] {""};
 							Expression updateExp;
-							updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getPullAccessor());
+							updateExp = ((DataTransferChannel) ch).deriveUpdateExpressionOf(out, getRefAccessor());
 							String newState = updateExp.toImplementation(sideEffects);
 							String updateStatement;
 							if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
index e940b89..350ea16 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaCodeGenerator.java
@@ -4,6 +4,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -19,6 +20,7 @@
 import models.algebra.Expression;
 import models.algebra.Field;
 import models.algebra.Parameter;
+import models.algebra.Position;
 import models.algebra.Symbol;
 import models.algebra.Term;
 import models.algebra.Type;
@@ -203,8 +205,25 @@
 						Expression message = cm.getStateTransition().getMessageExpression();
 						if (message instanceof Term) {
 							ArrayList<VariableDeclaration> params = new ArrayList<>();
-							for (Variable var: message.getVariables().values()) {
-								params.add(new VariableDeclaration(var.getType(), var.getName()));
+							for (Map.Entry<Position, Variable> varEnt: message.getVariables().entrySet()) {
+								Variable var = varEnt.getValue();
+								String refVarName = null;
+								for (ChannelMember refCm: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+									Expression varExp = refCm.getStateTransition().getMessageExpression().getSubTerm(varEnt.getKey());
+									if (varExp != null && varExp instanceof Variable) {
+										if (refCm.getStateTransition().getCurStateExpression().contains(varExp)) {
+											refVarName = refCm.getResource().getResourceName();
+											break;
+										}
+									}
+								}
+								if (refVarName != null) {
+									// var has come from a reference resource.
+									params.add(new VariableDeclaration(var.getType(), refVarName));
+								} else {
+									// var has not come from reference resource.
+									params.add(new VariableDeclaration(var.getType(), var.getName()));
+								}
 							}
 							MethodDeclaration input = new MethodDeclaration(
 									((Term) cm.getStateTransition().getMessageExpression()).getSymbol().getImplName(),
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 63e7516..9c61208 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -16,6 +16,7 @@
 import models.algebra.Expression;
 import models.algebra.InvalidMessage;
 import models.algebra.ParameterizedIdentifierIsFutureWork;
+import models.algebra.Position;
 import models.algebra.Term;
 import models.algebra.Type;
 import models.algebra.UnificationFailed;
@@ -246,7 +247,7 @@
 							MethodDeclaration input = getInputMethod(type, out);
 							if (input != null) {
 								String[] sideEffects = new String[] {""};
-								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JavaCodeGenerator.pushAccessor);
+								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JavaCodeGenerator.refAccessor);
 								String newState = updateExp.toImplementation(sideEffects);
 								String updateStatement;
 								if (updateExp instanceof Term && ((Term) updateExp).getSymbol().isImplWithSideEffect()) {
@@ -264,8 +265,20 @@
 										String delimitar = "";
 										if (out.getStateTransition().getMessageExpression() instanceof Term) {
 											Term message = (Term) out.getStateTransition().getMessageExpression();
-											for (Variable var: message.getVariables().values()) {
-												args += delimitar + var.getName();
+											for (Map.Entry<Position, Variable> varEnt: message.getVariables().entrySet()) {
+												String refVarName = null;
+												for (ChannelMember rc: entry.getKey().getReferenceChannelMembers()) {
+													Expression varExp = rc.getStateTransition().getMessageExpression().getSubTerm(varEnt.getKey());
+													if (varExp != null && rc.getStateTransition().getCurStateExpression().contains(varExp)) {
+														refVarName = rc.getResource().getResourceName();
+														break;
+													}
+												}
+												if (refVarName != null) {
+													args += delimitar + refVarName;
+												} else {
+													args += delimitar + varEnt.getValue().getName();
+												}
 												delimitar = ", ";
 											}
 										}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
index 2405c20..b084c66 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import code.ast.Annotation;
@@ -17,6 +18,7 @@
 import models.algebra.Expression;
 import models.algebra.Field;
 import models.algebra.Parameter;
+import models.algebra.Position;
 import models.algebra.Symbol;
 import models.algebra.Term;
 import models.algebra.Type;
@@ -158,11 +160,30 @@
 						Expression message = cm.getStateTransition().getMessageExpression();
 						if (message instanceof Term) {
 							ArrayList<VariableDeclaration> params = new ArrayList<>();
-							for (Variable var: message.getVariables().values()) {
-								String paramName = var.getName();
-								VariableDeclaration param = new VariableDeclaration(var.getType(), paramName);
-								param.addAnnotation(new Annotation("FormParam", "\"" + paramName + "\""));
-								params.add(param);
+							for (Map.Entry<Position, Variable> varEnt: message.getVariables().entrySet()) {
+								Variable var = varEnt.getValue();
+								String refVarName = null;
+								for (ChannelMember refCm: ((DataTransferChannel) ch).getReferenceChannelMembers()) {
+									Expression varExp = refCm.getStateTransition().getMessageExpression().getSubTerm(varEnt.getKey());
+									if (varExp != null && varExp instanceof Variable) {
+										if (refCm.getStateTransition().getCurStateExpression().contains(varExp)) {
+											refVarName = refCm.getResource().getResourceName();
+											break;
+										}
+									}
+								}
+								if (refVarName != null) {
+									// var has come from a reference resource.
+									VariableDeclaration param = new VariableDeclaration(var.getType(), refVarName);
+									param.addAnnotation(new Annotation("FormParam", "\"" + refVarName + "\""));
+									params.add(param);
+								} else {
+									// var has not come from reference resource.
+									String paramName = var.getName();
+									VariableDeclaration param = new VariableDeclaration(var.getType(), paramName);
+									param.addAnnotation(new Annotation("FormParam", "\"" + paramName + "\""));
+									params.add(param);
+								}
 							}
 							MethodDeclaration input = new MethodDeclaration(
 									((Term) message).getSymbol().getImplName(),
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index 1a4b1c6..ddc3ba7 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -311,7 +311,7 @@
 						for (ChannelMember out: outs) {
 							MethodDeclaration input = getInputMethod(type, out);
 							if (input != null) {
-								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JerseyCodeGenerator.pushAccessor);
+								Expression updateExp = entry.getKey().deriveUpdateExpressionOf(out, JerseyCodeGenerator.refAccessor);
 								String[] sideEffects = new String[] {""};
 								String newState = updateExp.toImplementation(sideEffects);
 								String updateStatement;