diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt
index 0c1b29b0632..ea5c2b999dd 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/coroutine/CoroutineTransformer.kt
@@ -19,8 +19,7 @@ package org.jetbrains.kotlin.js.coroutine
 import org.jetbrains.kotlin.js.backend.ast.*
 import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata
 import org.jetbrains.kotlin.js.backend.ast.metadata.isInlineableCoroutineBody
-import org.jetbrains.kotlin.js.inline.InlineSuspendFunctionSplitter
-import org.jetbrains.kotlin.js.inline.ImportInfoFragmentInliningScope
+import org.jetbrains.kotlin.js.inline.ImportIntoFragmentInliningScope
 import org.jetbrains.kotlin.js.translate.declaration.transformCoroutineMetadataToSpecialFunctions
 import org.jetbrains.kotlin.js.translate.expression.InlineMetadata
 import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
@@ -72,7 +71,7 @@ class CoroutineTransformer : JsVisitorWithContextImpl() {
 fun transformCoroutines(fragments: Iterable<JsProgramFragment>) {
     val coroutineTransformer = CoroutineTransformer()
     for (fragment in fragments) {
-        ImportInfoFragmentInliningScope.process(fragment) { scope ->
+        ImportIntoFragmentInliningScope.process(fragment) { scope ->
             coroutineTransformer.accept(scope.allCode)
         }
     }
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineSuspendFunctionSplitter.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineSuspendFunctionSplitter.kt
index 6845ea95a75..7ebcb49820c 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineSuspendFunctionSplitter.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InlineSuspendFunctionSplitter.kt
@@ -8,14 +8,13 @@ package org.jetbrains.kotlin.js.inline
 import org.jetbrains.kotlin.js.backend.ast.*
 import org.jetbrains.kotlin.js.backend.ast.metadata.coroutineMetadata
 import org.jetbrains.kotlin.js.backend.ast.metadata.isInlineableCoroutineBody
-import org.jetbrains.kotlin.js.inline.util.FunctionWithWrapper
 import org.jetbrains.kotlin.js.translate.expression.InlineMetadata
 
 // Goes through `suspend inline` function definitions and transforms into two entities:
 // 1. A `suspend` function definition, which could be invoked at run time
 // 2. A `suspend inline` function definition, which doesn't work at run time, but is understood by the inliner.
 class InlineSuspendFunctionSplitter(
-    val scope: ImportInfoFragmentInliningScope
+    val scope: ImportIntoFragmentInliningScope
 ) : JsVisitorWithContextImpl() {
 
     override fun visit(x: JsInvocation, ctx: JsContext<JsNode>): Boolean {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt
index cf3b04ae7bc..5d8f64c475c 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt
@@ -144,7 +144,7 @@ sealed class InliningScope {
     }
 }
 
-class ImportInfoFragmentInliningScope private constructor(
+class ImportIntoFragmentInliningScope private constructor(
     override val fragment: JsProgramFragment
 ) : InliningScope() {
 
@@ -231,8 +231,8 @@ class ImportInfoFragmentInliningScope private constructor(
     }
 
     companion object {
-        fun process(fragment: JsProgramFragment, fn: (ImportInfoFragmentInliningScope) -> Unit) {
-            val scope = ImportInfoFragmentInliningScope(fragment)
+        fun process(fragment: JsProgramFragment, fn: (ImportIntoFragmentInliningScope) -> Unit) {
+            val scope = ImportIntoFragmentInliningScope(fragment)
             fn(scope)
 
             scope.apply {
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.kt
index fdfe92902b3..70e4001ef43 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.kt
@@ -27,7 +27,7 @@ class JsInliner(
 
     fun process() {
         for (fragment in translationResult.newFragments) {
-            ImportInfoFragmentInliningScope.process(fragment) { fragmentScope ->
+            ImportIntoFragmentInliningScope.process(fragment) { fragmentScope ->
                 InlineAstVisitor(this, fragmentScope).accept(fragmentScope.allCode)
             }
         }
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
index 94804e3b792..6e4152b053d 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
@@ -136,7 +136,8 @@ fun collectDefinedNamesInAllScopes(scope: JsNode): Set<JsName> {
 
         override fun visitFunction(x: JsFunction) {
             super.visitFunction(x)
-            // TODO This is a hack
+            // The order is important. `function foo` and `var foo = wrapfunction(..)` should yield JsName's in the same order.
+            // TODO make more robust
             names += x.parameters.map { it.name }
             x.name?.let { names += it }
         }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt
index b98c9909f38..da900437e63 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt
@@ -169,6 +169,7 @@ class K2JSTranslator @JvmOverloads constructor(
         bindingTrace: BindingTrace,
         moduleDescriptor: ModuleDescriptor
     ) {
+        // TODO Maybe switch validation on for recompile
         if (incrementalResults == null && !shouldValidateJsAst) return
 
         val serializer = JsAstSerializer(if (shouldValidateJsAst) ::validateJsAst else null) { file ->