diff --git a/python/python-rest/src/com/jetbrains/rest/run/RestRunConfiguration.java b/python/python-rest/src/com/jetbrains/rest/run/RestRunConfiguration.java
index 6315099e4467..6308cc320d2f 100644
--- a/python/python-rest/src/com/jetbrains/rest/run/RestRunConfiguration.java
+++ b/python/python-rest/src/com/jetbrains/rest/run/RestRunConfiguration.java
@@ -1,7 +1,7 @@
 package com.jetbrains.rest.run;
 
 import com.intellij.execution.configurations.ConfigurationFactory;
-import com.intellij.execution.configurations.RunConfigurationModule;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.WriteExternalException;
@@ -24,10 +24,9 @@ public abstract class RestRunConfiguration extends AbstractPythonRunConfiguratio
   private static final String TASK = "docutils_task";
   private static final String OPEN_IN_BROWSER = "docutils_open_in_browser";
 
-  public RestRunConfiguration(final String name,
-                              final RunConfigurationModule module,
+  public RestRunConfiguration(Project project,
                               final ConfigurationFactory factory) {
-    super(name, module, factory);
+    super(project, factory);
   }
 
   public String getInputFile() {
diff --git a/python/python-rest/src/com/jetbrains/rest/run/RestRunConfigurationType.java b/python/python-rest/src/com/jetbrains/rest/run/RestRunConfigurationType.java
index 0684a212b4bb..a1d350104ee6 100644
--- a/python/python-rest/src/com/jetbrains/rest/run/RestRunConfigurationType.java
+++ b/python/python-rest/src/com/jetbrains/rest/run/RestRunConfigurationType.java
@@ -63,7 +63,7 @@ public class RestRunConfigurationType implements ConfigurationType {
     }
 
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new DocutilsRunConfiguration("", project, this);
+      return new DocutilsRunConfiguration(project, this);
     }
   }
 
@@ -73,7 +73,7 @@ public class RestRunConfigurationType implements ConfigurationType {
     }
 
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new SphinxRunConfiguration("", project, this);
+      return new SphinxRunConfiguration(project, this);
     }
   }
 }
