diff --git a/AlgebraicDataflowArchitectureModel/models/SimpleUI.model b/AlgebraicDataflowArchitectureModel/models/SimpleUI.model
index 6d4cb43..b105544 100644
--- a/AlgebraicDataflowArchitectureModel/models/SimpleUI.model
+++ b/AlgebraicDataflowArchitectureModel/models/SimpleUI.model
@@ -2,15 +2,17 @@
 	screenTemplates := {
 				"000": {"widgets": {"001": {"type": "textInput", "text": "", "state": 0, "visible": true}, 
 									"002": {"type": "button", "text": "Next", "state": 0, "visible": true}}, 
-						"layout": true},
+						"layout": true,
+						"screenId": "000"},
 				"001": {"widgets": {"003": {"type": "label", "text": "label", "state": 0, "visible": true}, 
 									"004": {"type": "button", "text": "Back", "state": 0, "visible": true}}, 
-						"layout": true}
+						"layout": true,
+						"screenId": "001"}
 				}
 }
 
 native channel ScreenUpdate {
-	in screen(curSc: Json, update(curSc, nextSc)) = nextSc
+	in screen(curSc: Json, screenUpdate(curSc, nextSc)) = nextSc
 }
 
 native channel SetLayout {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index 7b819b4..9c77ea6 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -388,7 +388,7 @@
 					composerSub.setType(DataConstraintModel.typeMap);
 					for (ResourceHierarchy child: resourceHierarchy.getChildren()) {
 						String childTypeName = getComponentName(child, langSpec);
-						String fieldName = langSpec.toVariableName(childTypeName);
+						String fieldName = child.getResourceName();
 						Term childGetter = null; 
 						if (!generatesComponent(child)) {
 							// the child is not a class
@@ -428,7 +428,7 @@
 		} else if (DataConstraintModel.typeMap.isAncestorOf(ancestor.getResourceStateType())) {
 			selector = new Variable(langSpec.getFieldAccessor(fieldOfResourceState));
 		} else {
-			String fieldName = langSpec.toVariableName(getComponentName(child, langSpec));
+			String fieldName = child.getResourceName();
 			selector = new Variable(langSpec.getFieldAccessor(fieldName));
 		}
 		if (descendantGetter.getParameters() != null) {
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
index d8f4ae2..c87b111 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
@@ -543,7 +543,7 @@
 					if (generatesComponent(c)) {
 						// The child has a component.
 						childType = new Type(childTypeName, childTypeName);
-						String fieldName = langSpec.toVariableName(childTypeName);
+						String fieldName = c.getResourceName();
 						FieldDeclaration stateField = langSpec.newFieldDeclaration(childType, fieldName, langSpec.getConstructorInvocation(childTypeName, new ArrayList<>()));
 						component.addField(stateField);
 					}