diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/GeneralModuleTypeForIdea.java b/java/idea-ui/src/com/intellij/ide/projectWizard/GeneralModuleTypeForIdea.java
index 1e02ddd72fff..f190516da4e3 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/GeneralModuleTypeForIdea.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/GeneralModuleTypeForIdea.java
@@ -6,8 +6,11 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep;
 import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.module.GeneralModuleType;
+import com.intellij.ui.ScrollPaneFactory;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+import java.awt.*;
 import java.util.List;
 
 public class GeneralModuleTypeForIdea extends GeneralModuleType {
@@ -24,6 +27,10 @@ public class GeneralModuleTypeForIdea extends GeneralModuleType {
                                                             Disposable parentDisposable) {
         ProjectSettingsStep step = new ProjectSettingsStep(context);
         step.getExpertPlaceholder().removeAll();
+        JTextPane textPane = new JTextPane();
+        textPane.setText(getDescription());
+        step.getExpertPlaceholder().setMinimumSize(new Dimension(0, 100));
+        step.getExpertPlaceholder().add(ScrollPaneFactory.createScrollPane(textPane));
         return step;
       }
     };
diff --git a/platform/ide-core/resources/messages/ProjectBundle.properties b/platform/ide-core/resources/messages/ProjectBundle.properties
index 7a4d539e82b9..e177aab82782 100644
--- a/platform/ide-core/resources/messages/ProjectBundle.properties
+++ b/platform/ide-core/resources/messages/ProjectBundle.properties
@@ -172,7 +172,7 @@ label.text.0.cannot.be.loaded.remove={0} cannot be loaded. You can remove them f
 label.text.0.cannot.be.loaded.ignore={0} cannot be loaded. You can mark them as ignored to suppress this error notification.
 
 #new project wizard
-module.type.empty.name=Empty Project
+module.type.empty.name=Multi-module project
 module.type.empty.description=Dialog Project Structure will open to help you build the project structure
 
 library.docs.node=Documentation
@@ -276,8 +276,8 @@ list.item.group.by.directory=Directory
 label.directory.will.be.excluded.from.framework.detection=''{0}'' directory will be excluded from framework detection
 label.framework.detection.will.be.disabled=''{0}'' framework detection will be disabled.
 plugins.advertiser.feature.facet=facet
-module.type.general=General
-general.purpose.type.to.support.any.kind.of.development=General purpose type to support any kind of development
+module.type.general=Empty Project
+general.purpose.type.to.support.any.kind.of.development=Simple project with one module
 failed.to.resolve.sdk.notification.title=Failed to resolve SDK
 try.to.find.sdk.notification.action=Try to Find SDK
 resolve.sdk.task.name=Resolve SDK
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/GeneralModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/GeneralModuleType.java
index 521f4d5955bf..f8d9a499298f 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/GeneralModuleType.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/GeneralModuleType.java
@@ -2,6 +2,7 @@
 package com.intellij.openapi.module;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.projectWizard.ModuleBuilder;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.ProjectBundle;
@@ -65,6 +66,11 @@ public class GeneralModuleType extends ModuleType<ModuleBuilder>{
       return INSTANCE;
     }
 
+    @Override
+    public String getGroupName() {
+      return IdeBundle.message("empty.project.generator.name");
+    }
+
     @Override
     public boolean isAvailable() {
       return Registry.is("general.project.type", true);
diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties
index a505644acc31..4ace8bdcacce 100644
--- a/platform/platform-api/resources/messages/IdeBundle.properties
+++ b/platform/platform-api/resources/messages/IdeBundle.properties
@@ -1573,8 +1573,8 @@ plugins.advertiser.feature.dependency=dependency
 
 do.not.ask.me.again=Don't ask again
 
-empty.project.generator.name=Empty Project
-empty.project.generator.description=Empty project without modules. Use it to create free-style module structure.
+empty.project.generator.name=Multi-module Project
+empty.project.generator.description=Project without modules. Use it to create free-style module structure. Project Structure dialog will open to help you build the project structure.
 
 terminal.action.NewSession.text=New Session
 terminal.action.ClearBuffer.text=Clear Buffer