diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
index 6f07049..c2ae6db 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java
@@ -45,7 +45,7 @@
 				ResourceNode srcNode = (ResourceNode) e.getSource();
 				ResourceNode dstNode = (ResourceNode) e.getDestination();			
 				// same direction as the data flow
-				pullCallGraph.addEdge(srcNode, dstNode);
+				pushCallGraph.addEdge(srcNode, dstNode);
 			}			
 		} else {
 			// pull-first
diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ObjectNode.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ObjectNode.java
index d54d57d..3fa5ca6 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ObjectNode.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ObjectNode.java
@@ -7,11 +7,21 @@
 import models.Node;
 
 public class ObjectNode extends Node {
-	public ObjectNode() {
+	private String name;
+	
+	public ObjectNode(String name) {
 		inEdges = new ArrayList<>();
 		outEdges = new ArrayList<>();		
 	}
 
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public CallEdge getOutEdge(int i) {
 		return (CallEdge) ((List<Edge>) outEdges).get(i);
 	}
diff --git a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/StatefulObjectNode.java b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/StatefulObjectNode.java
index d15155c..184774d 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/StatefulObjectNode.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/StatefulObjectNode.java
@@ -6,6 +6,7 @@
 	private ResourceNode resource;
 	
 	public StatefulObjectNode(ResourceNode resource) {
+		super(resource.getIdentifierTemplate().getResourceName());
 		this.resource = resource;
 	}