diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
index fa530ccbea47..fb0b377b781a 100644
--- a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
+++ b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
@@ -35,7 +35,10 @@ public abstract class RunManagerEx extends RunManager {
 
   //public abstract boolean isTemporary(@NotNull RunnerAndConfigurationSettings configuration);
 
-  @Deprecated // use setSelectedConfiguration instead
+  /**
+   * @deprecated use {@link #setSelectedConfiguration(RunnerAndConfigurationSettings)} instead
+   */
+  @Deprecated
   public void setActiveConfiguration(@Nullable RunnerAndConfigurationSettings configuration) {
     setSelectedConfiguration(configuration);
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java b/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java
index 9809cf888ae5..0f499f4ae0f1 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java
@@ -18,7 +18,6 @@ package com.intellij.execution.actions;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.RunManager;
-import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.impl.RunDialog;
@@ -102,7 +101,7 @@ public class CreateAction extends BaseRunConfigurationAction {
     public void perform(final ConfigurationContext context) {
       final RunnerAndConfigurationSettings configuration = context.findExisting();
       if (configuration == null) return;
-      ((RunManagerEx)context.getRunManager()).setActiveConfiguration(configuration);
+      context.getRunManager().setSelectedConfiguration(configuration);
     }
 
     @Override
@@ -131,7 +130,7 @@ public class CreateAction extends BaseRunConfigurationAction {
                                   runManager.isConfigurationShared(template),
                                   runManager.getBeforeRunTasks(templateConfiguration),
                                   false);
-      runManager.setActiveConfiguration(configuration);
+      runManager.setSelectedConfiguration(configuration);
     }
   }
 
@@ -150,7 +149,7 @@ public class CreateAction extends BaseRunConfigurationAction {
         runManager.addConfiguration(configuration,
                                     runManager.isConfigurationShared(configuration),
                                     runManager.getBeforeRunTasks(configuration.getConfiguration()), false);
-        runManager.setActiveConfiguration(configuration);
+        runManager.setSelectedConfiguration(configuration);
       }
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
index e0895646e2e3..a0c86d666788 100644
--- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
@@ -312,7 +312,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
 
     @Override
     public void actionPerformed(final AnActionEvent e) {
-      RunManagerEx.getInstanceEx(myProject).setActiveConfiguration(myConfiguration);
+      RunManager.getInstance(myProject).setSelectedConfiguration(myConfiguration);
       updateButton(ExecutionTargetManager.getActiveTarget(myProject), myConfiguration, myProject, e.getPresentation());
     }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
index d5d800faf32c..88033f9df8f0 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
@@ -18,10 +18,7 @@ package org.jetbrains.plugins.groovy.mvc;
 
 import com.intellij.compiler.options.CompileStepBeforeRun;
 import com.intellij.compiler.options.CompileStepBeforeRunNoErrorCheck;
-import com.intellij.execution.CantRunException;
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.RunManagerEx;
-import com.intellij.execution.RunnerAndConfigurationSettings;
+import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeView;
@@ -62,8 +59,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.config.GroovyLibraryDescription;
-import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyNamesUtil;
+import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
 
 import javax.swing.*;
 import java.io.File;
@@ -345,7 +342,7 @@ public abstract class MvcFramework {
                                                       @NotNull MvcCommand command) throws ExecutionException;
 
   protected static void ensureRunConfigurationExists(Module module, ConfigurationType configurationType, String name) {
-    final RunManagerEx runManager = RunManagerEx.getInstanceEx(module.getProject());
+    final RunManager runManager = RunManager.getInstance(module.getProject());
     for (final RunConfiguration runConfiguration : runManager.getConfigurationsList(configurationType)) {
       if (runConfiguration instanceof MvcRunConfiguration && ((MvcRunConfiguration)runConfiguration).getModule() == module) {
         return;
@@ -358,7 +355,7 @@ public abstract class MvcFramework {
     final MvcRunConfiguration configuration = (MvcRunConfiguration)runSettings.getConfiguration();
     configuration.setModule(module);
     runManager.addConfiguration(runSettings, false);
-    runManager.setActiveConfiguration(runSettings);
+    runManager.setSelectedConfiguration(runSettings);
 
     RunManagerEx.disableTasks(module.getProject(), configuration, CompileStepBeforeRun.ID, CompileStepBeforeRunNoErrorCheck.ID);
   }