diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinInternalToolWindowFactory.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinInternalToolWindowFactory.java
index 2128e6c9aeb..d5ecea2847a 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinInternalToolWindowFactory.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinInternalToolWindowFactory.java
@@ -21,15 +21,15 @@ import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
 import com.intellij.ui.content.ContentFactory;
 import com.intellij.ui.content.ContentManager;
-import org.jetbrains.jet.plugin.internal.codewindow.BytecodeToolwindow;
-import org.jetbrains.jet.plugin.internal.resolvewindow.ResolveToolwindow;
+import org.jetbrains.jet.plugin.internal.codewindow.BytecodeToolWindow;
+import org.jetbrains.jet.plugin.internal.resolvewindow.ResolveToolWindow;
 
 public class KotlinInternalToolWindowFactory implements ToolWindowFactory {
     @Override
     public void createToolWindowContent(Project project, ToolWindow toolWindow) {
         ContentManager contentManager = toolWindow.getContentManager();
         ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
-        contentManager.addContent(contentFactory.createContent(new ResolveToolwindow(project), "Resolve", false));
-        contentManager.addContent(contentFactory.createContent(new BytecodeToolwindow(project), "Bytecode", false));
+        contentManager.addContent(contentFactory.createContent(new ResolveToolWindow(project), "Resolve", false));
+        contentManager.addContent(contentFactory.createContent(new BytecodeToolWindow(project), "Bytecode", false));
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java
rename to idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
index 0af1c97176a..516f41023b4 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolWindow.java
@@ -55,7 +55,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
 
-public class BytecodeToolwindow extends JPanel implements Disposable {
+public class BytecodeToolWindow extends JPanel implements Disposable {
     private static final int UPDATE_DELAY = 1000;
     private static final String DEFAULT_TEXT = "/*\n" +
                                                "Generated bytecode for Kotlin source file.\n" +
@@ -172,7 +172,7 @@ public class BytecodeToolwindow extends JPanel implements Disposable {
 
     private UpdateBytecodeToolWindowTask currentTask = null;
 
-    public BytecodeToolwindow(Project project) {
+    public BytecodeToolWindow(Project project) {
         super(new BorderLayout());
         myProject = project;
         myEditor = EditorFactory.getInstance().createEditor(
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java
rename to idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
index 55e7f77cf8b..71bc405a3e1 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolWindow.java
@@ -58,7 +58,7 @@ import java.util.Map;
 import static org.jetbrains.jet.lang.resolve.BindingContext.*;
 import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionDebugInfo.*;
 
-public class ResolveToolwindow extends JPanel implements Disposable {
+public class ResolveToolWindow extends JPanel implements Disposable {
 
     public static final String BAR = "\n\n===\n\n";
 
@@ -155,7 +155,7 @@ public class ResolveToolwindow extends JPanel implements Disposable {
 
     private final Project myProject;
 
-    public ResolveToolwindow(Project project) {
+    public ResolveToolWindow(Project project) {
         super(new BorderLayout());
         myProject = project;
         myEditor = EditorFactory.getInstance()