diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 13e7256ee9f..2e19cf5889a 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -28,7 +28,7 @@
           <element id="module-output" name="deserialization" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
-          <element id="module-output" name="js.dart-ast" />
+          <element id="module-output" name="js.ast" />
           <element id="directory" name="kotlin">
             <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
             <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1d80f7c9453..2823659c3a1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -65,7 +65,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" filepath="$PROJECT_DIR$/plugins/java-model-wrappers/java-model-wrappers.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-plugin.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" filepath="$PROJECT_DIR$/jps-plugin/jps-tests/jps-tests.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" filepath="$PROJECT_DIR$/js/js.dart-ast/js.dart-ast.iml" group="compiler/js" />
+      <module fileurl="file://$PROJECT_DIR$/js/js.ast/js.ast.iml" filepath="$PROJECT_DIR$/js/js.ast/js.ast.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.frontend/js.frontend.iml" filepath="$PROJECT_DIR$/js/js.frontend/js.frontend.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.inliner/js.inliner.iml" filepath="$PROJECT_DIR$/js/js.inliner/js.inliner.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.parser/js.parser.iml" filepath="$PROJECT_DIR$/js/js.parser/js.parser.iml" group="compiler/js" />
diff --git a/build.xml b/build.xml
index 42efe246a54..9192e65a992 100644
--- a/build.xml
+++ b/build.xml
@@ -111,7 +111,7 @@
         <include name="compiler/incremental-compilation-impl/src"/>
         <include name="compiler/serialization/src"/>
         <include name="compiler/util/src"/>
-        <include name="js/js.dart-ast/src"/>
+        <include name="js/js.ast/src"/>
         <include name="js/js.translator/src"/>
         <include name="js/js.frontend/src"/>
         <include name="js/js.inliner/src"/>
@@ -149,7 +149,7 @@
         <include name="plugin-api/**"/>
         <include name="annotation-collector/**"/>
         <include name="builtins-serializer/**"/>
-        <include name="js.dart-ast/**"/>
+        <include name="js.ast/**"/>
         <include name="js.translator/**"/>
         <include name="js.frontend/**"/>
         <include name="js.inliner/**"/>
@@ -260,7 +260,7 @@
             <fileset dir="plugins/annotation-collector/src"/>
             <fileset dir="compiler/serialization/src"/>
             <fileset dir="compiler/util/src"/>
-            <fileset dir="js/js.dart-ast/src"/>
+            <fileset dir="js/js.ast/src"/>
             <fileset dir="js/js.translator/src"/>
             <fileset dir="js/js.frontend/src"/>
             <fileset dir="js/js.inliner/src"/>
diff --git a/generators/generators.iml b/generators/generators.iml
index 4584b2ac1c2..29771fc715e 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -23,7 +23,7 @@
     <orderEntry type="module" module-name="jps-tests" scope="TEST" />
     <orderEntry type="module" module-name="j2k" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
+    <orderEntry type="module" module-name="js.ast" scope="TEST" />
     <orderEntry type="module" module-name="js.frontend" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />
