diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java
index b8a3218f0e99..ac5bbb1ffb88 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java
@@ -210,7 +210,7 @@ public class CreateResourceFileAction extends CreateElementActionBase {
     return AndroidBundle.message("new.resource.action.name", directory.getName() + File.separator + newName);
   }
 
-  private static class MyDialog extends CreateResourceDialog {
+  private static class MyDialog extends CreateResourceFileDialog {
     private final CreateResourceFileAction myAction;
 
     protected MyDialog(@NotNull AndroidFacet facet,
diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.form
similarity index 98%
rename from plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form
rename to plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.form
index 2d3e556e7079..7169bfc92e4f 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.actions.CreateResourceDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.actions.CreateResourceFileDialog">
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="7" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
similarity index 95%
rename from plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.java
rename to plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
index 68b7e5c6187a..8c5871a52969 100644
--- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.java
+++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java
@@ -53,7 +53,7 @@ import java.util.List;
  * Time: 7:47:01 PM
  * To change this template use File | Settings | File Templates.
  */
-public class CreateResourceDialog extends DialogWrapper {
+public class CreateResourceFileDialog extends DialogWrapper {
   private JTextField myFileNameField;
   private TemplateKindCombo myResourceTypeCombo;
   private JPanel myPanel;
@@ -75,13 +75,13 @@ public class CreateResourceDialog extends DialogWrapper {
   private final AndroidFacet myFacet;
   private final ResourceType myPredefinedResourceType;
 
-  public CreateResourceDialog(@NotNull AndroidFacet facet,
-                              Collection<CreateTypedResourceFileAction> actions,
-                              @Nullable ResourceType predefinedResourceType,
-                              @Nullable String predefinedFileName,
-                              boolean chooseFileName,
-                              @NotNull Module module,
-                              boolean chooseModule) {
+  public CreateResourceFileDialog(@NotNull AndroidFacet facet,
+                                  Collection<CreateTypedResourceFileAction> actions,
+                                  @Nullable ResourceType predefinedResourceType,
+                                  @Nullable String predefinedFileName,
+                                  boolean chooseFileName,
+                                  @NotNull Module module,
+                                  boolean chooseModule) {
     super(facet.getModule().getProject());
     myFacet = facet;
     myPredefinedResourceType = predefinedResourceType;