diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java
index 3de83437a9fe..0e5b4d4eb40b 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java
@@ -1,5 +1,7 @@
 package org.jetbrains.jps.incremental;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * @see ModuleLevelBuilder
  * @see TargetBuilder
@@ -7,9 +9,8 @@ package org.jetbrains.jps.incremental;
  * @author nik
  */
 public abstract class Builder {
-  public abstract String getName();
-
-  public abstract String getDescription();
+  @NotNull
+  public abstract String getPresentableName();
 
   public void buildStarted(CompileContext context) {
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 60371990fb4a..88a8830c6304 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -763,7 +763,7 @@ public class IncProjectBuilder {
             doneSomething |= (buildResult != ModuleLevelBuilder.ExitCode.NOTHING_DONE);
 
             if (buildResult == ModuleLevelBuilder.ExitCode.ABORT) {
-              throw new ProjectBuildException("Builder " + builder.getDescription() + " requested build stop");
+              throw new ProjectBuildException("Builder " + builder.getPresentableName() + " requested build stop");
             }
             context.checkCanceled();
             if (buildResult == ModuleLevelBuilder.ExitCode.ADDITIONAL_PASS_REQUIRED) {
@@ -777,7 +777,7 @@ public class IncProjectBuilder {
             }
             else if (buildResult == ModuleLevelBuilder.ExitCode.CHUNK_REBUILD_REQUIRED) {
               if (!rebuildFromScratchRequested && !context.isProjectRebuild()) {
-                LOG.info("Builder " + builder.getDescription() + " requested rebuild of module chunk " + chunk.getName());
+                LOG.info("Builder " + builder.getPresentableName() + " requested rebuild of module chunk " + chunk.getName());
                 // allow rebuild from scratch only once per chunk
                 rebuildFromScratchRequested = true;
                 try {
@@ -795,7 +795,7 @@ public class IncProjectBuilder {
                 }
               }
               else {
-                LOG.debug("Builder " + builder.getDescription() + " requested second chunk rebuild");
+                LOG.debug("Builder " + builder.getPresentableName() + " requested second chunk rebuild");
               }
             }
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java
index 961b2cd6a3a4..e01abefbb4f2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author nik
  */
 public class IncArtifactBuilder extends TargetBuilder<ArtifactRootDescriptor, ArtifactBuildTarget> {
-  public static final String BUILDER_NAME = "artifacts";
+  public static final String BUILDER_NAME = "Artifacts builder";
 
   public IncArtifactBuilder() {
     super(Collections.singletonList(ArtifactBuildTargetType.INSTANCE));
@@ -245,13 +245,9 @@ public class IncArtifactBuilder extends TargetBuilder<ArtifactRootDescriptor, Ar
     });
   }
 
+  @NotNull
   @Override
-  public String getName() {
+  public String getPresentableName() {
     return BUILDER_NAME;
   }
-
-  @Override
-  public String getDescription() {
-    return "Artifacts builder";
-  }
 }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index 544cefd5aba7..5e4791120eeb 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -177,15 +177,11 @@ public class JavaBuilder extends ModuleLevelBuilder {
     return removed != null && !removed.isEmpty();
   }
 
-  @Override
-  public String getName() {
+  @NotNull
+  public String getPresentableName() {
     return BUILDER_NAME;
   }
 
-  public String getDescription() {
-    return "Java Builder";
-  }
-
   public ExitCode build(final CompileContext context,
                         final ModuleChunk chunk,
                         DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder) throws ProjectBuildException {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
index 3a4d3340ba11..da58d1fa6d10 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
@@ -3,6 +3,7 @@ package org.jetbrains.jps.incremental.resources;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.ModuleChunk;
 import org.jetbrains.jps.builders.DirtyFilesHolder;
 import org.jetbrains.jps.builders.FileProcessor;
@@ -27,7 +28,7 @@ import java.util.List;
  */
 public class ResourcesBuilder extends ModuleLevelBuilder {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.resourses.ResourcesBuilder");
-  public static final String BUILDER_NAME = "resources";
+  public static final String BUILDER_NAME = "Resource Compiler";
   private static final List<StandardResourceBuilderEnabler> ourEnablers = new ArrayList<StandardResourceBuilderEnabler>();
 
   public ResourcesBuilder() {
@@ -38,11 +39,6 @@ public class ResourcesBuilder extends ModuleLevelBuilder {
     ourEnablers.add(enabler);
   }
 
-  @Override
-  public String getName() {
-    return BUILDER_NAME;
-  }
-
   @Override
   public void buildStarted(CompileContext context) {
     // init patterns
@@ -131,8 +127,9 @@ public class ResourcesBuilder extends ModuleLevelBuilder {
     }
   }
 
-  public String getDescription() {
-    return "Resource Builder";
+  @NotNull
+  public String getPresentableName() {
+    return "Resource Compiler";
   }
 
 }
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
index fdf3b5cbdb15..546e5416b89f 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidDexBuilder.java
@@ -61,8 +61,7 @@ import java.util.*;
  */
 public class AndroidDexBuilder extends TargetBuilder<BuildRootDescriptor,AndroidBuildTarget> {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.android.AndroidDexBuilder");
-
-  @NonNls private static final String BUILDER_NAME = "android-dex";
+  @NonNls private static final String BUILDER_NAME = "Android Dex";
 
   private static final Key<BuildListener> BUILD_LISTENER_KEY = Key.create("BUILD_LISTENER_KEY");
   public static final Key<Set<String>> DIRTY_OUTPUT_DIRS = Key.create("DIRTY_OUTPUT_DIRS");
@@ -274,16 +273,12 @@ public class AndroidDexBuilder extends TargetBuilder<BuildRootDescriptor,Android
     return true;
   }
 
+  @NotNull
   @Override
-  public String getName() {
+  public String getPresentableName() {
     return BUILDER_NAME;
   }
 
-  @Override
-  public String getDescription() {
-    return "Android Dex Builder";
-  }
-
   @Override
   public void buildStarted(CompileContext context) {
     final HashSet<String> dirtyOutputDirs = new HashSet<String>();
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidLibraryPackagingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidLibraryPackagingBuilder.java
index 013a36f27553..fdd9e0c4e7c2 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidLibraryPackagingBuilder.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidLibraryPackagingBuilder.java
@@ -4,6 +4,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.android.util.AndroidCommonUtils;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.ModuleChunk;
 import org.jetbrains.jps.ProjectPaths;
 import org.jetbrains.jps.android.model.JpsAndroidModuleExtension;
@@ -21,7 +22,7 @@ import java.util.Set;
  * @author Eugene.Kudelevsky
  */
 public class AndroidLibraryPackagingBuilder extends ModuleLevelBuilder {
-  @NonNls private static final String BUILDER_NAME = "android-library-packager";
+  @NonNls private static final String BUILDER_NAME = "Android Library Packaging";
 
   protected AndroidLibraryPackagingBuilder() {
     super(BuilderCategory.CLASS_POST_PROCESSOR);
@@ -90,13 +91,9 @@ public class AndroidLibraryPackagingBuilder extends ModuleLevelBuilder {
     return success ? (doneSomething ? ExitCode.OK : ExitCode.NOTHING_DONE) : ExitCode.ABORT;
   }
 
+  @NotNull
   @Override
-  public String getName() {
+  public String getPresentableName() {
     return BUILDER_NAME;
   }
-
-  @Override
-  public String getDescription() {
-    return "Android Library Packaging Builder";
-  }
 }
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java
index 0f0946a4c2eb..436856876c46 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidPackagingBuilder.java
@@ -45,7 +45,7 @@ import java.util.*;
  * @author Eugene.Kudelevsky
  */
 public class AndroidPackagingBuilder extends TargetBuilder<BuildRootDescriptor, AndroidBuildTarget> {
-  @NonNls private static final String BUILDER_NAME = "android-packager";
+  @NonNls private static final String BUILDER_NAME = "Android Packager";
   @NonNls private static final String RELEASE_SUFFIX = ".release";
   @NonNls private static final String UNSIGNED_SUFFIX = ".unsigned";
 
@@ -53,16 +53,12 @@ public class AndroidPackagingBuilder extends TargetBuilder<BuildRootDescriptor,
     super(Collections.singletonList(AndroidBuildTarget.TargetType.PACKAGING));
   }
 
+  @NotNull
   @Override
-  public String getName() {
+  public String getPresentableName() {
     return BUILDER_NAME;
   }
 
-  @Override
-  public String getDescription() {
-    return "Android Packaging Builder";
-  }
-
   @Override
   public void build(@NotNull AndroidBuildTarget target,
                     @NotNull DirtyFilesHolder<BuildRootDescriptor, AndroidBuildTarget> holder,
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
index e9c5a5661a84..76d16bf02e5c 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
@@ -52,7 +52,7 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder {
   @NonNls private static final String ANDROID_RENDERSCRIPT_COMPILER = "android-renderscript-compiler";
   @NonNls private static final String ANDROID_BUILD_CONFIG_GENERATOR = "android-buildconfig-generator";
   @NonNls private static final String ANDROID_APT_COMPILER = "android-apt-compiler";
-  @NonNls private static final String BUILDER_NAME = "android-source-generator";
+  @NonNls private static final String BUILDER_NAME = "Android Source Generator";
 
   @NonNls private static final String AIDL_EXTENSION = "aidl";
   @NonNls private static final String RENDERSCRIPT_EXTENSION = "rs";
@@ -68,11 +68,6 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder {
     super(BuilderCategory.SOURCE_GENERATOR);
   }
 
-  @Override
-  public String getName() {
-    return BUILDER_NAME;
-  }
-
   @Override
   public ModuleLevelBuilder.ExitCode build(CompileContext context,
                                            ModuleChunk chunk,
@@ -985,9 +980,10 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder {
     return FileUtil.toSystemIndependentName(relPath).replace('/', '.');
   }
 
+  @NotNull
   @Override
-  public String getDescription() {
-    return "Android Source Generating Builder";
+  public String getPresentableName() {
+    return BUILDER_NAME;
   }
 
   // support for lib<->lib and app<->lib circular dependencies
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
index 846d79ce3009..9e50d594a0b7 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Consumer;
 import com.intellij.util.SystemProperties;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.asm4.ClassReader;
 import org.jetbrains.jps.ModuleChunk;
@@ -47,7 +48,6 @@ import java.util.concurrent.Future;
  */
 public class GroovyBuilder extends ModuleLevelBuilder {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.groovy.GroovyBuilder");
-  public static final String BUILDER_NAME = "groovy";
   private static final Key<Boolean> CHUNK_REBUILD_ORDERED = Key.create("CHUNK_REBUILD_ORDERED");
   private static final Key<Map<String, String>> STUB_TO_SRC = Key.create("STUB_TO_SRC");
   private final boolean myForStubs;
@@ -56,17 +56,13 @@ public class GroovyBuilder extends ModuleLevelBuilder {
   public GroovyBuilder(boolean forStubs) {
     super(forStubs ? BuilderCategory.SOURCE_GENERATOR : BuilderCategory.OVERWRITING_TRANSLATOR);
     myForStubs = forStubs;
-    myBuilderName = BUILDER_NAME + (forStubs ? "-stubs" : "-classes");
+    myBuilderName = "Groovy " + (forStubs ? "stub generator" : "compiler");
   }
 
   static {
     JavaBuilder.registerClassPostProcessor(new RecompileStubSources());
   }
 
-  public String getName() {
-    return myBuilderName;
-  }
-
   public ModuleLevelBuilder.ExitCode build(final CompileContext context,
                                            ModuleChunk chunk,
                                            DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder) throws ProjectBuildException {
@@ -254,12 +250,12 @@ public class GroovyBuilder extends ModuleLevelBuilder {
   }
 
   @Nullable
-  private static Map<ModuleBuildTarget, String> getCanonicalModuleOutputs(CompileContext context, ModuleChunk chunk) {
+  private Map<ModuleBuildTarget, String> getCanonicalModuleOutputs(CompileContext context, ModuleChunk chunk) {
     Map<ModuleBuildTarget, String> finalOutputs = new HashMap<ModuleBuildTarget, String>();
     for (ModuleBuildTarget target : chunk.getTargets()) {
       File moduleOutputDir = target.getOutputDir();
       if (moduleOutputDir == null) {
-        context.processMessage(new CompilerMessage(BUILDER_NAME, BuildMessage.Kind.ERROR, "Output directory not specified for module " + target.getModuleName()));
+        context.processMessage(new CompilerMessage(myBuilderName, BuildMessage.Kind.ERROR, "Output directory not specified for module " + target.getModuleName()));
         return null;
       }
       String moduleOutputPath = FileUtil.toCanonicalPath(moduleOutputDir.getPath());
@@ -406,13 +402,12 @@ public class GroovyBuilder extends ModuleLevelBuilder {
 
   @Override
   public String toString() {
-    return "GroovyBuilder{" +
-           "myForStubs=" + myForStubs +
-           '}';
+    return myBuilderName;
   }
 
-  public String getDescription() {
-    return "Groovy builder";
+  @NotNull
+  public String getPresentableName() {
+    return myBuilderName;
   }
 
   private static class RecompileStubSources implements ClassPostProcessor {
diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourceBuilderRunner.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourceBuilderRunner.java
index 075df8f53214..224c0e24b2ca 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourceBuilderRunner.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourceBuilderRunner.java
@@ -17,6 +17,7 @@ package org.jetbrains.jps.maven.compiler;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.ModuleChunk;
 import org.jetbrains.jps.builders.BuildTarget;
@@ -62,16 +63,12 @@ public class MavenResourceBuilderRunner extends ModuleLevelBuilder{
 
   }
 
+  @NotNull
   @Override
-  public String getName() {
+  public String getPresentableName() {
     return "MavenResourceBuilder Runner";
   }
 
-  @Override
-  public String getDescription() {
-    return getName();
-  }
-
   @Override
   public ExitCode build(CompileContext context, ModuleChunk chunk, DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder) throws ProjectBuildException {
     ExitCode rc = ExitCode.NOTHING_DONE;
diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
index aaef9be1e852..ad4445a3fcda 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
  *         Date: 10/6/11
  */
 public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescriptor, MavenResourcesTarget> {
-  public static final String BUILDER_NAME = "maven-resources";
+  public static final String BUILDER_NAME = "Maven Resources Compiler";
   private static final int FILTERING_SIZE_LIMIT = 10 * 1024 * 1024 /*10 mb*/;
   private static final String MAVEN_BUILD_TIMESTAMP_PROPERTY = "maven.build.timestamp";
   private static final String MAVEN_BUILD_TIMESTAMP_FORMAT_PROPERTY = "maven.build.timestamp.format";
@@ -39,11 +39,6 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
     super(Arrays.asList(MavenResourcesTargetType.PRODUCTION, MavenResourcesTargetType.TEST));
   }
 
-  @Override
-  public String getName() {
-    return BUILDER_NAME;
-  }
-
   @Override
   public void build(@NotNull MavenResourcesTarget target, @NotNull final DirtyFilesHolder<MavenResourceRootDescriptor, MavenResourcesTarget> holder, @NotNull final BuildOutputConsumer outputConsumer, @NotNull final CompileContext context) throws ProjectBuildException, IOException {
     final BuildDataPaths dataPaths = context.getProjectDescriptor().dataManager.getDataPaths();
@@ -197,8 +192,9 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
   }
 
 
-  public String getDescription() {
-    return "Maven Resource Builder";
+  @NotNull
+  public String getPresentableName() {
+    return BUILDER_NAME;
   }
 
   private static boolean endsWith(final String fileName, final String suffix) {