diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
index b1164e51e9a0..16003348848c 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
@@ -274,7 +274,7 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable, Act
   }
 
   @TestOnly
-  public boolean setSelectedProjectType(String group, String name) {
+  public boolean setSelectedTemplate(String group, String name) {
     ListModel model = myProjectTypeList.getModel();
     for (int i = 0; i < model.getSize(); i++) {
       if (group.equals(((TemplatesGroup)model.getElementAt(i)).getName())) {
diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index f489dd74d406..a01cdf77b5fd 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -86,7 +86,7 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
 
     createWizard(project);
     ProjectTypeStep step = (ProjectTypeStep)myWizard.getCurrentStepObject();
-    boolean condition = step.setSelectedProjectType(group, name);
+    boolean condition = step.setSelectedTemplate(group, name);
     if (!condition) {
       throw new IllegalArgumentException(group + "/" + name + " template not found");
     }
diff --git a/plugins/devkit/testSources/PluginProjectWizardTest.java b/plugins/devkit/testSources/PluginProjectWizardTest.java
index 603110ad451e..730ffc50f029 100644
--- a/plugins/devkit/testSources/PluginProjectWizardTest.java
+++ b/plugins/devkit/testSources/PluginProjectWizardTest.java
@@ -16,7 +16,7 @@
 package org.jetbrains.idea.devkit;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.ide.projectWizard.ProjectWizardTestCase;
+import com.intellij.ide.projectWizard.NewProjectWizardTestCase;
 import com.intellij.openapi.module.JavaModuleType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VfsUtilCore;
@@ -28,7 +28,7 @@ import org.jetbrains.idea.devkit.projectRoots.IdeaJdk;
  * @author Dmitry Avdeev
  *         Date: 11/8/12
  */
-public class PluginProjectWizardTest extends ProjectWizardTestCase {
+public class PluginProjectWizardTest extends NewProjectWizardTestCase {
 
   public void testPluginProject() throws Exception {
     createSdk("devkit", IdeaJdk.getInstance());
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java
index bda78900efae..0216997843c0 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/GradleProjectWizardTest.java
@@ -32,7 +32,7 @@ public class GradleProjectWizardTest extends NewProjectWizardTestCase {
       @Override
       public void consume(Step step) {
         if (step instanceof ProjectTypeStep) {
-          assertTrue(((ProjectTypeStep)step).setSelectedProjectType("Java", "Gradle"));
+          assertTrue(((ProjectTypeStep)step).setSelectedTemplate("Java", "Gradle"));
         }
       }
     });