diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt
index 7e0835b852f..c78093b1818 100644
--- a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt
+++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt
@@ -134,9 +134,7 @@ class KotlinConsoleRunner(
 
     private val consoleScriptDefinition = object : KotlinScriptDefinition(Any::class) {
         override val name = "Kotlin REPL"
-        override fun isScript(fileName: String): Boolean {
-            return fileName == consoleView.virtualFile.name
-        }
+        override fun isScript(fileName: String): Boolean = fileName.startsWith(consoleView.virtualFile.name)
         override fun getScriptName(script: KtScript) = Name.identifier("REPL")
     }
 
@@ -278,10 +276,13 @@ class KotlinConsoleRunner(
         runReadAction {
             val lineNumber = replState.successfulLinesCount + 1
             val virtualFile =
-                    LightVirtualFile("line$lineNumber${KotlinParserDefinition.STD_SCRIPT_EXT}", KotlinLanguage.INSTANCE, text).apply {
-                        charset = CharsetToolkit.UTF8_CHARSET
-                        isWritable = false
-                    }
+                LightVirtualFile(
+                    "${consoleView.virtualFile.name}$lineNumber${KotlinParserDefinition.STD_SCRIPT_EXT}",
+                    KotlinLanguage.INSTANCE, text
+                ).apply {
+                    charset = CharsetToolkit.UTF8_CHARSET
+                    isWritable = false
+                }
             val psiFile = (PsiFileFactory.getInstance(project) as PsiFileFactoryImpl).trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile?
                           ?: error("Failed to setup PSI for file:\n$text")
 
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt
index 8bf58115d46..6f4d531b9bb 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt
@@ -23,7 +23,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
     protected open fun getScriptingHostConfiguration(): ScriptingHostConfiguration = defaultJvmScriptingHostConfiguration
 
     override fun getDefaultDefinition(): ScriptDefinition =
-        ScriptDefinition.FromLegacy(getScriptingHostConfiguration(), StandardScriptDefinition)
+        ScriptDefinition.getDefault(getScriptingHostConfiguration())
 
     private var _cachedDefinitions: Sequence<ScriptDefinition>? = null
     private val cachedDefinitions: Sequence<ScriptDefinition>