diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
index a20110aa81d..3cd6faad344 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.inline
 import com.google.dart.compiler.backend.js.ast.*
 import com.google.dart.compiler.backend.js.ast.metadata.inlineStrategy
 import com.google.dart.compiler.common.SourceInfoImpl
-import com.google.gwt.dev.js.JsParser
+import com.google.gwt.dev.js.JsAstMapper
 import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter
 import com.google.gwt.dev.js.parserExceptions.AbortParsingException
 import com.google.gwt.dev.js.parserExceptions.JsParserException
@@ -152,7 +152,7 @@ public class FunctionReader(private val context: TranslationContext) {
             val info = SourceInfoImpl(null, 0, 0, 0, 0)
             val scope = JsRootScope(context.program())
             val reader = StringReader(source)
-            return JsParser.parse(info, scope, reader, ThrowExceptionOnErrorReporter, /* insideFunction= */ false)
+            return JsAstMapper.parse(info, scope, reader, ThrowExceptionOnErrorReporter, /* insideFunction= */ false)
         }
         catch (e: Exception) {
             throw RuntimeException(e)
diff --git a/js/js.parser/src/com/google/gwt/dev/js/JsParser.java b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java
similarity index 99%
rename from js/js.parser/src/com/google/gwt/dev/js/JsParser.java
rename to js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java
index adf6126db06..ccf48c6807e 100644
--- a/js/js.parser/src/com/google/gwt/dev/js/JsParser.java
+++ b/js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java
@@ -34,7 +34,7 @@ import static com.google.dart.compiler.util.AstUtil.toFunctionScope;
 /**
  * Parses JavaScript source.
  */
-public class JsParser {
+public class JsAstMapper {
 
     private final JsProgram program;
     private final ScopeContext scopeContext;
@@ -45,7 +45,7 @@ public class JsParser {
             ErrorReporter errorReporter,
             boolean insideFunction
     ) throws IOException, JsParserException {
-        return new JsParser(scope).parseImpl(rootSourceInfo, r, errorReporter, insideFunction);
+        return new JsAstMapper(scope).parseImpl(rootSourceInfo, r, errorReporter, insideFunction);
     }
 
     /**
@@ -53,7 +53,7 @@ public class JsParser {
      */
     private static final String SOURCE_NAME_STUB = "jsCode";
 
-    private JsParser(@NotNull JsScope scope) {
+    private JsAstMapper(@NotNull JsScope scope) {
         scopeContext = new ScopeContext(scope);
         program = scope.getProgram();
     }
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java
index bb0db6ee201..2b673b70446 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.reference;
 
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.common.SourceInfoImpl;
-import com.google.gwt.dev.js.JsParser;
+import com.google.gwt.dev.js.JsAstMapper;
 import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -144,7 +144,7 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl
             SourceInfoImpl info = new SourceInfoImpl(null, 0, 0, 0, 0);
             JsScope scope = context().scope();
             StringReader reader = new StringReader(jsCode);
-            statements.addAll(JsParser.parse(info, scope, reader, ThrowExceptionOnErrorReporter.INSTANCE$, /* insideFunction= */ true));
+            statements.addAll(JsAstMapper.parse(info, scope, reader, ThrowExceptionOnErrorReporter.INSTANCE$, /* insideFunction= */ true));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }