diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionType.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionType.java
index e495c756bb1a..7e71d7326c94 100644
--- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionType.java
+++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionType.java
@@ -4,5 +4,5 @@ package com.intellij.codeInsight.completion;
  * @author peter
  */
 public enum CompletionType {
-  BASIC, SMART, CLASS_NAME
+  BASIC, SMART, @Deprecated CLASS_NAME
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
index 681e0d4bdedc..9ccfd1aa5778 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
@@ -91,7 +91,7 @@ public class CodeInsightSettings implements PersistentStateComponent<Element>, C
 
   public boolean AUTOCOMPLETE_ON_CODE_COMPLETION = true;
   public boolean AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = true;
-  public boolean AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION = false;
+  @Deprecated public boolean AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION = false;
   public boolean AUTOCOMPLETE_COMMON_PREFIX = true;
   public boolean SHOW_STATIC_AFTER_INSTANCE = false;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 5fc4b2ef9065..977262faa634 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -803,12 +803,10 @@ public class CodeCompletionHandlerBase {
 
   private static boolean isAutocompleteOnInvocation(final CompletionType type) {
     final CodeInsightSettings settings = CodeInsightSettings.getInstance();
-    switch (type) {
-      case CLASS_NAME: return settings.AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION;
-      case SMART: return settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION;
-      case BASIC:
-      default: return settings.AUTOCOMPLETE_ON_CODE_COMPLETION;
+    if (type == CompletionType.SMART) {
+      return settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION;
     }
+    return settings.AUTOCOMPLETE_ON_CODE_COMPLETION;
   }
 
   private static Runnable rememberDocumentState(final Editor _editor) {