diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 1923e3499479..fbd5c9e8b846 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -34,7 +34,7 @@ import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.actionSystem.*;
-import com.intellij.openapi.editor.actions.ToggleStickToEolToolbarAction;
+import com.intellij.openapi.editor.actions.ToggleAutoScrollToTheEndToolbarAction;
 import com.intellij.openapi.editor.actions.ToggleUseSoftWrapsToolbarAction;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.EditorColors;
@@ -1443,7 +1443,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
         return myEditor;
       }
     };
-    final AnAction stickToEolAction = new ToggleStickToEolToolbarAction() {
+    final AnAction autoScrollToTheEndAction = new ToggleAutoScrollToTheEndToolbarAction() {
       @Override
       protected Editor getEditor(AnActionEvent e) {
         return myEditor;
@@ -1455,7 +1455,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
     consoleActions[0] = prevAction;
     consoleActions[1] = nextAction;
     consoleActions[2] = switchSoftWrapsAction;
-    consoleActions[3] = stickToEolAction;
+    consoleActions[3] = autoScrollToTheEndAction;
     for (int i = 0; i < customActions.size(); ++i) {
       consoleActions[i + 4] = customActions.get(i);
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickToEolToolbarAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleAutoScrollToTheEndToolbarAction.java
similarity index 91%
rename from platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickToEolToolbarAction.java
rename to platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleAutoScrollToTheEndToolbarAction.java
index 378f9011c94d..ccbf79b47d29 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleStickToEolToolbarAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleAutoScrollToTheEndToolbarAction.java
@@ -26,11 +26,11 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author oleg
  */
-public class ToggleStickToEolToolbarAction extends ToggleAction {
+public class ToggleAutoScrollToTheEndToolbarAction extends ToggleAction {
 
-  public ToggleStickToEolToolbarAction() {
+  public ToggleAutoScrollToTheEndToolbarAction() {
     super();
-    final String message = ActionsBundle.message("action.EditorConsoleToggleStickToEndOfOutput.text");
+    final String message = ActionsBundle.message("action.EditorConsoleAutoScrollToTheEnd.text");
     getTemplatePresentation().setDescription(message);
     getTemplatePresentation().setText(message);
     getTemplatePresentation().setIcon(IconLoader.getIcon("/runConfigurations/scroll_down.png"));
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 3d6c6d60217b..76ea431ca483 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -125,7 +125,7 @@ action.EditorToggleShowLineNumbers.text=Show L_ine Numbers
 action.EditorToggleShowLineNumbers.description=Toggle display line numbers in current editor
 action.EditorToggleUseSoftWraps.text=Use Soft Wraps
 action.EditorToggleUseSoftWraps.description=Toggle using soft wraps in current editor
-action.EditorConsoleToggleStickToEndOfOutput.text=Stick to the end of console output
+action.EditorConsoleAutoScrollToTheEnd.text=Autoscroll to the end
 action.ViewImportPopups.text=Show Import Popups
 action.ViewImportPopups.description=Toggle display import popups in current file
 action.EditorScrollToCenter.text=Scroll to Center