diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerAction.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java
similarity index 71%
rename from platform/lang-impl/src/com/intellij/internal/psiView/ViewerAction.java
rename to platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java
index 1c72b2160de4..e232265e7fb1 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/ViewerAction.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2010 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/**
- * class ViewerAction
- * created Aug 27, 2001
- * @author Jeka
- */
 package com.intellij.internal.psiView;
 
 import com.intellij.openapi.actionSystem.AnAction;
@@ -27,16 +21,18 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 
-public class ViewerAction extends AnAction implements DumbAware {
+/**
+ * @author Konstantin Bulenkov
+ */
+public class PsiViewerAction extends AnAction implements DumbAware {
   public void actionPerformed(AnActionEvent e) {
-    Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
-    PsiViewerDialog dialog = new PsiViewerDialog(project,false);
-    dialog.show();
+    final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
+    new PsiViewerDialog(project, false).show();
   }
 
   @Override
   public void update(AnActionEvent e) {
-    Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
+    final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
     e.getPresentation().setEnabled(project != null);
   }
 }
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index c7471702fe8a..7a54e637466d 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -652,7 +652,7 @@ action.ValidateXml.text=_Validate
 action.ValidateXml.description=Validate the current xml file
 action.GenerateDTD.text=Generate DTD from _XML file
 group.ExternalToolsGroup.text=External Tools
-action.PsiViewer.text=View PSI Structure
+action.PsiViewer.text=_View PSI Structure
 action.DebugListen.text=Throw Debug Exception
 action.VirtualFileInfo.text=Virtual File Info
 action.Merge3Files.text=Merge
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index d680785048f3..a28909f0b2d1 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -208,7 +208,7 @@
           <separator/>
           <group id="PlaySavedMacroActions" class="com.intellij.ide.actionMacro.actions.MacrosGroup"/>
         </group>
-        <action id="PsiViewer" class="com.intellij.internal.psiView.ViewerAction"/>
+        <action id="PsiViewer" class="com.intellij.internal.psiView.PsiViewerAction"/>
       </group>
 
       <group id="WindowMenu" popup="true">