diff --git a/java/java-impl/src/resources/projectTemplates/Java/Java_Command_Line_Application.zip b/java/java-impl/src/resources/projectTemplates/Java/Command_Line_Application.zip
similarity index 100%
rename from java/java-impl/src/resources/projectTemplates/Java/Java_Command_Line_Application.zip
rename to java/java-impl/src/resources/projectTemplates/Java/Command_Line_Application.zip
diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 4eb47e0fa348..0138c79faf0d 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -28,7 +28,7 @@ build.android.module.process.title=Create Android main package
 package.name.must.contain.2.ids.error=A package name must contain 2 segments (i.e. com.example)
 specify.platform.error=Please specify Android SDK
 specify.main.package.error=Android main package in module {0} not specified
-android.module.type.name=Android Application Module
+android.module.type.name=Application Module
 android.module.type.description=Android application modules are used for developing mobile applications targeting the Android OS.
 not.valid.acvitiy.name.error=Not a valid Activity name "{0}"
 specify.package.name.error=A package name must be specified
diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
index 2af83cfad0fa..c90602408382 100644
--- a/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
+++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
@@ -32,6 +32,9 @@ import org.jetbrains.annotations.Nullable;
 public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
 
   public static final String ANDROID = "Android";
+  public static final String EMPTY_MODULE = "Empty Module";
+  public static final String LIBRARY_MODULE = "Library Module";
+  public static final String TEST_MODULE = "Test Module";
 
   @NotNull
   @Override
@@ -44,7 +47,7 @@ public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
   public ProjectTemplate[] createTemplates(String group, WizardContext context) {
     ProjectTemplate[] templates = {
       new BuilderBasedTemplate(new AndroidModuleBuilder()),
-      new AndroidProjectTemplate("Empty Android Module",
+      new AndroidProjectTemplate(EMPTY_MODULE,
                                  "Simple Android module with configured Android SDK and without any pre-defined structure",
                                  new AndroidModuleBuilder(null) {
 
@@ -60,7 +63,7 @@ public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
                                    }
                                  }),
 
-      new AndroidProjectTemplate("Android Library Module",
+      new AndroidProjectTemplate(LIBRARY_MODULE,
                                  "Android library modules hold shared Android source code and resources " +
                                  "that can be referenced by other Android modules",
                                  new AndroidModuleBuilder.Library())
@@ -69,7 +72,7 @@ public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
       return templates;
     }
     else {
-      AndroidProjectTemplate test = new AndroidProjectTemplate("Android Test Module",
+      AndroidProjectTemplate test = new AndroidProjectTemplate(TEST_MODULE,
                                                                "Android test modules contain Android applications that you write using " +
                                                                "the <a href='http://developer.android.com/tools/testing/index.html'>" +
                                                                "Testing and Instrumentation framework</a>",
diff --git a/plugins/android/testSrc/org/jetbrains/android/AndroidProjectWizardTest.java b/plugins/android/testSrc/org/jetbrains/android/AndroidProjectWizardTest.java
index cabe56dd69c9..d0f28117852c 100644
--- a/plugins/android/testSrc/org/jetbrains/android/AndroidProjectWizardTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/AndroidProjectWizardTest.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
 public class AndroidProjectWizardTest extends ProjectWizardTestCase {
 
   public void testCreateProject() throws Exception {
-    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, "Android Application Module", new Consumer<ModuleWizardStep>() {
+    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, "Application Module", new Consumer<ModuleWizardStep>() {
       @Override
       public void consume(ModuleWizardStep step) {
         if (step instanceof AndroidModuleWizardStep) {
@@ -54,7 +54,7 @@ public class AndroidProjectWizardTest extends ProjectWizardTestCase {
   }
 
   public void testCreateLibrary() throws Exception {
-    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, "Android Library Module", new Consumer<ModuleWizardStep>() {
+    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, AndroidProjectTemplatesFactory.LIBRARY_MODULE, new Consumer<ModuleWizardStep>() {
       @Override
       public void consume(ModuleWizardStep step) {
         if (step instanceof AndroidModuleWizardStep) {
@@ -68,7 +68,7 @@ public class AndroidProjectWizardTest extends ProjectWizardTestCase {
   }
 
   public void testCreateEmptyProject() throws Exception {
-    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, "Empty Android Module", null);
+    createProjectFromTemplate(AndroidProjectTemplatesFactory.ANDROID, AndroidProjectTemplatesFactory.EMPTY_MODULE, null);
   }
 
   @Override