diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
index ac26d9b..9436d17 100644
--- a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
+++ b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
@@ -44,6 +44,6 @@
 pushpullExtension = PUSH/PULL Extension
 
 # PopUp Actions
-changeCallOrder=Change Call Order
+changeCallOrder=Reorder Calls
 insertMediator=Introduce Mediator
 dependsOnMediator=Depends On Mediator
diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java
index 238f283..253dfd7 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationLanguage.java
@@ -9,7 +9,6 @@
 import java.util.ResourceBundle;
 
 /***********************************************************************
- * アプリケーションの言語を切り替える（シングルトン）
  */
 public class ApplicationLanguage {
 	private Locale locale = null;
@@ -46,21 +45,18 @@
 	}
 
 	/***********************************************************************
-	/***********************************************************************
 	 * [ *public ]
 	 /***********************************************************************
-	 * ローカルの .properties から言語情報を切り替え. 
-	 * @param language 変更先の言語
 	 */
 	public void setLocaleLanguage(final String language) {
 		URL resURL = null;
-		try {
-			File resDir = Paths.get(RESOURCE_PATH).toFile();		// for Eclipse project
-			resURL = resDir.toURI().toURL();
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		}
-//		resURL = this.getClass().getClassLoader().getResource(RESOURCE_PATH);	// for executable jar
+//		try {
+//			File resDir = Paths.get(RESOURCE_PATH).toFile();		// for Eclipse project
+//			resURL = resDir.toURI().toURL();
+//		} catch (MalformedURLException e) {
+//			e.printStackTrace();
+//		}
+		resURL = this.getClass().getClassLoader().getResource(RESOURCE_PATH);	// for executable jar
 		URLClassLoader urlLoader = new URLClassLoader(new URL[] { resURL });
 		this.resBundle = ResourceBundle.getBundle(language, this.locale, urlLoader);
 		
@@ -74,8 +70,8 @@
 	}
 
 	/***********************************************************************
-	 * オプション名に対応した名前を返す. 
-	 * @param propName 取得したいプロパティの名前
+	 * 繧ｪ繝励す繝ｧ繝ｳ蜷阪↓蟇ｾ蠢懊＠縺溷錐蜑阪ｒ霑斐☆. 
+	 * @param propName 蜿門ｾ励＠縺溘＞繝励Ο繝代ユ繧｣縺ｮ蜷榊燕
 	 */
 	public String getOptionByPropName(final String propName) {
 //		return properties.getProperty(propName);
diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
index d4a58e1..02d6e94 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
@@ -26,7 +26,7 @@
  */
 public class ApplicationWindow extends JFrame {
 	private static final long serialVersionUID = -8690140317781055614L;
-	public static final String title = "Visual Modeling Tool";
+	public static final String title = "Prototype Generation Tool";
 	public static final Logger logger = Logger.getLogger("dtram");
 		
 	private Editor editor = null;
@@ -52,7 +52,7 @@
 		logger.log(Level.INFO, "launched");
 		
 		// If you want to change the language, change here.
-		ApplicationLanguage.getInstance().setLocaleLanguage(ApplicationLanguage.JP);
+		ApplicationLanguage.getInstance().setLocaleLanguage(ApplicationLanguage.EN);
 
 		this.graph = new mxGraph() {
 			public boolean isPort(Object cell) {