diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
index 27f8a2b..674af3e 100644
--- a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
+++ b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
@@ -41,4 +41,4 @@
 # PopUp Actions
 changeCallOrder=Change Call Order
 insertMediator=Produce Mediator
-dependOnMediator=Depend On Mediator
+dependsOnMediator=Depends On Mediator
diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
index 1e0bb46..8cb8f38 100644
--- a/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
+++ b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
@@ -41,4 +41,4 @@
 # PopUp Actions
 changeCallOrder=\u547C\u3073\u51FA\u3057\u9806\u306E\u5909\u66F4
 insertMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u5C0E\u5165
-dependOnMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3078\u4F9D\u5B58
\ No newline at end of file
+dependsOnMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3078\u4F9D\u5B58
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java
index e16ab25..1960e16 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java
@@ -17,7 +17,7 @@
 	/*************************************************************
 	 */
 	public ShowDependentableMediatorAction(final ControlFlowDelegationStage stage, final mxGraphComponent graphComponent, final mxCell targetCell) {
-		super(/*propName*/"dependOnMediator", targetCell, graphComponent);
+		super(/*propName*/"dependsOnMediator", targetCell, graphComponent);
 		this.stage = stage;		
 	}
 
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java
index 92103b7..3d5098d 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java
@@ -142,7 +142,7 @@
 		if(targetMediatorCell == null) return;
 		
 		ControlFlowDelegationStage cfdStage = (ControlFlowDelegationStage) stage;
-		cfdStage.dependentObjectNode(graphComponent.getGraph(), targetEdgeCell, targetMediatorCell);
+		cfdStage.dependsOnMediatorObject(graphComponent.getGraph(), targetEdgeCell, targetMediatorCell);
 	}
 	
 	/************************************************************
diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
index 3cbcfea..dd4ba5e 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
@@ -293,7 +293,7 @@
 	/*************************************************************
 	 * 
 	 */
-	public void dependentObjectNode(mxGraph graph, mxCell targetEdgeCell ,mxCell targetObjNodeCell) {
+	public void dependsOnMediatorObject(mxGraph graph, mxCell targetEdgeCell ,mxCell targetMediatorObjNodeCell) {
 		CallEdgeAttribute targetCallEdgeAttr = (CallEdgeAttribute)targetEdgeCell.getValue();
 		if(targetCallEdgeAttr == null) return;
 		
@@ -311,7 +311,7 @@
 			if(!(srcObjNode instanceof ObjectNode && dstObjNode instanceof ObjectNode)) throw new ClassCastException();
 
 			// Get target "Mediator Object"
-			ObjectNodeAttribute targetObjNodeAttr = (ObjectNodeAttribute)targetObjNodeCell.getValue();
+			ObjectNodeAttribute targetObjNodeAttr = (ObjectNodeAttribute)targetMediatorObjNodeCell.getValue();
 			if(targetObjNodeAttr == null) throw new NullPointerException();
 			
 			ObjectNode targetMediatorObjNode = targetObjNodeAttr.getObjectNode();
@@ -374,7 +374,7 @@
 					if(graph.getModel().getValue(targetEdgeCell) != null)
 						graph.getModel().remove(targetEdgeCell);
 
-					graph.insertEdge(pullFlowLayerCell, null,  compositeEdgeAttr, srcNodeCell, targetObjNodeCell, "movable=false;");
+					graph.insertEdge(pullFlowLayerCell, null,  compositeEdgeAttr, srcNodeCell, targetMediatorObjNodeCell, "movable=false;");
 					continue;
 				}