diff --git a/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsRunConfiguration.java b/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsRunConfiguration.java
index 9885a2c6ce46..df1193db17aa 100644
--- a/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsRunConfiguration.java
+++ b/python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsRunConfiguration.java
@@ -17,10 +17,9 @@ import org.jetbrains.annotations.NotNull;
  */
 public class DocutilsRunConfiguration extends RestRunConfiguration {
 
-  public DocutilsRunConfiguration(final String name,
-                                  final Project project,
+  public DocutilsRunConfiguration(final Project project,
                                   final ConfigurationFactory factory) {
-    super(name, new RunConfigurationModule(project), factory);
+    super(project, factory);
   }
 
   @Override
diff --git a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java
index db37b8a0b328..06183fb45a23 100644
--- a/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java
+++ b/python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java
@@ -16,10 +16,9 @@ import org.jetbrains.annotations.NotNull;
  * User : catherine
  */
 public class SphinxRunConfiguration extends RestRunConfiguration {
-  public SphinxRunConfiguration(final String name,
-                                final Project project,
+  public SphinxRunConfiguration(final Project project,
                                 final ConfigurationFactory factory) {
-    super(name, new RunConfigurationModule(project), factory);
+    super(project, factory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java b/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
index 5a9255e86403..fd80fe604854 100644
--- a/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
@@ -43,9 +43,9 @@ public abstract class AbstractPythonRunConfiguration<T extends AbstractRunConfig
   private boolean myAddSourceRoots = true;
   protected PathMappingSettings myMappingSettings;
 
-  public AbstractPythonRunConfiguration(final String name, final RunConfigurationModule module, final ConfigurationFactory factory) {
-    super(name, module, factory);
-    module.init();
+  public AbstractPythonRunConfiguration(Project project, final ConfigurationFactory factory) {
+    super(project, factory);
+    getConfigurationModule().init();
   }
 
   public List<Module> getValidModules() {
diff --git a/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java b/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
index 3542c1745787..f4dd419873df 100644
--- a/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
@@ -2,7 +2,7 @@ package com.jetbrains.python.run;
 
 import com.intellij.execution.configuration.AbstractRunConfiguration;
 import com.intellij.execution.configurations.ConfigurationFactory;
-import com.intellij.execution.configurations.RunConfigurationModule;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
 import com.intellij.openapi.util.WriteExternalException;
@@ -16,8 +16,8 @@ abstract public class AbstractServerPythonRunConfiguration<T extends AbstractRun
   @NonNls private static final String LAUNCH_JAVASCRIPT_DEBUGGER = "launchJavascriptDebuger";
   private boolean myLaunchJavascriptDebugger;
 
-  public AbstractServerPythonRunConfiguration(final String name, final RunConfigurationModule module, final ConfigurationFactory factory) {
-    super(name, module, factory);
+  public AbstractServerPythonRunConfiguration(final Project project, final ConfigurationFactory factory) {
+    super(project, factory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/run/PythonConfigurationType.java b/python/src/com/jetbrains/python/run/PythonConfigurationType.java
index af2b115c3a87..54af8fb1dee8 100644
--- a/python/src/com/jetbrains/python/run/PythonConfigurationType.java
+++ b/python/src/com/jetbrains/python/run/PythonConfigurationType.java
@@ -34,7 +34,7 @@ public class PythonConfigurationType implements ConfigurationType {
     }
 
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PythonRunConfiguration(project, this, "");
+      return new PythonRunConfiguration(project, this);
     }
   }
 
diff --git a/python/src/com/jetbrains/python/run/PythonRunConfiguration.java b/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
index 4e2afc63f368..bf88ed59377b 100644
--- a/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
+++ b/python/src/com/jetbrains/python/run/PythonRunConfiguration.java
@@ -38,8 +38,8 @@ public class PythonRunConfiguration extends AbstractPythonRunConfiguration
   private String myScriptName;
   private String myScriptParameters;
 
-  protected PythonRunConfiguration(Project project, ConfigurationFactory configurationFactory, String name) {
-    super(name, new RunConfigurationModule(project), configurationFactory);
+  protected PythonRunConfiguration(Project project, ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
     setUnbufferedEnv();
   }
 
diff --git a/python/src/com/jetbrains/python/testing/AbstractPythonTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/AbstractPythonTestRunConfiguration.java
index 55e0259ef11b..82ad32ce1732 100644
--- a/python/src/com/jetbrains/python/testing/AbstractPythonTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/AbstractPythonTestRunConfiguration.java
@@ -1,6 +1,10 @@
 package com.jetbrains.python.testing;
 
-import com.intellij.execution.configurations.*;
+import com.intellij.execution.configurations.ConfigurationFactory;
+import com.intellij.execution.configurations.RefactoringListenerProvider;
+import com.intellij.execution.configurations.RuntimeConfigurationError;
+import com.intellij.execution.configurations.RuntimeConfigurationException;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizerUtil;
@@ -42,8 +46,8 @@ public abstract class AbstractPythonTestRunConfiguration extends AbstractPythonR
   private String myPattern = ""; // pattern for modules in folder to match against
   private boolean usePattern = false;
 
-  protected AbstractPythonTestRunConfiguration(RunConfigurationModule module, ConfigurationFactory configurationFactory, String name) {
-    super(name, module, configurationFactory);
+  protected AbstractPythonTestRunConfiguration(Project project, ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
index 4dccdba93e5e..028eb829de2f 100644
--- a/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
+++ b/python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
@@ -36,7 +36,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
     @Override
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PythonUnitTestRunConfiguration(project, this, "");
+      return new PythonUnitTestRunConfiguration(project, this);
     }
 
     @Override
@@ -52,7 +52,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
     @Override
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PythonDocTestRunConfiguration(project, this, "");
+      return new PythonDocTestRunConfiguration(project, this);
     }
 
     @Override
@@ -68,7 +68,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
     @Override
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PyTestRunConfiguration("", project, this);
+      return new PyTestRunConfiguration(project, this);
     }
 
     @Override
@@ -84,7 +84,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
     @Override
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PythonNoseTestRunConfiguration(project, this, "");
+      return new PythonNoseTestRunConfiguration(project, this);
     }
 
     @Override
@@ -100,7 +100,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
 
     @Override
     public RunConfiguration createTemplateConfiguration(Project project) {
-      return new PythonAtTestRunConfiguration(project, this, "");
+      return new PythonAtTestRunConfiguration(project, this);
     }
 
     @Override
diff --git a/python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfiguration.java
index 00a22013a231..c8d016fe88a7 100644
--- a/python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfiguration.java
@@ -24,9 +24,8 @@ public class PythonAtTestRunConfiguration extends AbstractPythonTestRunConfigura
   protected String myTitle = "Attest";
   protected String myPluralTitle = "Attests";
   public PythonAtTestRunConfiguration(Project project,
-                                      ConfigurationFactory configurationFactory,
-                                      String name) {
-    super(new RunConfigurationModule(project), configurationFactory, name);
+                                      ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfiguration.java
index 3e1f2c957b3f..e973a3aad033 100644
--- a/python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfiguration.java
@@ -20,9 +20,8 @@ public class PythonDocTestRunConfiguration extends AbstractPythonTestRunConfigur
   protected String myPluralTitle = "Doctests";
   protected String myTitle = "Doctest";
   public PythonDocTestRunConfiguration(Project project,
-                                       ConfigurationFactory configurationFactory,
-                                       String name) {
-    super(new RunConfigurationModule(project), configurationFactory, name);
+                                       ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
index ce68f089f5aa..84ad40acc676 100644
--- a/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
@@ -29,9 +29,8 @@ public class PythonNoseTestRunConfiguration extends AbstractPythonTestRunConfigu
   private boolean useParam = false;
 
   public PythonNoseTestRunConfiguration(Project project,
-                                        ConfigurationFactory configurationFactory,
-                                        String name) {
-    super(new RunConfigurationModule(project), configurationFactory, name);
+                                        ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
   }
 
   @Override
diff --git a/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
index cb136eaa692a..d4f074e8177a 100644
--- a/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
@@ -37,8 +37,8 @@ public class PyTestRunConfiguration extends AbstractPythonTestRunConfiguration i
   private static final String KEYWORDS_FIELD = "keywords";
   private static final String PARAMS_FIELD = "params";
 
-  public PyTestRunConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
-    super(new RunConfigurationModule(project), factory, name);
+  public PyTestRunConfiguration(final Project project, final ConfigurationFactory factory) {
+    super(project, factory);
   }
 
   protected SettingsEditor<? extends RunConfiguration> createConfigurationEditor() {
diff --git a/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java b/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
index 05bb908496fb..82a70f0bd440 100644
--- a/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
+++ b/python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
@@ -28,9 +28,8 @@ public class PythonUnitTestRunConfiguration extends
   private boolean useParam = false;
 
   public PythonUnitTestRunConfiguration(Project project,
-                                        ConfigurationFactory configurationFactory,
-                                        String name) {
-    super(new RunConfigurationModule(project), configurationFactory, name);
+                                        ConfigurationFactory configurationFactory) {
+    super(project, configurationFactory);
   }
 
   @Override