diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt
index 3b8d823dfb4..0909877e9ae 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt
@@ -73,7 +73,7 @@ class MultiplatformGradleProjectTaskRunner : GradleProjectTaskRunner() {
     ) {
         val configuration = context.runConfiguration
         if (configuration is ModuleBasedConfiguration<*> &&
-            (configuration.configurationModule is JavaRunConfigurationModule || configuration is JetRunConfiguration)) {
+            (configuration.configurationModule is JavaRunConfigurationModule || configuration is KotlinRunConfiguration)) {
 
             val module = configuration.configurationModule.module
             if (module?.targetPlatform == TargetPlatformKind.Common) {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
index 98175f337ee..0966fd10c18 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
@@ -33,7 +33,7 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
-import org.jetbrains.kotlin.idea.run.JetRunConfiguration
+import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
@@ -42,7 +42,7 @@ import java.io.File
 class KotlinCoverageExtension : JavaCoverageEngineExtension() {
     private val LOG = Logger.getInstance(KotlinCoverageExtension::class.java)
 
-    override fun isApplicableTo(conf: RunConfigurationBase?): Boolean = conf is JetRunConfiguration
+    override fun isApplicableTo(conf: RunConfigurationBase?): Boolean = conf is KotlinRunConfiguration
 
     override fun suggestQualifiedName(sourceFile: PsiFile, classes: Array<out PsiClass>, names: MutableSet<String>): Boolean {
         if (sourceFile is KtFile) {
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3271db4703f..bb596d2aa6a 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -629,7 +629,7 @@
 
     <lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider" order="first"/>
     <documentationProvider implementation="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider"/>
-    <configurationType implementation="org.jetbrains.kotlin.idea.run.JetRunConfigurationType"/>
+    <configurationType implementation="org.jetbrains.kotlin.idea.run.KotlinRunConfigurationType"/>
     <configurationType implementation="org.jetbrains.kotlin.idea.run.script.standalone.KotlinStandaloneScriptRunConfigurationType"/>
     <configurationType implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSRunConfigurationType"/>
     <programRunner implementation="org.jetbrains.kotlin.idea.k2jsrun.K2JSBrowserProgramRunner"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
rename to idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
index 7b40691a48c..ee51a0282a6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
@@ -64,7 +64,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
 
 import java.util.*;
 
-public class JetRunConfiguration extends ModuleBasedConfiguration<JavaRunConfigurationModule>
+public class KotlinRunConfiguration extends ModuleBasedConfiguration<JavaRunConfigurationModule>
     implements CommonJavaRunConfigurationParameters, RefactoringListenerProvider {
 
     public String MAIN_CLASS_NAME;
@@ -77,7 +77,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     private Map<String, String> myEnvs = new LinkedHashMap<String, String>();
     public boolean PASS_PARENT_ENVS = true;
 
-    public JetRunConfiguration(String name, JavaRunConfigurationModule runConfigurationModule, ConfigurationFactory factory) {
+    public KotlinRunConfiguration(String name, JavaRunConfigurationModule runConfigurationModule, ConfigurationFactory factory) {
         super(name, runConfigurationModule, factory);
         runConfigurationModule.init();
     }
@@ -96,10 +96,10 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     @NotNull
     @Override
     public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
-        SettingsEditorGroup<JetRunConfiguration> group = new SettingsEditorGroup<JetRunConfiguration>();
-        group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new JetRunConfigurationEditor(getProject()));
+        SettingsEditorGroup<KotlinRunConfiguration> group = new SettingsEditorGroup<KotlinRunConfiguration>();
+        group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new KotlinRunConfigurationEditor(getProject()));
         JavaRunConfigurationExtensionManager.getInstance().appendEditors(this, group);
-        group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel<JetRunConfiguration>());
+        group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel<KotlinRunConfiguration>());
         return group;
     }
 
@@ -337,8 +337,8 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
         return null;
     }
 
-    private static class MyJavaCommandLineState extends BaseJavaApplicationCommandLineState<JetRunConfiguration> {
-        public MyJavaCommandLineState(@NotNull JetRunConfiguration configuration, ExecutionEnvironment environment) {
+    private static class MyJavaCommandLineState extends BaseJavaApplicationCommandLineState<KotlinRunConfiguration> {
+        public MyJavaCommandLineState(@NotNull KotlinRunConfiguration configuration, ExecutionEnvironment environment) {
             super(environment, configuration);
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.form
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
rename to idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.form
index 95c2ef7ca02..fa415648544 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.run.JetRunConfigurationEditor">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.run.KotlinRunConfigurationEditor">
   <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java
similarity index 91%
rename from idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
rename to idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java
index 93b3dbd27b8..c0079a739c6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationEditor.java
@@ -35,7 +35,7 @@ import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> implements PanelWithAnchor {
+public class KotlinRunConfigurationEditor extends SettingsEditor<KotlinRunConfiguration> implements PanelWithAnchor {
     private JPanel mainPanel;
     private LabeledComponent<JTextField> mainClass;
 
@@ -46,7 +46,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     private final ConfigurationModuleSelector moduleSelector;
     private JComponent anchor;
 
-    public JetRunConfigurationEditor(Project project) {
+    public KotlinRunConfigurationEditor(Project project) {
         moduleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
         jrePathEditor.setDefaultJreSelector(DefaultJreSelector.fromModuleDependencies(moduleChooser.getComponent(), false));
         commonProgramParameters.setModuleContext(moduleSelector.getModule());
@@ -61,7 +61,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     }
 
     @Override
-    protected void applyEditorTo(JetRunConfiguration configuration) throws ConfigurationException {
+    protected void applyEditorTo(KotlinRunConfiguration configuration) throws ConfigurationException {
         commonProgramParameters.applyTo(configuration);
         moduleSelector.applyTo(configuration);
 
@@ -74,7 +74,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     }
 
     @Override
-    protected void resetEditorFrom(JetRunConfiguration configuration) {
+    protected void resetEditorFrom(KotlinRunConfiguration configuration) {
         commonProgramParameters.reset(configuration);
         moduleSelector.reset(configuration);
         mainClass.getComponent().setText(configuration.MAIN_CLASS_NAME != null ? configuration.MAIN_CLASS_NAME.replaceAll("\\$", "\\.") : "");
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationProducer.kt b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationProducer.kt
index d22b5b5ae0f..3276cbb6a19 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationProducer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationProducer.kt
@@ -39,9 +39,9 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
-class KotlinRunConfigurationProducer : RunConfigurationProducer<JetRunConfiguration>(JetRunConfigurationType.getInstance()) {
+class KotlinRunConfigurationProducer : RunConfigurationProducer<KotlinRunConfiguration>(KotlinRunConfigurationType.getInstance()) {
 
-    override fun setupConfigurationFromContext(configuration: JetRunConfiguration,
+    override fun setupConfigurationFromContext(configuration: KotlinRunConfiguration,
                                                context: ConfigurationContext,
                                                sourceElement: Ref<PsiElement>): Boolean {
         val location = context.location ?: return false
@@ -70,7 +70,7 @@ class KotlinRunConfigurationProducer : RunConfigurationProducer<JetRunConfigurat
         return getEntryPointContainer(locationElement)
     }
 
-    override fun isConfigurationFromContext(configuration: JetRunConfiguration, context: ConfigurationContext): Boolean {
+    override fun isConfigurationFromContext(configuration: KotlinRunConfiguration, context: ConfigurationContext): Boolean {
         val startClassFQName = getStartClassFqName(getEntryPointContainer(context.location)) ?: return false
 
         return configuration.runClass == startClassFQName &&
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationType.java
similarity index 59%
rename from idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java
rename to idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationType.java
index b3d6172311e..76f47c9e0c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinRunConfigurationType.java
@@ -22,25 +22,25 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinIcons;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
 
-public class JetRunConfigurationType extends ConfigurationTypeBase {
-    public static JetRunConfigurationType getInstance() {
-        return ConfigurationTypeUtil.findConfigurationType(JetRunConfigurationType.class);
+public class KotlinRunConfigurationType extends ConfigurationTypeBase {
+    public static KotlinRunConfigurationType getInstance() {
+        return ConfigurationTypeUtil.findConfigurationType(KotlinRunConfigurationType.class);
     }
 
-    public JetRunConfigurationType() {
-        super("JetRunConfigurationType", KotlinLanguage.NAME, KotlinLanguage.NAME, KotlinIcons.SMALL_LOGO_13);
-        addFactory(new JetRunConfigurationFactory(this));
+    public KotlinRunConfigurationType() {
+        super("KotlinRunConfigurationType", KotlinLanguage.NAME, KotlinLanguage.NAME, KotlinIcons.SMALL_LOGO_13);
+        addFactory(new KotlinRunConfigurationFactory(this));
     }
 
-    private static class JetRunConfigurationFactory extends ConfigurationFactory {
-        protected JetRunConfigurationFactory(@NotNull ConfigurationType type) {
+    private static class KotlinRunConfigurationFactory extends ConfigurationFactory {
+        protected KotlinRunConfigurationFactory(@NotNull ConfigurationType type) {
             super(type);
         }
 
         @NotNull
         @Override
         public RunConfiguration createTemplateConfiguration(@NotNull Project project) {
-            return new JetRunConfiguration("", new JavaRunConfigurationModule(project, true), this);
+            return new KotlinRunConfiguration("", new JavaRunConfigurationModule(project, true), this);
         }
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
index 8c2fa1449cd..b7bec3ab30d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
@@ -123,10 +123,10 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() {
 
         ModuleRootModificationUtil.addDependency(moduleWithDependency, module)
 
-        val jetRunConfiguration = createConfigurationFromMain("some.test.main")
-        jetRunConfiguration.setModule(moduleWithDependency)
+        val kotlinRunConfiguration = createConfigurationFromMain("some.test.main")
+        kotlinRunConfiguration.setModule(moduleWithDependency)
 
-        val javaParameters = getJavaRunParameters(jetRunConfiguration)
+        val javaParameters = getJavaRunParameters(kotlinRunConfiguration)
 
         Assert.assertTrue(javaParameters.classPath.rootDirs.contains(dependencyModuleSrcDir))
         Assert.assertTrue(javaParameters.classPath.rootDirs.contains(moduleWithDependencySrcDir))
@@ -212,7 +212,7 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() {
                             val dataContext = MapDataContext()
                             dataContext.put(Location.DATA_KEY, PsiLocation(getTestProject(), declaration))
                             val context = ConfigurationContext.getFromContext(dataContext)
-                            val actualClass = (context.configuration?.configuration as? JetRunConfiguration)?.runClass
+                            val actualClass = (context.configuration?.configuration as? KotlinRunConfiguration)?.runClass
                             if (actualClass != null) {
                                 actualClasses.add(actualClass)
                             }
@@ -226,16 +226,16 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() {
         }
     }
 
-    private fun createConfigurationFromMain(mainFqn: String): JetRunConfiguration {
+    private fun createConfigurationFromMain(mainFqn: String): KotlinRunConfiguration {
         val mainFunction = KotlinTopLevelFunctionFqnNameIndex.getInstance().get(mainFqn, getTestProject(), getTestProject().allScope()).first()
 
-        return createConfigurationFromElement(mainFunction) as JetRunConfiguration
+        return createConfigurationFromElement(mainFunction) as KotlinRunConfiguration
     }
 
-    private fun createConfigurationFromObject(objectFqn: String, save: Boolean = false): JetRunConfiguration {
+    private fun createConfigurationFromObject(objectFqn: String, save: Boolean = false): KotlinRunConfiguration {
         val obj = KotlinFullClassNameIndex.getInstance().get(objectFqn, getTestProject(), getTestProject().allScope()).single()
         val mainFunction = obj.declarations.single { it is KtFunction && it.getName() == "main" }
-        return createConfigurationFromElement(mainFunction, save) as JetRunConfiguration
+        return createConfigurationFromElement(mainFunction, save) as KotlinRunConfiguration
     }
 
     private fun configureModule(moduleDir: String, outputParentDir: VirtualFile, configModule: Module = module): CreateModuleResult {