diff --git a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java
index 8963bc06e973..0dfd5aac36a2 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java
@@ -107,7 +107,7 @@ public class AutoPopupController implements Disposable {
       currentCompletion.closeAndFinish(!shouldBeFast);
     }
 
-    final CompletionPhase.AutoPopupAlarm phase = new CompletionPhase.AutoPopupAlarm(false, editor);
+    final CompletionPhase.CommittingDocuments phase = new CompletionPhase.CommittingDocuments(false, editor);
     CompletionServiceImpl.setCompletionPhase(phase);
 
     Runnable request = new Runnable() {
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 9eafc15cf21d..39e2667638bb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -504,7 +504,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
     final Project project = hostFile.getProject();
 
     if (!invokedExplicitly) {
-      final CompletionPhase.AutoPopupAlarm phase = new CompletionPhase.AutoPopupAlarm(true, hostEditor);
+      final CompletionPhase.CommittingDocuments phase = new CompletionPhase.CommittingDocuments(true, hostEditor);
       CompletionServiceImpl.setCompletionPhase(phase);
 
       ApplicationManager.getApplication().addApplicationListener(new ApplicationAdapter() {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java
index 7b78e85a22e5..b059109a220f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java
@@ -72,14 +72,14 @@ public abstract class CompletionPhase implements Disposable {
     return false;
   }
 
-  public static class AutoPopupAlarm extends CompletionPhase {
+  public static class CommittingDocuments extends CompletionPhase {
     final boolean copyCommit;
     private boolean actionsHappened;
     private final Editor myEditor;
     private final Expirable focusStamp;
     private final Project myProject;
 
-    public AutoPopupAlarm(boolean copyCommit, Editor editor) {
+    public CommittingDocuments(boolean copyCommit, Editor editor) {
       super(null);
       this.copyCommit = copyCommit;
       myEditor = editor;
@@ -107,7 +107,7 @@ public abstract class CompletionPhase implements Disposable {
 
     @Override
     public String toString() {
-      return "AutoPopupAlarm{copyCommit=" + copyCommit + '}';
+      return "CommittingDocuments{copyCommit=" + copyCommit + '}';
     }
   }
   public static class Synchronous extends CompletionPhase {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
index 88bd527e77b4..a18c3ce34bfa 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
@@ -73,13 +73,13 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate {
     }
 
     if (!Character.isLetter(charTyped) && charTyped != '_') {
-      if (CompletionServiceImpl.isPhase(CompletionPhase.EmptyAutoPopup.class, CompletionPhase.AutoPopupAlarm.class)) {
+      if (CompletionServiceImpl.isPhase(CompletionPhase.EmptyAutoPopup.class, CompletionPhase.CommittingDocuments.class)) {
         CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
       }
       return Result.CONTINUE;
     }
 
-    if (!CompletionServiceImpl.isPhase(CompletionPhase.AutoPopupAlarm.class, CompletionPhase.NoCompletion.getClass())) {
+    if (!CompletionServiceImpl.isPhase(CompletionPhase.CommittingDocuments.class, CompletionPhase.NoCompletion.getClass())) {
       return Result.CONTINUE;
     }