diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 451dbe665075..d8b2ae99664f 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -28,8 +28,8 @@ 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
-android.module.type.description=Android modules are used for developing mobile applications targeting the <b>Android</b> OS.
+android.module.type.name=Android 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
 not.valid.package.name.error=Not a valid package name "{0}"
diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
index 879b7a5441de..2af83cfad0fa 100644
--- a/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
+++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidProjectTemplatesFactory.java
@@ -45,7 +45,7 @@ public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
     ProjectTemplate[] templates = {
       new BuilderBasedTemplate(new AndroidModuleBuilder()),
       new AndroidProjectTemplate("Empty Android Module",
-                                 "Simple <b>Android</b> module with configured Android SDK and without any pre-defined structure",
+                                 "Simple Android module with configured Android SDK and without any pre-defined structure",
                                  new AndroidModuleBuilder(null) {
 
                                    @Override
@@ -61,14 +61,19 @@ public class AndroidProjectTemplatesFactory implements ProjectTemplatesFactory {
                                  }),
 
       new AndroidProjectTemplate("Android Library Module",
-                                 "",
+                                 "Android library modules hold shared Android source code and resources " +
+                                 "that can be referenced by other Android modules",
                                  new AndroidModuleBuilder.Library())
     };
     if (context.getProject() == null) {
       return templates;
     }
     else {
-      AndroidProjectTemplate test = new AndroidProjectTemplate("Android Test Module", "", new AndroidModuleBuilder.Test());
+      AndroidProjectTemplate test = new AndroidProjectTemplate("Android 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>",
+                                                               new AndroidModuleBuilder.Test());
       return ArrayUtil.append(templates, test);
     }
   }