diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java
index 0281ef33a..e7cc650b7 100644
--- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java
+++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java
@@ -1,8 +1,10 @@
-// Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.sdk.runConfiguration;
 
-import com.intellij.execution.configurations.*;
+import com.intellij.execution.configurations.ConfigurationFactory;
+import com.intellij.execution.configurations.ConfigurationType;
+import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.components.BaseState;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
@@ -10,24 +12,21 @@ import org.jetbrains.annotations.Nullable;
 
 public class DemoConfigurationFactory extends ConfigurationFactory {
 
-  private static final String FACTORY_NAME = "Demo configuration factory";
-
   protected DemoConfigurationFactory(ConfigurationType type) {
     super(type);
   }
 
+  @Override
+  public @NotNull String getId() {
+    return DemoRunConfigurationType.ID;
+  }
+
   @NotNull
   @Override
   public RunConfiguration createTemplateConfiguration(@NotNull Project project) {
     return new DemoRunConfiguration(project, this, "Demo");
   }
 
-  @NotNull
-  @Override
-  public String getName() {
-    return FACTORY_NAME;
-  }
-
   @Nullable
   @Override
   public Class<? extends BaseState> getOptionsClass() {
diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java
index b269cd2f4..9ff0c4e28 100644
--- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java
+++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.sdk.runConfiguration;
 
@@ -11,6 +11,8 @@ import javax.swing.*;
 
 public class DemoRunConfigurationType implements ConfigurationType {
 
+  static final String ID = "DemoRunConfiguration";
+
   @NotNull
   @Override
   public String getDisplayName() {
@@ -30,7 +32,7 @@ public class DemoRunConfigurationType implements ConfigurationType {
   @NotNull
   @Override
   public String getId() {
-    return "DEMO_RUN_CONFIGURATION";
+    return ID;
   }
 
   @Override