diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml
index 847c415fe0fa..57df91bfea5e 100644
--- a/python/src/META-INF/python-core-common.xml
+++ b/python/src/META-INF/python-core-common.xml
@@ -630,7 +630,7 @@
     <extensionPoint qualifiedName="Pythonid.pyCustomSdkUiProvider" interface="com.jetbrains.python.sdk.PyCustomSdkUiProvider"/>
     <extensionPoint qualifiedName="Pythonid.pep8ProblemSuppressor" interface="com.jetbrains.python.validation.Pep8ProblemSuppressor"/>
     <extensionPoint qualifiedName="Pythonid.pythonFlavorProvider" interface="com.jetbrains.python.sdk.flavors.PythonFlavorProvider"/>
-    <extensionPoint qualifiedName="Pythonid.pyRemoteDebugSessionCreator" interface="com.jetbrains.python.debugger.PyRemoteDebugSessionCreator"/>
+    <extensionPoint qualifiedName="Pythonid.debugSessionFactory" interface="com.jetbrains.python.debugger.PyDebugSessionFactory"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="Pythonid">
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java
index 8ffa7a88e38f..b6d399f192c9 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugRunner.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugRunner.java
@@ -127,7 +127,7 @@ public class PyDebugRunner extends GenericProgramRunner {
     Sdk sdk = pyState.getSdk();
     if (sdk != null && sdk.getSdkAdditionalData() instanceof RemoteSdkAdditionalData) {
       RemoteSdkAdditionalData remoteSdkAdditionalData = (RemoteSdkAdditionalData)sdk.getSdkAdditionalData();
-      PyRemoteDebugSessionCreator sessionCreator = PyRemoteDebugSessionCreator.findExtension(remoteSdkAdditionalData);
+      PyDebugSessionFactory sessionCreator = PyDebugSessionFactory.findExtension(remoteSdkAdditionalData);
       if (sessionCreator != null) {
         return sessionCreator.createSession(this, pyState, environment);
       }
diff --git a/python/src/com/jetbrains/python/debugger/PyRemoteDebugSessionCreator.java b/python/src/com/jetbrains/python/debugger/PyDebugSessionFactory.java
similarity index 81%
rename from python/src/com/jetbrains/python/debugger/PyRemoteDebugSessionCreator.java
rename to python/src/com/jetbrains/python/debugger/PyDebugSessionFactory.java
index 3c9c6c8640b4..769f316e1935 100644
--- a/python/src/com/jetbrains/python/debugger/PyRemoteDebugSessionCreator.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugSessionFactory.java
@@ -28,9 +28,9 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author Alexander Koshevoy
  */
-public abstract class PyRemoteDebugSessionCreator {
-  public static final ExtensionPointName<PyRemoteDebugSessionCreator> EP_NAME
-    = ExtensionPointName.create("Pythonid.pyRemoteDebugSessionCreator");
+public abstract class PyDebugSessionFactory {
+  public static final ExtensionPointName<PyDebugSessionFactory> EP_NAME
+    = ExtensionPointName.create("Pythonid.debugSessionFactory");
 
   protected abstract boolean appliesTo(@NotNull RemoteSdkAdditionalData remoteSdkAdditionalData);
 
@@ -42,11 +42,11 @@ public abstract class PyRemoteDebugSessionCreator {
 
   @Contract("null -> null")
   @Nullable
-  public static PyRemoteDebugSessionCreator findExtension(@Nullable RemoteSdkAdditionalData remoteSdkAdditionalData) {
+  public static PyDebugSessionFactory findExtension(@Nullable RemoteSdkAdditionalData remoteSdkAdditionalData) {
     if (remoteSdkAdditionalData == null) {
       return null;
     }
-    for (PyRemoteDebugSessionCreator sessionCreator : EP_NAME.getExtensions()) {
+    for (PyDebugSessionFactory sessionCreator : EP_NAME.getExtensions()) {
       if (sessionCreator.appliesTo(remoteSdkAdditionalData)) {
         return sessionCreator;
       }