diff --git a/js/js.dart-ast/License.txt b/js/js.ast/License.txt
similarity index 100%
rename from js/js.dart-ast/License.txt
rename to js/js.ast/License.txt
diff --git a/js/js.dart-ast/js.dart-ast.iml b/js/js.ast/js.ast.iml
similarity index 100%
rename from js/js.dart-ast/js.dart-ast.iml
rename to js/js.ast/js.ast.iml
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/Source.java b/js/js.ast/src/com/google/dart/compiler/Source.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/Source.java
rename to js/js.ast/src/com/google/dart/compiler/Source.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsConstructExpressionVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsFirstExpressionVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsPrecedenceVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsRequiresSemiVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsReservedIdentifiers.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/AbstractNode.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasArguments.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasCondition.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasName.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasName.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/HasName.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/HasName.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayAccess.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsArrayLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperation.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBinaryOperator.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBlock.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsBreak.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCase.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatch.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsCatchScope.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsConditional.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContext.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsContinue.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDebugger.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDefault.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDoWhile.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsDocComment.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsEmpty.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpression.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsExpressionStatement.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsForIn.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsFunction.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsGlobalBlock.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsIf.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsInvocation.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLabel.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsName.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsName.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsName.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsName.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNameRef.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNew.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNode.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNullLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsNumberLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsObjectLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsOperator.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsParameter.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPostfixOperation.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPrefixOperation.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgram.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsProgramFragment.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsPropertyInitializer.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRegExp.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsReturn.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsRootScope.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsScope.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStatement.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsStringLiteral.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitch.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsSwitchMember.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsThrow.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsTry.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperation.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsUnaryOperator.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVars.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitor.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContext.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsVisitorWithContextImpl.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/JsWhile.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/RecursiveJsVisitor.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/SourceInfoAwareJsNode.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/HasMetadata.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/MetadataProperty.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt b/js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt
rename to js/js.ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/common/HasSymbol.java b/js/js.ast/src/com/google/dart/compiler/common/HasSymbol.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/common/HasSymbol.java
rename to js/js.ast/src/com/google/dart/compiler/common/HasSymbol.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/common/SourceInfo.java b/js/js.ast/src/com/google/dart/compiler/common/SourceInfo.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/common/SourceInfo.java
rename to js/js.ast/src/com/google/dart/compiler/common/SourceInfo.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/common/SourceInfoImpl.java b/js/js.ast/src/com/google/dart/compiler/common/SourceInfoImpl.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/common/SourceInfoImpl.java
rename to js/js.ast/src/com/google/dart/compiler/common/SourceInfoImpl.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/common/Symbol.java b/js/js.ast/src/com/google/dart/compiler/common/Symbol.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/common/Symbol.java
rename to js/js.ast/src/com/google/dart/compiler/common/Symbol.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/util/AstUtil.java b/js/js.ast/src/com/google/dart/compiler/util/AstUtil.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/util/AstUtil.java
rename to js/js.ast/src/com/google/dart/compiler/util/AstUtil.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/util/Maps.java b/js/js.ast/src/com/google/dart/compiler/util/Maps.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/util/Maps.java
rename to js/js.ast/src/com/google/dart/compiler/util/Maps.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/util/TextOutput.java b/js/js.ast/src/com/google/dart/compiler/util/TextOutput.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/util/TextOutput.java
rename to js/js.ast/src/com/google/dart/compiler/util/TextOutput.java
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/util/TextOutputImpl.java b/js/js.ast/src/com/google/dart/compiler/util/TextOutputImpl.java
similarity index 100%
rename from js/js.dart-ast/src/com/google/dart/compiler/util/TextOutputImpl.java
rename to js/js.ast/src/com/google/dart/compiler/util/TextOutputImpl.java
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
index 18b3b5645c5..6a43a35cbcc 100644
--- a/js/js.frontend/js.frontend.iml
+++ b/js/js.frontend/js.frontend.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="js.dart-ast" exported="" />
+    <orderEntry type="module" module-name="js.ast" exported="" />
     <orderEntry type="module" module-name="js.parser" exported="" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.serializer" />
diff --git a/js/js.inliner/js.inliner.iml b/js/js.inliner/js.inliner.iml
index 4ff4bb0b001..f4e6da9b424 100644
--- a/js/js.inliner/js.inliner.iml
+++ b/js/js.inliner/js.inliner.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptors" />
-    <orderEntry type="module" module-name="js.dart-ast" />
+    <orderEntry type="module" module-name="js.ast" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="module" module-name="js.parser" />
     <orderEntry type="module" module-name="frontend" />
diff --git a/js/js.parser/js.parser.iml b/js/js.parser/js.parser.iml
index bb4d75fe325..9add1fd0a16 100644
--- a/js/js.parser/js.parser.iml
+++ b/js/js.parser/js.parser.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="js.dart-ast" />
+    <orderEntry type="module" module-name="js.ast" />
     <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/js/js.translator/js.translator.iml b/js/js.translator/js.translator.iml
index 6163c47e65b..2b0290301cf 100644
--- a/js/js.translator/js.translator.iml
+++ b/js/js.translator/js.translator.iml
@@ -10,7 +10,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="backend-common" />
-    <orderEntry type="module" module-name="js.dart-ast" exported="" />
+    <orderEntry type="module" module-name="js.ast" exported="" />
     <orderEntry type="module" module-name="js.frontend" exported="" />
     <orderEntry type="module" module-name="js.inliner" exported="" />
     <orderEntry type="module" module-name="js.parser" />
diff --git a/non-compiler-tests/non-compiler-tests.iml b/non-compiler-tests/non-compiler-tests.iml
index 267c8cf0da5..3b11639af68 100644
--- a/non-compiler-tests/non-compiler-tests.iml
+++ b/non-compiler-tests/non-compiler-tests.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="jps-tests" scope="TEST" />
     <orderEntry type="module" module-name="j2k" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
+    <orderEntry type="module" module-name="js.ast" scope="TEST" />
     <orderEntry type="module" module-name="js.frontend" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="android-extensions-compiler" scope="TEST" />