diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
index ecc296279cb5..d64c783f5c07 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
@@ -76,7 +76,7 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
   // alternate collections
   private final NodeRenderer[] myAlternateCollectionRenderers = new NodeRenderer[]{
     createCompoundReferenceRenderer(
-      "Map", "java.util.Map",
+      "Map", CommonClassNames.JAVA_UTIL_MAP,
       createLabelRenderer(" size = ", "size()", null),
       createExpressionChildrenRenderer("entrySet().toArray()", "!isEmpty()")
     ),
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
index d56ef9a793d4..d90dc7daad31 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
@@ -61,7 +61,7 @@ public class IterableVariableMacro extends VariableTypeMacroBase {
     final GlobalSearchScope scope = file.getResolveScope();
 
     PsiType iterableType = elementFactory.createTypeByFQClassName("java.lang.Iterable", scope);
-    PsiType mapType = elementFactory.createTypeByFQClassName("java.util.Map", scope);
+    PsiType mapType = elementFactory.createTypeByFQClassName(CommonClassNames.JAVA_UTIL_MAP, scope);
 
     PsiVariable[] variables = MacroUtil.getVariablesVisibleAt(place, "");
     for (PsiVariable var : variables) {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
index bf9c717b2426..86dbb51629ea 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
@@ -67,12 +67,18 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
               checkAddImport(file, "java.util.ArrayList", "java.util.ArrayList","java.util.List");
               checkAddImport(file, "java.util.HashMap", "java.util.ArrayList","java.util.HashMap","java.util.List");
               checkAddImport(file, "java.util.SortedMap", "java.util.ArrayList","java.util.HashMap","java.util.List","java.util.SortedMap");
-              checkAddImport(file, "java.util.Map", "java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
-              checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
-              checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap");
-              checkAddImport(file, "java.util.TreeMap", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap");
-              checkAddImport(file, "java.util.concurrent.atomic.AtomicBoolean", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
-              checkAddImport(file, "java.io.File", "java.io.File","java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List","java.util.Map","java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
+              checkAddImport(file, CommonClassNames.JAVA_UTIL_MAP, "java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
+              checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
+              checkAddImport(file, "java.util.AbstractList", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap");
+              checkAddImport(file, "java.util.TreeMap", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap");
+              checkAddImport(file, "java.util.concurrent.atomic.AtomicBoolean", "java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
+              checkAddImport(file, "java.io.File", "java.io.File","java.util.AbstractList","java.util.ArrayList","java.util.HashMap","java.util.List",
+                             CommonClassNames.JAVA_UTIL_MAP,"java.util.SortedMap", "java.util.TreeMap", "java.util.concurrent.atomic.AtomicBoolean");
             }
             catch (Throwable e) {
               LOG.error(e);
@@ -128,7 +134,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
                   CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
                 }
 
-                assertOrder(file, "java.awt.*", "java.util.Map", "static java.lang.Math.max", "static java.lang.Math.min", "static javax.swing.SwingConstants.CENTER");
+                assertOrder(file, "java.awt.*", CommonClassNames.JAVA_UTIL_MAP, "static java.lang.Math.max", "static java.lang.Math.min", "static javax.swing.SwingConstants.CENTER");
 
               }
               catch (Throwable e) {
diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
index 418d3ce97e79..99650996f974 100644
--- a/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/ClsRepositoryUseTest.java
@@ -579,7 +579,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
   public void testGenericReturnType() throws Exception {
     disableJdk();
 
-    final PsiClass map = myJavaFacade.findClass("java.util.Map", RESOLVE_SCOPE);
+    final PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
     assert map != null;
     final PsiElementFactory factory = myJavaFacade.getElementFactory();
     final PsiClassType typeMapStringToInteger =
@@ -619,7 +619,7 @@ public class ClsRepositoryUseTest extends PsiTestCase{
 
   public void testSimplerGenericInheritance() throws Exception {
     PsiElementFactory factory = myJavaFacade.getElementFactory();
-    PsiClass map = myJavaFacade.findClass("java.util.Map", RESOLVE_SCOPE);
+    PsiClass map = myJavaFacade.findClass(CommonClassNames.JAVA_UTIL_MAP, RESOLVE_SCOPE);
     PsiClass hashMap = myJavaFacade.findClass("java.util.HashMap", RESOLVE_SCOPE);
     assert map != null && hashMap != null;
     assertTrue(factory.createType(map).isAssignableFrom(factory.createType(hashMap)));
diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
index a4bb385af478..d47db98e1e2d 100644
--- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/psi/PsiAdapter.java
@@ -137,7 +137,7 @@ public class PsiAdapter {
      * @return true if it's a Map type.
      */
     public boolean isMapType(PsiElementFactory factory, PsiType type) {
-        return isTypeOf(factory, type, "java.util.Map");
+        return isTypeOf(factory, type, CommonClassNames.JAVA_UTIL_MAP);
     }
 
     /**
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java
index 0459bdc98f7f..8b5c637914b1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.codeInspection.gpath;
 
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.util.InheritanceUtil;
@@ -113,7 +114,7 @@ public class GroovyMapGetCanBeKeyedAccessInspection extends BaseInspection {
 
       if (referenceExpression.getDotTokenType() == GroovyTokenTypes.mOPTIONAL_DOT) return;
       final PsiType type = qualifier.getType();
-      if (!InheritanceUtil.isInheritor(type, "java.util.Map")) {
+      if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP)) {
         return;
       }
       registerMethodCallError(grMethodCallExpression);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java
index 2844671a9808..55b3cecaa3e7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.codeInspection.gpath;
 
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.CommonClassNames;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.util.InheritanceUtil;
@@ -114,7 +115,7 @@ public class GroovyMapPutCanBeKeyedAccessInspection extends BaseInspection {
       }
       if (referenceExpression.getDotTokenType() == GroovyTokenTypes.mOPTIONAL_DOT) return;
       final PsiType type = qualifier.getType();
-      if (!InheritanceUtil.isInheritor(type, "java.util.Map")) {
+      if (!InheritanceUtil.isInheritor(type, CommonClassNames.JAVA_UTIL_MAP)) {
         return;
       }
       registerMethodCallError(grMethodCallExpression);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
index 0c39757666c0..3d27ed44d52b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
@@ -197,7 +197,7 @@ public class CustomMembersGenerator extends GroovyObjectSupport implements GdslM
   private static String stringifyType(Object type) {
     if (type == null) return CommonClassNames.JAVA_LANG_OBJECT;
     if (type instanceof Closure) return GroovyCommonClassNames.GROOVY_LANG_CLOSURE;
-    if (type instanceof Map) return "java.util.Map";
+    if (type instanceof Map) return CommonClassNames.JAVA_UTIL_MAP;
     if (type instanceof Class) return ((Class)type).getName();
 
     String s = type.toString();