diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java
index 34fc57c328ff..4f746d7e93ee 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderPanel.java
@@ -72,7 +72,7 @@ public class CCCreateAnswerPlaceholderPanel {
 
   private JComponent createHintToolbarComponent() {
     final DefaultActionGroup addRemoveGroup = new DefaultActionGroup();
-    addRemoveGroup.addAll(new AddHint(), new RemoveHint(), new GoForward(), new GoBackward());
+    addRemoveGroup.addAll(new AddHint(), new RemoveHint(), new ShowNext(), new ShowPrevious());
     return ActionManager.getInstance().createActionToolbar("Hint", addRemoveGroup, false).getComponent();
   }
 
@@ -125,10 +125,10 @@ public class CCCreateAnswerPlaceholderPanel {
     return myPanel;
   }
 
-  private class GoForward extends AnAction {
+  private class ShowNext extends AnAction {
 
-    public GoForward() {
-      super("Forward", "Forward", AllIcons.Actions.Forward);
+    public ShowNext() {
+      super("Next", "Next", AllIcons.Actions.Forward);
     }
 
     @Override
@@ -143,10 +143,10 @@ public class CCCreateAnswerPlaceholderPanel {
     }
   }
 
-  private class GoBackward extends AnAction {
+  private class ShowPrevious extends AnAction {
 
-    public GoBackward() {
-      super("Back", "Back", AllIcons.Actions.Back);
+    public ShowPrevious() {
+      super("Previous", "Previous", AllIcons.Actions.Back);
     }
 
     @Override