diff --git a/plugins/ByteCodeViewer/src/META-INF/plugin.xml b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
index 23e7fcd3059b..11b22ae2d3de 100644
--- a/plugins/ByteCodeViewer/src/META-INF/plugin.xml
+++ b/plugins/ByteCodeViewer/src/META-INF/plugin.xml
@@ -1,8 +1,10 @@
 <idea-plugin version="2">
-  <name>Byte Code Viewer</name>
+  <name>Bytecode Viewer</name>
   <id>ByteCodeViewer</id>
   <version>0.1</version>
-  <description>Viewing java bytecode inside IntelliJ IDEA.</description>
+  <description>
+    <![CDATA[Provides <i>View | Show Bytecode</i> action for easy inspection of Java bytecode instructions inside IntelliJ IDEA.]]>
+  </description>
   <vendor>JetBrains</vendor>
 
   <extensionPoints>
@@ -17,7 +19,7 @@
 
   <actions>
     <group>
-      <action id="ByteCodeViewer" class="com.intellij.byteCodeViewer.ShowByteCodeAction" text="Show Byte Code"/>
+      <action id="ByteCodeViewer" class="com.intellij.byteCodeViewer.ShowByteCodeAction" text="Show Bytecode"/>
       <add-to-group group-id="QuickActions" anchor="after" relative-to-action="QuickJavaDoc"/>
     </group>
   </actions>
diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
index 91120935b43c..8b79409bd96d 100644
--- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
+++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -55,7 +55,7 @@ public class ByteCodeViewerManager extends DockablePopupManager<ByteCodeViewerCo
 
   private static final Logger LOG = Logger.getInstance("#" + ByteCodeViewerManager.class.getName());
 
-  public static final String TOOLWINDOW_ID = "Byte Code Viewer";
+  private static final String TOOLWINDOW_ID = "Byte Code Viewer";
   private static final String SHOW_BYTECODE_IN_TOOL_WINDOW = "BYTE_CODE_TOOL_WINDOW";
   private static final String BYTECODE_AUTO_UPDATE_ENABLED = "BYTE_CODE_AUTO_UPDATE_ENABLED";
 
@@ -84,17 +84,17 @@ public class ByteCodeViewerManager extends DockablePopupManager<ByteCodeViewerCo
 
   @Override
   protected String getAutoUpdateTitle() {
-    return "Auto Show Byte Code for Selected Element";
+    return "Auto Show Bytecode for Selected Element";
   }
 
   @Override
   protected String getAutoUpdateDescription() {
-    return "Show byte code for current element automatically";
+    return "Show bytecode for current element automatically";
   }
 
   @Override
   protected String getRestorePopupDescription() {
-    return "Restore byte code popup behavior";
+    return "Restore bytecode popup behavior";
   }
 
   @Override
diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
index 1a8bfb7a3558..256eeaca25b9 100644
--- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
+++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowByteCodeAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -84,7 +84,7 @@ public class ShowByteCodeAction extends AnAction {
     final RelativePoint bestPopupLocation = JBPopupFactory.getInstance().guessBestPopupLocation(dataContext);
 
     final SmartPsiElementPointer element = SmartPointerManager.getInstance(project).createSmartPsiElementPointer(psiElement);
-    ProgressManager.getInstance().run(new Task.Backgroundable(project, "Searching byte code...") {
+    ProgressManager.getInstance().run(new Task.Backgroundable(project, "Looking for bytecode...") {
       private String myByteCode;
       private String myErrorMessage;
       private String myErrorTitle;
@@ -92,7 +92,7 @@ public class ShowByteCodeAction extends AnAction {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
         if (ProjectRootManager.getInstance(project).getFileIndex().isInContent(virtualFile) && isMarkedForCompilation(project, virtualFile)) {
-          myErrorMessage = "Unable to show byte code for '" + psiElementTitle + "'. Class file does not exist or is out-of-date.";
+          myErrorMessage = "Unable to show bytecode for '" + psiElementTitle + "'. Class file does not exist or is out-of-date.";
           myErrorTitle = "Class File Out-Of-Date";
         }
         else {
@@ -122,7 +122,7 @@ public class ShowByteCodeAction extends AnAction {
         }
         else {
           if (myByteCode == null) {
-            Messages.showErrorDialog(project, "Unable to parse class file for '" + psiElementTitle + "'.", "Byte Code not Found");
+            Messages.showErrorDialog(project, "Unable to parse class file for '" + psiElementTitle + "'.", "Bytecode not Found");
             return;
           }
           final ByteCodeViewerComponent component = new ByteCodeViewerComponent(project, null);