diff --git a/platform/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/DeploymentConfigurator.java b/platform/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/DeploymentConfigurator.java
index f3242efbe020..d9a899ac4849 100644
--- a/platform/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/DeploymentConfigurator.java
+++ b/platform/remote-servers/api/src/com/intellij/remoteServer/configuration/deployment/DeploymentConfigurator.java
@@ -40,7 +40,19 @@ public abstract class DeploymentConfigurator<D extends DeploymentConfiguration,
   /**
    * @see LocatableConfiguration#isGeneratedName()
    */
-  public boolean isGeneratedConfigurationName(@NotNull String name, @NotNull DeploymentSource deploymentSource) {
+  public boolean isGeneratedConfigurationName(@NotNull String name,
+                                              @NotNull DeploymentSource deploymentSource,
+                                              @NotNull D deploymentConfiguration) {
+    return isGeneratedConfigurationName(name, deploymentSource);
+  }
+
+  /**
+   * @see LocatableConfiguration#isGeneratedName()
+   * @deprecated Since 2017.3, subclasses should directly override {@link
+   * #isGeneratedConfigurationName(String, DeploymentSource, DeploymentConfiguration)}
+   */
+  @Deprecated
+  protected boolean isGeneratedConfigurationName(@NotNull String name, @NotNull DeploymentSource deploymentSource) {
     return false;
   }
 
@@ -48,7 +60,18 @@ public abstract class DeploymentConfigurator<D extends DeploymentConfiguration,
    * @see LocatableConfiguration#suggestedName()
    */
   @Nullable
-  public String suggestConfigurationName(@NotNull DeploymentSource deploymentSource) {
+  public String suggestConfigurationName(@NotNull DeploymentSource deploymentSource, @NotNull D deploymentConfiguration) {
+    return suggestConfigurationName(deploymentSource);
+  }
+
+  /**
+   * @see LocatableConfiguration#suggestedName()
+   * @deprecated Since 2017.3, subclasses should directly override {@link
+   * {@link #suggestConfigurationName(DeploymentSource, DeploymentConfiguration)}
+   */
+  @Deprecated
+  @Nullable
+  protected String suggestConfigurationName(@NotNull DeploymentSource deploymentSource) {
     return null;
   }
 }
diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfiguration.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfiguration.java
index 78b9b098ac80..17a265aa8c23 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfiguration.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/deployment/DeployToServerRunConfiguration.java
@@ -162,13 +162,17 @@ public class DeployToServerRunConfiguration<S extends ServerConfiguration, D ext
 
   @Override
   public boolean isGeneratedName() {
-    return getDeploymentSource() != null && getDeploymentConfigurator().isGeneratedConfigurationName(getName(), getDeploymentSource());
+    return getDeploymentSource() != null && getDeploymentConfiguration() != null &&
+           getDeploymentConfigurator().isGeneratedConfigurationName(getName(), getDeploymentSource(), getDeploymentConfiguration());
   }
 
   @Nullable
   @Override
   public String suggestedName() {
-    return getDeploymentSource() == null ? null : getDeploymentConfigurator().suggestConfigurationName(getDeploymentSource());
+    if (getDeploymentSource() == null || getDeploymentConfiguration() == null) {
+      return null;
+    }
+    return getDeploymentConfigurator().suggestConfigurationName(getDeploymentSource(), getDeploymentConfiguration());
   }
 
   @Override