royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 12/20: more renaming per issue #17
Date Wed, 04 Oct 2017 22:35:05 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 4ada6b84a69a1ad813e390e9b5612226d7aa6b1d
Author: Alex Harui <aharui@apache.org>
AuthorDate: Tue Oct 3 12:43:37 2017 -0700

    more renaming per issue #17
---
 .../javascript/jscomp/RoyaleDiagnosticGroups.java  |  8 ++---
 .../royale/compiler/asdoc/royale/ASDocComment.java |  2 +-
 .../apache/royale/compiler/clients/ASDOCJSC.java   |  8 ++---
 .../royale/compiler/clients/COMPJSCFlex.java       |  2 +-
 .../apache/royale/compiler/clients/MXMLJSC.java    |  6 ++--
 .../royale/compiler/clients/MXMLJSCFlex.java       |  2 +-
 .../compiler/clients/MXMLJSCFlexCordova.java       |  2 +-
 .../royale/compiler/clients/RoyaleToolGroup.java   |  2 +-
 .../codegen/js/royale/IJSRoyaleASDocEmitter.java   |  2 +-
 .../codegen/js/royale/IJSRoyaleEmitter.java        |  2 +-
 .../codegen/mxml/royale/IMXMLRoyaleEmitter.java    |  2 +-
 .../internal/codegen/js/goog/JSGoogDocEmitter.java |  2 +-
 .../internal/codegen/js/jsc/JSCJSEmitter.java      |  2 +-
 .../internal/codegen/js/jsc/JSCPublisher.java      |  2 +-
 .../internal/codegen/js/jx/AccessorEmitter.java    |  6 ++--
 .../internal/codegen/js/jx/AsIsEmitter.java        |  6 ++--
 .../codegen/js/jx/BinaryOperatorEmitter.java       |  6 ++--
 .../internal/codegen/js/jx/BindableEmitter.java    |  2 +-
 .../internal/codegen/js/jx/ClassEmitter.java       |  8 ++---
 .../js/jx/DefinePropertyFunctionEmitter.java       |  2 +-
 .../internal/codegen/js/jx/ForEachEmitter.java     |  2 +-
 .../codegen/js/jx/FunctionCallEmitter.java         |  4 +--
 .../internal/codegen/js/jx/IdentifierEmitter.java  |  2 +-
 .../internal/codegen/js/jx/InterfaceEmitter.java   |  6 ++--
 .../internal/codegen/js/jx/LiteralEmitter.java     |  2 +-
 .../codegen/js/jx/MemberAccessEmitter.java         |  4 +--
 .../internal/codegen/js/jx/MethodEmitter.java      |  2 +-
 .../codegen/js/jx/ObjectDefinePropertyEmitter.java |  2 +-
 .../codegen/js/jx/PackageFooterEmitter.java        |  6 ++--
 .../codegen/js/jx/PackageHeaderEmitter.java        |  6 ++--
 .../internal/codegen/js/jx/SuperCallEmitter.java   |  4 +--
 .../codegen/js/jx/VarDeclarationEmitter.java       |  2 +-
 .../js/royale/JSRoyaleASDocDITAEmitter.java        | 10 +++---
 .../codegen/js/royale/JSRoyaleASDocEmitter.java    | 10 +++---
 .../codegen/js/royale/JSRoyaleDocEmitter.java      |  4 +--
 .../codegen/js/royale/JSRoyaleEmitter.java         |  6 ++--
 .../codegen/js/royale/JSRoyaleEmitterTokens.java   | 10 +++---
 .../internal/codegen/js/utils/DocEmitterUtils.java |  6 ++--
 .../codegen/mxml/jsc/MXMLJSCJSEmitter.java         |  4 +--
 .../mxml/royale/MXMLDescriptorSpecifier.java       |  2 +-
 .../codegen/mxml/royale/MXMLEventSpecifier.java    |  2 +-
 .../codegen/mxml/royale/MXMLNodeSpecifier.java     |  2 +-
 .../mxml/royale/MXMLRoyaleASDocEmitter.java        |  8 ++---
 .../codegen/mxml/royale/MXMLRoyaleBlockWalker.java |  4 +--
 .../mxml/royale/MXMLRoyaleCordovaPublisher.java    |  2 +-
 .../codegen/mxml/royale/MXMLRoyaleEmitter.java     | 10 +++---
 .../mxml/royale/MXMLRoyaleEmitterTokens.java       |  2 +-
 .../codegen/mxml/royale/MXMLRoyalePublisher.java   |  6 ++--
 .../codegen/mxml/royale/MXMLScriptSpecifier.java   |  2 +-
 .../internal/driver/js/jsc/JSCBackend.java         |  2 +-
 .../internal/driver/js/node/NodeBackend.java       |  2 +-
 .../internal/driver/js/node/NodeModuleBackend.java |  2 +-
 .../driver/js/royale/JSCSSCompilationSession.java  |  2 +-
 .../internal/driver/js/royale/RoyaleBackend.java   |  4 +--
 .../internal/driver/mxml/jsc/MXMLJSCJSBackend.java |  4 +--
 .../driver/mxml/jsc/MXMLJSCJSSWCBackend.java       |  2 +-
 .../driver/mxml/royale/MXMLRoyaleASDocBackend.java |  8 ++---
 .../mxml/royale/MXMLRoyaleASDocDITABackend.java    |  8 ++---
 .../driver/mxml/royale/MXMLRoyaleBackend.java      | 10 +++---
 .../mxml/royale/MXMLRoyaleCordovaBackend.java      |  6 ++--
 .../driver/mxml/royale/MXMLRoyaleSWCBackend.java   |  8 ++---
 .../compiler/internal/graph/GoogDepsWriter.java    |  2 +-
 .../internal/graph/GoogDepsWriterCordova.java      |  2 +-
 .../internal/parsing/as/RoyaleASDocDelegate.java   |  2 +-
 .../compiler/internal/projects/RoyaleProject.java  |  4 +--
 .../compiler/internal/targets/RoyaleTarget.java    |  2 +-
 .../compiler/utils/JSClosureCompilerWrapper.java   |  2 +-
 .../codegen/externals/TestExternalsJSCompile.java  |  2 +-
 .../js/royale/TestRoyaleAccessorMembers.java       |  4 +--
 .../codegen/js/royale/TestRoyaleAccessors.java     |  4 +--
 .../codegen/js/royale/TestRoyaleClass.java         |  4 +--
 .../codegen/js/royale/TestRoyaleEmitter.java       |  4 +--
 .../codegen/js/royale/TestRoyaleExpressions.java   | 10 +++---
 .../codegen/js/royale/TestRoyaleFieldMembers.java  |  4 +--
 .../internal/codegen/js/royale/TestRoyaleFile.java | 16 ++++-----
 .../codegen/js/royale/TestRoyaleGlobalClasses.java |  4 +--
 .../js/royale/TestRoyaleGlobalConstants.java       |  4 +--
 .../js/royale/TestRoyaleGlobalFunctions.java       |  4 +--
 .../codegen/js/royale/TestRoyaleInterface.java     |  4 +--
 .../internal/codegen/js/royale/TestRoyaleJSX.java  |  4 +--
 .../codegen/js/royale/TestRoyaleMethodMembers.java |  4 +--
 .../codegen/js/royale/TestRoyalePackage.java       |  4 +--
 .../codegen/js/royale/TestRoyaleProject.java       | 20 +++++------
 .../codegen/js/royale/TestRoyaleStatements.java    |  4 +--
 .../js/sourcemaps/TestSourceMapExpressions.java    |  2 +-
 .../js/sourcemaps/TestSourceMapFieldMembers.java   |  2 +-
 .../js/sourcemaps/TestSourceMapGlobalClasses.java  |  2 +-
 .../js/sourcemaps/TestSourceMapStatements.java     |  2 +-
 .../mxml/royale/TestRoyaleMXMLApplication.java     | 42 +++++++++++-----------
 .../codegen/mxml/royale/TestRoyaleMXMLScript.java  |  4 +--
 .../mxml/sourcemaps/TestSourceMapMXMLScript.java   |  2 +-
 .../compiler/internal/test/RoyaleTestBase.java     | 10 +++---
 92 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
index ab6f4ce..47ac88b 100644
--- a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
+++ b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
@@ -31,7 +31,7 @@ public class RoyaleDiagnosticGroups {
 	 * resulting in this warning.
 	 */
 	public static final DiagnosticGroup FLEXJS_NOT_A_CONSTRUCTOR =
-		DiagnosticGroups.registerGroup("flexjsNotAConstructor",
+		DiagnosticGroups.registerGroup("royaleNotAConstructor",
                 TypeCheck.NOT_A_CONSTRUCTOR);
 
 	/**
@@ -39,11 +39,11 @@ public class RoyaleDiagnosticGroups {
 	 * overrides of the methodName.
 	 */
 	public static final DiagnosticGroup FLEXJS_SUPER_CALL_TO_DIFFERENT_NAME =
-		DiagnosticGroups.registerGroup("flexjsSuperCallToDifferentName",
+		DiagnosticGroups.registerGroup("royaleSuperCallToDifferentName",
                 ProcessClosurePrimitives.BASE_CLASS_ERROR);
 	/*
 	public static final DiagnosticGroup FLEXJS_REFERENCE_BEFORE_DECLARE =
-		DiagnosticGroups.registerGroup("flexjsReferenceBeforeDeclare",
+		DiagnosticGroups.registerGroup("royaleReferenceBeforeDeclare",
                 VariableReferenceCheck.UNDECLARED_REFERENCE);
     */
 	
@@ -52,7 +52,7 @@ public class RoyaleDiagnosticGroups {
 	 * in JSDoc annotations, but the compiler complains.
 	 */
 	public static final DiagnosticGroup FLEXJS_UNKNOWN_JSDOC_TYPE_NAME =
-		DiagnosticGroups.registerGroup("flexjsUnknownJSDocTypeName",
+		DiagnosticGroups.registerGroup("royaleUnknownJSDocTypeName",
                 RhinoErrorReporter.TYPE_PARSE_ERROR);
 
 }
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/royale/ASDocComment.java b/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/royale/ASDocComment.java
index 749a76c..a1006dc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/royale/ASDocComment.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/royale/ASDocComment.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.asdoc.flexjs;
+package org.apache.royale.compiler.asdoc.royale;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
index c962991..7d4faef 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ASDOCJSC.java
@@ -31,7 +31,7 @@ import java.util.Set;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.royale.compiler.clients.problems.ProblemQuery;
 import org.apache.royale.compiler.codegen.as.IASWriter;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleASDocEmitter;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.driver.js.IJSApplication;
 import org.apache.royale.compiler.exceptions.ConfigurationException;
@@ -41,9 +41,9 @@ import org.apache.royale.compiler.internal.driver.as.ASBackend;
 import org.apache.royale.compiler.internal.driver.js.amd.AMDBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.ASDocConfiguration;
 import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocBackend;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocDITABackend;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleASDocBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleASDocDITABackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleBackend;
 import org.apache.royale.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.CompilerProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
index 2925b93..5f7b792 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCFlex.java
@@ -46,7 +46,7 @@ import org.apache.royale.compiler.exceptions.ConfigurationException;
 import org.apache.royale.compiler.exceptions.ConfigurationException.IOError;
 import org.apache.royale.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
 import org.apache.royale.compiler.internal.codegen.js.JSWriter;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleSWCBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleSWCBackend;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.CompilerProject;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
index b8cfde2..cee2755 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSC.java
@@ -101,10 +101,10 @@ public class MXMLJSC implements JSCompilerEntryPoint, ProblemQueryProvider,
     public enum JSOutputType
     {
         AMD("amd"),
-        FLEXJS("flexjs"),
+        FLEXJS("royale"),
         GOOG("goog"),
-        FLEXJS_DUAL("flexjs_dual"),
-        FLEXJS_DITA("flexjs_dita"),
+        FLEXJS_DUAL("royale_dual"),
+        FLEXJS_DITA("royale_dita"),
         JSC("jsc"),
         NODE("node");
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
index 4988aa9..d1e4ea0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlex.java
@@ -51,7 +51,7 @@ import org.apache.royale.compiler.exceptions.ConfigurationException.MustSpecifyT
 import org.apache.royale.compiler.exceptions.ConfigurationException.OnlyOneSource;
 import org.apache.royale.compiler.internal.config.FlashBuilderConfigurator;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleBackend;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.CompilerProject;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
index 2e8f87b..6df7150 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCFlexCordova.java
@@ -50,7 +50,7 @@ import org.apache.royale.compiler.exceptions.ConfigurationException.MustSpecifyT
 import org.apache.royale.compiler.exceptions.ConfigurationException.OnlyOneSource;
 import org.apache.royale.compiler.internal.config.FlashBuilderConfigurator;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleCordovaBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleCordovaBackend;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.CompilerProject;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
index 2dda4e5..947cbf6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/RoyaleToolGroup.java
@@ -19,7 +19,7 @@
 
 package org.apache.royale.compiler.clients;
 
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocDITABackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleASDocDITABackend;
 import org.apache.royale.tools.AbstractFlexToolGroup;
 
 /**
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleASDocEmitter.java
index 9ca20c4..43b6d37 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleASDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.codegen.js.flexjs;
+package org.apache.royale.compiler.codegen.js.royale;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleEmitter.java
index 396f916..b04096d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/royale/IJSRoyaleEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.codegen.js.flexjs;
+package org.apache.royale.compiler.codegen.js.royale;
 
 import org.apache.royale.compiler.codegen.js.goog.IJSGoogEmitter;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/royale/IMXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/royale/IMXMLRoyaleEmitter.java
index 5e4291e..2936c4c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/royale/IMXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/royale/IMXMLRoyaleEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.codegen.mxml.flexjs;
+package org.apache.royale.compiler.codegen.mxml.royale;
 
 import java.io.Writer;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
index 36fa0f8..6c94259 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java
@@ -36,7 +36,7 @@ import org.apache.royale.compiler.internal.codegen.js.JSDocEmitter;
 import org.apache.royale.compiler.internal.codegen.js.JSDocEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSharedData;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.scopes.ASScope;
 import org.apache.royale.compiler.internal.semantics.SemanticUtils;
 import org.apache.royale.compiler.projects.ICompilerProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCJSEmitter.java
index dd57142..12f9e9d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCJSEmitter.java
@@ -21,7 +21,7 @@ package org.apache.royale.compiler.internal.codegen.js.jsc;
 
 import java.io.FilterWriter;
 
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 
 /**
  * Concrete implementation of the 'Royale' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCPublisher.java
index 00d11d3..204a1f0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jsc/JSCPublisher.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.definitions.IDefinition;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.tree.as.IDefinitionNode;
 import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
index 10691ea..a606068 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
@@ -38,9 +38,9 @@ import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.PropertyNodes;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AsIsEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AsIsEmitter.java
index 0acb4c4..f93124a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AsIsEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AsIsEmitter.java
@@ -19,14 +19,14 @@
 
 package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.definitions.IClassDefinition;
 import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.projects.ICompilerProject;
 import org.apache.royale.compiler.tree.ASTNodeID;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
index 94f8dbd..52fd186 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
@@ -28,9 +28,9 @@ import org.apache.royale.compiler.definitions.metadata.IMetaTagAttribute;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
 import org.apache.royale.compiler.internal.tree.as.DynamicAccessNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
index d809f10..028f7c7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BindableEmitter.java
@@ -28,7 +28,7 @@ import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
index efe1474..80e9713 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ClassEmitter.java
@@ -19,7 +19,7 @@
 
 package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
 import org.apache.royale.compiler.codegen.ISubEmitter;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.definitions.IClassDefinition;
@@ -27,9 +27,9 @@ import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.definitions.IFunctionDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.DocEmitterUtils;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DefinePropertyFunctionEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DefinePropertyFunctionEmitter.java
index 7bf3b20..84a9be2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DefinePropertyFunctionEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DefinePropertyFunctionEmitter.java
@@ -24,7 +24,7 @@ import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.common.IMetaInfo;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.tree.as.SetterNode;
 import org.apache.royale.compiler.tree.as.IAccessorNode;
 import org.apache.royale.compiler.tree.as.IParameterNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForEachEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForEachEmitter.java
index 5ee933c..86e6227 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForEachEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForEachEmitter.java
@@ -24,7 +24,7 @@ import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.constants.IASLanguageConstants;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
 import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
 import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
index a07b81c..c91dd4c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallEmitter.java
@@ -27,8 +27,8 @@ import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.definitions.AppliedVectorDefinition;
 import org.apache.royale.compiler.internal.definitions.ClassDefinition;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 4d1a97e..6a2f0ee 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -30,7 +30,7 @@ import org.apache.royale.compiler.definitions.IVariableDefinition;
 import org.apache.royale.compiler.definitions.IVariableDefinition.VariableClassification;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/InterfaceEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/InterfaceEmitter.java
index 4f6c69c..2f4f2b8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/InterfaceEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/InterfaceEmitter.java
@@ -26,9 +26,9 @@ import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSDocEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.projects.ICompilerProject;
 import org.apache.royale.compiler.tree.ASTNodeID;
 import org.apache.royale.compiler.tree.as.IAccessorNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
index 4e7a3e1..ea97903 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java
@@ -29,7 +29,7 @@ import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.common.IMetaInfo;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.tree.as.LiteralNode;
 import org.apache.royale.compiler.internal.tree.as.RegExpLiteralNode;
 import org.apache.royale.compiler.internal.tree.as.XMLLiteralNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
index f1a57c7..6fcc815 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
@@ -26,8 +26,8 @@ import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.jx.BinaryOperatorEmitter.DatePropertiesGetters;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MethodEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MethodEmitter.java
index 9c7158d..72892cc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MethodEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MethodEmitter.java
@@ -32,7 +32,7 @@ import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.tree.as.FunctionNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java
index b9c59db..ad65e10 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java
@@ -28,7 +28,7 @@ import org.apache.royale.compiler.definitions.ITypeDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.tree.as.FunctionNode;
 import org.apache.royale.compiler.internal.tree.as.SetterNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageFooterEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
index 34bdc71..92a63c8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageFooterEmitter.java
@@ -33,9 +33,9 @@ import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
index 91a147d..30b29ea 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
 import org.apache.royale.compiler.codegen.ISubEmitter;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.constants.IASLanguageConstants;
@@ -34,8 +34,8 @@ import org.apache.royale.compiler.definitions.*;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.node.NodeEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
index 5dab3ab..02f6972 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
@@ -27,8 +27,8 @@ import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
index 6cd84d1..69b4136 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/VarDeclarationEmitter.java
@@ -28,7 +28,7 @@ import org.apache.royale.compiler.definitions.metadata.IMetaTag;
 import org.apache.royale.compiler.definitions.metadata.IMetaTagAttribute;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.tree.as.ChainedVariableNode;
 import org.apache.royale.compiler.internal.tree.as.DynamicAccessNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java
index 6d30bf6..266a0d6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -30,9 +30,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.royale.compiler.asdoc.IASDocTag;
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleASDocEmitter;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleEmitter;
 import org.apache.royale.compiler.constants.IASLanguageConstants;
 import org.apache.royale.compiler.definitions.IAccessorDefinition;
 import org.apache.royale.compiler.definitions.IClassDefinition;
@@ -43,7 +43,7 @@ import org.apache.royale.compiler.definitions.IPackageDefinition;
 import org.apache.royale.compiler.definitions.IParameterDefinition;
 import org.apache.royale.compiler.definitions.metadata.IMetaTag;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleASDocEmitter;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
 import org.apache.royale.compiler.internal.definitions.ClassDefinition;
 import org.apache.royale.compiler.internal.definitions.EventDefinition;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
index a537caf..d80d6a3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -30,9 +30,9 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.royale.compiler.asdoc.IASDocTag;
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleASDocEmitter;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleEmitter;
 import org.apache.royale.compiler.constants.IASLanguageConstants;
 import org.apache.royale.compiler.definitions.IAccessorDefinition;
 import org.apache.royale.compiler.definitions.IDefinition;
@@ -41,7 +41,7 @@ import org.apache.royale.compiler.definitions.IParameterDefinition;
 import org.apache.royale.compiler.definitions.metadata.IDeprecationInfo;
 import org.apache.royale.compiler.definitions.references.INamespaceReference;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleASDocEmitter;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
 import org.apache.royale.compiler.internal.definitions.ClassDefinition;
 import org.apache.royale.compiler.internal.definitions.DefinitionBase;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
index 46add28..c1fd9aa 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleDocEmitter.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.common.ASModifier;
 import org.apache.royale.compiler.common.DependencyType;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
index 78653e1..3a535fa 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.io.File;
 import java.io.FilterWriter;
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
+import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleEmitter;
 import org.apache.royale.compiler.codegen.js.goog.IJSGoogDocEmitter;
 import org.apache.royale.compiler.constants.IASKeywordConstants;
 import org.apache.royale.compiler.constants.IASLanguageConstants;
@@ -62,7 +62,7 @@ import org.apache.royale.compiler.internal.codegen.js.jx.SelfReferenceEmitter;
 import org.apache.royale.compiler.internal.codegen.js.jx.SuperCallEmitter;
 import org.apache.royale.compiler.internal.codegen.js.jx.VarDeclarationEmitter;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleEmitter;
 import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
 import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
 import org.apache.royale.compiler.internal.embedding.EmbedAttribute;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitterTokens.java
index a684d2f..3aa5e93 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleEmitterTokens.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.codegen.IEmitterTokens;
 
@@ -40,11 +40,11 @@ public enum JSRoyaleEmitterTokens implements IEmitterTokens
     NAMES("names"),
     QNAME("qName"),
     UNDERSCORE("_"),
-    EMIT_COERCION("@flexjsemitcoercion"),
+    EMIT_COERCION("@royaleemitcoercion"),
     EXTERNS("@externs"),
-    IGNORE_COERCION("@flexjsignorecoercion"),
-    IGNORE_IMPORT("@flexjsignoreimport"),
-    IGNORE_STRING_COERCION("@flexjsnoimplicitstringconversion"),
+    IGNORE_COERCION("@royaleignorecoercion"),
+    IGNORE_IMPORT("@royaleignoreimport"),
+    IGNORE_STRING_COERCION("@royalenoimplicitstringconversion"),
     PREINCREMENT("preincrement"),
     PREDECREMENT("predecrement"),
     POSTINCREMENT("postincrement"),
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/DocEmitterUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/DocEmitterUtils.java
index c2dc9d8..dd9ed44 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/DocEmitterUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/DocEmitterUtils.java
@@ -21,9 +21,9 @@ package org.apache.royale.compiler.internal.codegen.js.utils;
 
 import java.util.ArrayList;
 
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 
 public class DocEmitterUtils
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
index 3bff13b..01bf115 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/jsc/MXMLJSCJSEmitter.java
@@ -22,8 +22,8 @@ package org.apache.royale.compiler.internal.codegen.mxml.jsc;
 
 import java.io.FilterWriter;
 
-import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
+import org.apache.royale.compiler.codegen.mxml.royale.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleEmitter;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
index a25f90e..870b0b6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLDescriptorSpecifier.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import java.util.ArrayList;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLEventSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLEventSpecifier.java
index b36d8b5..4c0f777 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLEventSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLEventSpecifier.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLNodeSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLNodeSpecifier.java
index 6605587..abf7e53 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLNodeSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLNodeSpecifier.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import org.apache.royale.compiler.codegen.IEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
index f89a690..429e242 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleASDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 
 import java.io.FilterWriter;
@@ -31,14 +31,14 @@ import org.apache.royale.abc.semantics.Name;
 import org.apache.royale.abc.semantics.Namespace;
 import org.apache.royale.compiler.codegen.as.IASEmitter;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
-import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.codegen.mxml.royale.IMXMLRoyaleEmitter;
 import org.apache.royale.compiler.definitions.IClassDefinition;
 import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.databinding.BindingDatabase;
 import org.apache.royale.compiler.internal.codegen.databinding.BindingInfo;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleASDocEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
 import org.apache.royale.compiler.internal.projects.FlexProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleBlockWalker.java
index b95c27a..029dcd6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleBlockWalker.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import java.util.List;
 
 import org.apache.royale.compiler.codegen.as.IASEmitter;
 import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.codegen.mxml.royale.IMXMLRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.css.codegen.CSSCompilationSession;
 import org.apache.royale.compiler.problems.ICompilerProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleCordovaPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleCordovaPublisher.java
index 79dcda9..d16b4cc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleCordovaPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleCordovaPublisher.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.royale.compiler.clients.problems.ProblemQuery;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index 4c76423..f027975 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 
 import java.io.File;
@@ -36,7 +36,7 @@ import org.apache.royale.abc.semantics.Namespace;
 import org.apache.royale.compiler.codegen.as.IASEmitter;
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
 import org.apache.royale.compiler.codegen.js.IMappingEmitter;
-import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.codegen.mxml.royale.IMXMLRoyaleEmitter;
 import org.apache.royale.compiler.common.ASModifier;
 import org.apache.royale.compiler.common.ISourceLocation;
 import org.apache.royale.compiler.constants.IASKeywordConstants;
@@ -55,14 +55,14 @@ import org.apache.royale.compiler.internal.codegen.databinding.WatcherInfoBase.W
 import org.apache.royale.compiler.internal.codegen.databinding.XMLWatcherInfo;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.PropertyNodes;
 import org.apache.royale.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
 import org.apache.royale.compiler.internal.codegen.js.jx.BindableEmitter;
 import org.apache.royale.compiler.internal.codegen.js.jx.PackageFooterEmitter;
 import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.royale.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
+import org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.projects.FlexProject;
 import org.apache.royale.compiler.internal.scopes.ASProjectScope;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitterTokens.java
index e25fb1c..ed415cc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitterTokens.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import org.apache.royale.compiler.codegen.IEmitterTokens;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
index a5cad9f..197f306 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import com.google.javascript.jscomp.SourceFile;
 import org.apache.commons.io.FileUtils;
@@ -35,7 +35,7 @@ import org.apache.royale.compiler.internal.codegen.js.goog.JarSourceFile;
 import org.apache.royale.compiler.internal.css.CSSArrayPropertyValue;
 import org.apache.royale.compiler.internal.css.CSSFontFace;
 import org.apache.royale.compiler.internal.css.CSSFunctionCallPropertyValue;
-import org.apache.royale.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
+import org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.graph.GoogDepsWriter;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
@@ -214,7 +214,7 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
                 // resources contained in 'closure-whitelist.properites' to the output.
                 Properties whiteList = new Properties();
                 whiteList.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(
-                        "flexjs/closure-whitelist.properites"));
+                        "royale/closure-whitelist.properites"));
 
                 // Add the closure files from classpath.
                 closureSourceFiles = getClasspathResources(closureLibraryJar, whiteList);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLScriptSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLScriptSpecifier.java
index 8511608..83f38f3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLScriptSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLScriptSpecifier.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 
 /**
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/jsc/JSCBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/jsc/JSCBackend.java
index 3c4518a..20993ed 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/jsc/JSCBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/jsc/JSCBackend.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.jsc.JSCPublisher;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.driver.mxml.jsc.MXMLJSCJSBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.problems.ICompilerProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeBackend.java
index 8098d84..02362c3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeBackend.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.node.NodePublisher;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.driver.js.jsc.JSCBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.problems.ICompilerProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeModuleBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeModuleBackend.java
index 7b0959d..5e8d9f6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeModuleBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/node/NodeModuleBackend.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.node.NodePublisher;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.driver.js.jsc.JSCBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.problems.ICompilerProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
index 0acebd1..c87be25 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.royale.compiler.internal.driver.js.flexjs;
+package org.apache.royale.compiler.internal.driver.js.royale;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/RoyaleBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/RoyaleBackend.java
index 8b86675..d92d585 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/RoyaleBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/RoyaleBackend.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.js.flexjs;
+package org.apache.royale.compiler.internal.driver.js.royale;
 
 import java.io.FilterWriter;
 
 import org.apache.royale.compiler.codegen.js.IJSEmitter;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.targets.RoyaleTarget;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
index c6b1b47..da6d36d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSBackend.java
@@ -33,10 +33,10 @@ import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.js.jsc.JSCJSEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.jsc.MXMLJSCJSEmitter;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.targets.RoyaleTarget;
 import org.apache.royale.compiler.internal.targets.JSTarget;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSSWCBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSSWCBackend.java
index 91d99ad..cfad4fd 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSSWCBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/jsc/MXMLJSCJSSWCBackend.java
@@ -33,7 +33,7 @@ import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.js.jsc.JSCJSEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.jsc.MXMLJSCJSEmitter;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocBackend.java
index 7e01ede..a9b3306 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocBackend.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.royale;
 
 import java.io.FilterWriter;
 import java.util.List;
@@ -29,12 +29,12 @@ import org.apache.royale.compiler.codegen.js.IJSWriter;
 import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleASDocEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
 import org.apache.royale.compiler.internal.driver.js.goog.ASDocConfiguration;
 import org.apache.royale.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocDITABackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocDITABackend.java
index 9656b3f..d2fbca8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocDITABackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleASDocDITABackend.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.royale;
 
 import java.io.FilterWriter;
 import java.util.List;
@@ -29,12 +29,12 @@ import org.apache.royale.compiler.codegen.js.IJSWriter;
 import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleASDocDITAEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleASDocDITAEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleASDocEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
 import org.apache.royale.compiler.internal.driver.js.goog.ASDocConfiguration;
 import org.apache.royale.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleBackend.java
index 21ed750..15e9ecc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleBackend.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.royale;
 
 import java.io.FilterWriter;
 import java.util.List;
@@ -30,13 +30,13 @@ import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
 import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleCordovaBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleCordovaBackend.java
index 223ec40..f19d8a3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleCordovaBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleCordovaBackend.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.royale;
 
 import java.util.List;
 
@@ -25,8 +25,8 @@ import org.apache.royale.compiler.config.Configuration;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleCordovaPublisher;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleCordovaPublisher;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyalePublisher;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.problems.ICompilerProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleSWCBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleSWCBackend.java
index 4305112..8922385 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleSWCBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/royale/MXMLRoyaleSWCBackend.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.royale;
 
 import java.io.FilterWriter;
 import java.util.List;
@@ -29,12 +29,12 @@ import org.apache.royale.compiler.codegen.js.IJSWriter;
 import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
 import org.apache.royale.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleEmitter;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index 0610514..6537c45 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -59,7 +59,7 @@ public class GoogDepsWriter {
 		this.mainName = mainClassName;
 		removeCirculars = config.getRemoveCirculars();
 		otherPaths = config.getSDKJSLib();
-		otherPaths.add(new File(outputFolder.getParent(), "flexjs/Royale/src").getPath());
+		otherPaths.add(new File(outputFolder.getParent(), "royale/Royale/src").getPath());
 		this.swcs = swcs;
 		for (ISWC swc : swcs)
 		{
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriterCordova.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriterCordova.java
index 79d40f4..e395a76 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriterCordova.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriterCordova.java
@@ -32,7 +32,7 @@ public class GoogDepsWriterCordova extends GoogDepsWriter {
 		super(outputFolder, mainClassName, config, swcs);
 	}
 	
-    private final String FLEXJS_CORDOVA_PLUGIN = "@flexjscordovaplugin";
+    private final String FLEXJS_CORDOVA_PLUGIN = "@royalecordovaplugin";
     
     public ArrayList<String> cordovaPlugins = new ArrayList<String>();
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/RoyaleASDocDelegate.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/RoyaleASDocDelegate.java
index 33347ba..67ab4a3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/RoyaleASDocDelegate.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/RoyaleASDocDelegate.java
@@ -28,7 +28,7 @@ import org.apache.royale.compiler.asdoc.IASDocDelegate;
 import org.apache.royale.compiler.asdoc.IASParserASDocDelegate;
 import org.apache.royale.compiler.asdoc.IMetadataParserASDocDelegate;
 import org.apache.royale.compiler.asdoc.IPackageDITAParser;
-import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.asdoc.royale.ASDocComment;
 import org.apache.royale.compiler.common.ISourceLocation;
 import org.apache.royale.compiler.definitions.IDocumentableDefinition;
 import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
index cecfd00..02bcc2c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
@@ -41,10 +41,10 @@ import org.apache.royale.compiler.definitions.metadata.IMetaTagAttribute;
 import org.apache.royale.compiler.definitions.references.IResolvedQualifiersReference;
 import org.apache.royale.compiler.definitions.references.ReferenceFactory;
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.mxml.royale.MXMLRoyaleEmitterTokens;
 import org.apache.royale.compiler.internal.css.codegen.CSSCompilationSession;
 import org.apache.royale.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.royale.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
+import org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
 import org.apache.royale.compiler.internal.scopes.ASProjectScope.DefinitionPromise;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
index 54951dd..599a3b9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
@@ -32,7 +32,7 @@ import org.apache.royale.compiler.css.ICSSDocument;
 import org.apache.royale.compiler.css.ICSSManager;
 import org.apache.royale.compiler.definitions.IDefinition;
 import org.apache.royale.compiler.internal.css.semantics.ActivatedStyleSheets;
-import org.apache.royale.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
+import org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.units.SWCCompilationUnit;
 import org.apache.royale.compiler.problems.FileNotFoundProblem;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
index f7d65a1..7be5e9c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
@@ -394,7 +394,7 @@ public class JSClosureCompilerWrapper
         String[] asdocTags = new String[] {"productversion", 
         		"playerversion", "langversion", "copy", 
         		"asparam", "asreturn", "asprivate",
-        		"flexjsignoreimport", "flexjsignorecoercion", "flexjsnoimplicitstringconversion"};
+        		"royaleignoreimport", "royaleignorecoercion", "royalenoimplicitstringconversion"};
         options_.setExtraAnnotationNames(Arrays.asList(asdocTags));
     }
     
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
index 5cb36cc..1a6f12c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternalsJSCompile.java
@@ -36,7 +36,7 @@ import org.apache.royale.compiler.clients.ExternCConfiguration;
 import org.apache.royale.compiler.codegen.as.IASEmitter;
 import org.apache.royale.compiler.config.Configurator;
 import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.projects.FlexProjectConfigurator;
 import org.apache.royale.compiler.internal.targets.JSTarget;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
index a6329bf..54e7cca 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogAccessorMembers;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.tree.as.IClassNode;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
index a1d0ce5..01ed3d5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.test.ASTestBase;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
index c4b29e0..8472e59 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogClass;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.tree.as.FileNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
index b65b423..923666a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.exceptions.ConfigurationException;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogEmitter;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
index 10aa892..d35bef5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.definitions.IClassDefinition;
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.exceptions.ConfigurationException;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogExpressions;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
@@ -716,16 +716,16 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     public void testVisitBinaryOperatorNode_StringVarAssignmentFromObjectSupressed()
     {
         IBinaryOperatorNode node = (IBinaryOperatorNode) getNode(
-                "public class B {public var b:String; public var c:Object; /**\n * @flexjsnoimplicitstringconversion\n */\npublic function d() { b = c; }}",
+                "public class B {public var b:String; public var c:Object; /**\n * @royalenoimplicitstringconversion\n */\npublic function d() { b = c; }}",
                 IBinaryOperatorNode.class, WRAP_LEVEL_PACKAGE);
         JSRoyaleDocEmitter docEmitter = (JSRoyaleDocEmitter)(asBlockWalker.getEmitter().getDocEmitter());
         IFunctionNode methodNode = (IFunctionNode)(node.getAncestorOfType(IFunctionNode.class));
         
-        // this adds '/**\n * @flexjsnoimplicitstringconversion\n * @export\n */' to the output but parses
+        // this adds '/**\n * @royalenoimplicitstringconversion\n * @export\n */' to the output but parses
         // the asdoc so the emitter will suppress the output
         docEmitter.emitMethodDoc(methodNode, asBlockWalker.getProject());
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("/**\n * @flexjsnoimplicitstringconversion\n * @export\n */\nthis.b = this.c");
+        assertOut("/**\n * @royalenoimplicitstringconversion\n * @export\n */\nthis.b = this.c");
     }
 
     @Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
index 6ef9594..8e02f55 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogFieldMembers;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.tree.as.IClassNode;
 import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Test;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFile.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFile.java
index f99bc12..89a4aa0 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFile.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFile.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.io.File;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.test.RoyaleTestBase;
@@ -52,7 +52,7 @@ public class TestRoyaleFile extends RoyaleTestBase
 
         IFileNode node = compileAS(fileName, true,
                 new File(TestAdapterFactory.getTestAdapter().getUnitTestBaseDir(),
-                        "flexjs/files").getPath(),
+                        "royale/files").getPath(),
                 false);
         
         asBlockWalker.visitFile(node);
@@ -60,7 +60,7 @@ public class TestRoyaleFile extends RoyaleTestBase
         //writeResultToFile(writer.toString(), fileName);
         
         assertOutWithMetadata(getCodeFromFile(fileName + "_result", true,
-                "flexjs" + File.separator + "files"));
+                "royale" + File.separator + "files"));
     }
 
     @Test
@@ -70,7 +70,7 @@ public class TestRoyaleFile extends RoyaleTestBase
 
         IFileNode node = compileAS(fileName, true,
                 new File(TestAdapterFactory.getTestAdapter().getUnitTestBaseDir(),
-                        "flexjs/files").getPath(),
+                        "royale/files").getPath(),
                 false);
         
         asBlockWalker.visitFile(node);
@@ -78,7 +78,7 @@ public class TestRoyaleFile extends RoyaleTestBase
         //writeResultToFile(writer.toString(), fileName);
         
         assertOutPostProcess(getCodeFromFile(fileName + "_result", true,
-                "flexjs" + File.separator + "files"), true);
+                "royale" + File.separator + "files"), true);
     }
 
     @Test
@@ -88,7 +88,7 @@ public class TestRoyaleFile extends RoyaleTestBase
 
         IFileNode node = compileAS(fileName, true,
                 new File(TestAdapterFactory.getTestAdapter().getUnitTestBaseDir(),
-                        "flexjs/files").getPath(),
+                        "royale/files").getPath(),
                 false);
 
         asBlockWalker.visitFile(node);
@@ -96,7 +96,7 @@ public class TestRoyaleFile extends RoyaleTestBase
         //writeResultToFile(writer.toString(), fileName);
         
         assertOutPostProcess(getCodeFromFile(fileName + "_result", true,
-                "flexjs" + File.separator + "files"), true);
+                "royale" + File.separator + "files"), true);
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
index ed3e1ca..2a1e66f 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogGlobalClasses;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.tree.as.BinaryOperatorAssignmentNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
index d75f528..f56493d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogGlobalConstants;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalFunctions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalFunctions.java
index 0b4b460..9b27a4c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalFunctions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalFunctions.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogGlobalFunctions;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleInterface.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleInterface.java
index aece6a5..d6bca65 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleInterface.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleInterface.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogInterface;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.tree.as.IInterfaceNode;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
index 866f6e6..1e96ded 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.test.ASTestBase;
 import org.apache.royale.compiler.tree.as.IFunctionNode;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
index 17da2e8..814b93d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogMethodMembers;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.tree.as.IClassNode;
 import org.apache.royale.compiler.tree.as.IFunctionNode;
 import org.junit.Test;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
index d0e3fc6..ce001f0 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import java.util.ArrayList;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogPackage;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.tree.as.IFileNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
index 596c935..05134f1 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -32,7 +32,7 @@ import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.exceptions.ConfigurationException;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogProject;
 import org.apache.royale.compiler.internal.config.TargetSettings;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.utils.FilenameNormalization;
@@ -42,7 +42,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * This class tests the production of valid 'flexjs' JS code from an external
+ * This class tests the production of valid 'royale' JS code from an external
  * project.
  * 
  * @author Erik de Bruin
@@ -51,7 +51,7 @@ public class TestRoyaleProject extends TestGoogProject
 {
     private static ITestAdapter testAdapter = TestAdapterFactory.getTestAdapter();
 
-    private static String projectDirPath = "flexjs/projects";
+    private static String projectDirPath = "royale/projects";
     private String sourcePath;
     private Collection<String> externs = new ArrayList<String>();
 
@@ -208,13 +208,13 @@ public class TestRoyaleProject extends TestGoogProject
         String out = sb.toString();
         out = out.replace("\\", "/");
 
-        String expected = testAdapter.getUnitTestBaseDir().getPath() + "/flexjs/projects/bad_overrides/Test.as(31:29)\n" +
+        String expected = testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(31:29)\n" +
                 "interface method someFunction in interface IA is implemented with an incompatible signature in class Test\n" +
-                testAdapter.getUnitTestBaseDir().getPath() + "/flexjs/projects/bad_overrides/Test.as(36:26)\n" +
+                testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
                 "interface method someOtherFunction in interface IA is implemented with an incompatible signature in class Test\n" +
-                testAdapter.getUnitTestBaseDir().getPath() + "/flexjs/projects/bad_overrides/Test.as(31:29)\n" +
+                testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(31:29)\n" +
                 "Incompatible override.\n" +
-                testAdapter.getUnitTestBaseDir().getPath() + "/flexjs/projects/bad_overrides/Test.as(36:26)\n" +
+                testAdapter.getUnitTestBaseDir().getPath() + "/royale/projects/bad_overrides/Test.as(36:26)\n" +
                 "Incompatible override.\n";
         assertThat(out, is(expected));
     }
@@ -240,9 +240,9 @@ public class TestRoyaleProject extends TestGoogProject
         out = out.replace("\\", "/");
 
         assertThat(out, is(testAdapter.getUnitTestBaseDir().getPath() +
-                "/flexjs/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(29:20)\nAmbiguous reference to Event\n" +
+                "/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(29:20)\nAmbiguous reference to Event\n" +
                 testAdapter.getUnitTestBaseDir().getPath() +
-                "/flexjs/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(30:41)\nAmbiguous reference to Event\n"));
+                "/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(30:41)\nAmbiguous reference to Event\n"));
     }
 
     @Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
index b207030..b71d39a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.royale.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.royale;
 
 import org.apache.royale.compiler.driver.IBackend;
 import org.apache.royale.compiler.internal.codegen.js.goog.TestGoogStatements;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
 import org.apache.royale.compiler.tree.as.IFileNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapExpressions.java
index f9dff81..72beed5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapExpressions.java
@@ -19,7 +19,7 @@
 package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.test.SourceMapTestBase;
 import org.apache.royale.compiler.internal.tree.as.ArrayLiteralNode;
 import org.apache.royale.compiler.internal.tree.as.ObjectLiteralNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
index 11a251c..545bbf5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
@@ -19,7 +19,7 @@
 package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.test.SourceMapTestBase;
 import org.apache.royale.compiler.tree.as.IVariableNode;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapGlobalClasses.java
index 58ff31c..f04d569 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapGlobalClasses.java
@@ -20,7 +20,7 @@
 package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.test.SourceMapTestBase;
 import org.apache.royale.compiler.tree.as.IVariableNode;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapStatements.java
index 3bcdba1..cca0683 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapStatements.java
@@ -19,7 +19,7 @@
 package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.driver.js.royale.RoyaleBackend;
 import org.apache.royale.compiler.internal.test.SourceMapTestBase;
 import org.apache.royale.compiler.tree.as.IForLoopNode;
 import org.apache.royale.compiler.tree.as.IIfNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
index 5358b05..778ce83 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
@@ -16,14 +16,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.royale.compiler.clients.MXMLJSC;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.royale.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.driver.js.royale.JSCSSCompilationSession;
 import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.internal.test.RoyaleTestBase;
@@ -56,18 +56,18 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         String fileName = "CSSTest";
 
         IMXMLFileNode node = compileMXML(fileName, true,
-                new File(testAdapter.getUnitTestBaseDir(), "flexjs/files").getPath(), false);
+                new File(testAdapter.getUnitTestBaseDir(), "royale/files").getPath(), false);
 
         mxmlBlockWalker.visitFile(node);
         
         JSCSSCompilationSession jscss = (JSCSSCompilationSession)project.getCSSCompilationSession();
         jscss.setExcludeDefaultsCSSFiles(new ArrayList<String>());
 
-        String result = getCodeFromFile("CSSTestSource_result.css", "flexjs/files");
+        String result = getCodeFromFile("CSSTestSource_result.css", "royale/files");
         String output = jscss.emitCSS();       
         assertThat(output, is(result));
         String encoding = jscss.getEncodedCSS();
-        result = getCodeFromFile("CSSTestSource_encoded_result.txt", "flexjs/files");
+        result = getCodeFromFile("CSSTestSource_encoded_result.txt", "royale/files");
         assertThat(encoding, is(result));
         
 
@@ -79,13 +79,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         String fileName = "wildcard_import";
 
         IMXMLFileNode node = compileMXML(fileName, true,
-                new File(testAdapter.getUnitTestBaseDir(), "flexjs/files").getPath(), false);
+                new File(testAdapter.getUnitTestBaseDir(), "royale/files").getPath(), false);
 
         mxmlBlockWalker.visitFile(node);
         
         //writeResultToFile(writer.toString(), fileName);
 
-        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "flexjs/files"));
+        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "royale/files"));
     }
 
     @Test
@@ -94,13 +94,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         String fileName = "RoyaleTest_again";
 
         IMXMLFileNode node = compileMXML(fileName, true,
-                new File(testAdapter.getUnitTestBaseDir(), "flexjs/files").getPath(), false);
+                new File(testAdapter.getUnitTestBaseDir(), "royale/files").getPath(), false);
 
         mxmlBlockWalker.visitFile(node);
 
         //writeResultToFile(writer.toString(), fileName);
 
-        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "flexjs/files"));
+        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "royale/files"));
     }
 
     @Test
@@ -109,19 +109,19 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         String fileName = "MyInitialView";
 
         IMXMLFileNode node = compileMXML(fileName, true,
-                new File(testAdapter.getUnitTestBaseDir(), "flexjs/files").getPath(), false);
+                new File(testAdapter.getUnitTestBaseDir(), "royale/files").getPath(), false);
 
         mxmlBlockWalker.visitFile(node);
 
         //writeResultToFile(writer.toString(), fileName);
 
-        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "flexjs/files"));
+        assertOutWithMetadata(getCodeFromFile(fileName + "_result", true, "royale/files"));
     }
 
     @Test
     public void testInterfaceAttribute()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\" implements=\"org.apache.royale.core.IChrome\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\" implements=\"org.apache.royale.core.IChrome\">"
         		+ "<fx:Script><![CDATA["
                 + "    import org.apache.royale.core.IChrome;"
                 + "]]></fx:Script></basic:Application>";
@@ -211,7 +211,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Test
     public void testTwoInterfaceAttribute()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\" implements=\"org.apache.royale.core.IChrome, org.apache.royale.core.IPopUp\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\" implements=\"org.apache.royale.core.IChrome, org.apache.royale.core.IPopUp\">"
         		+ "<fx:Script><![CDATA["
                 + "    import org.apache.royale.core.IPopUp;"
                 + "    import org.apache.royale.core.IChrome;"
@@ -304,7 +304,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Test
     public void testConstantBinding()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\">"
         		+ "<fx:Script><![CDATA["
                 + "    import org.apache.royale.net.HTTPConstants;"
                 + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>";
@@ -426,7 +426,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Test
     public void testConstantBindingQname()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\">"
         		+ "<fx:Script><![CDATA["
                 + "    import org.apache.royale.net.HTTPConstants;"
                 + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{org.apache.royale.net.HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>";
@@ -548,7 +548,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Test
     public void testChainBinding()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\">"
         		+ "<fx:Script><![CDATA["
                 + "    import binding.ComplexValueObject;\n"
         		+ "    public var firstOne:ComplexValueObject;\n"
@@ -704,7 +704,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Test
     public void testXMLUsage()
     {
-        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
+        String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\">"
         		+ "<fx:Script><![CDATA["
         		+ "    public var xml:XML = new XML();\n"
                 + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"Hello World\"/></basic:View></basic:initialView></basic:Application>";
@@ -842,7 +842,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         	args[8] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
         else
         	args[8] = "-define=COMPILE::temp,false";
-        args[9] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/RoyaleTest_again.mxml").getPath();
+        args[9] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again.mxml").getPath();
 
         ArrayList<ICompilerProblem> problems = new ArrayList<ICompilerProblem>();
         int result = mxmlc.mainNoExit(args, problems, true);
@@ -875,7 +875,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         args[14] = "-compiler.js-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/Royale/libs/CollectionsJS.swc")).getPath();
         args[15] = "-compiler.js-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/js/Royale/libs/BasicJS.swc")).getPath();
         args[16] = "-compiler.js-external-library-path=" + new File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
-        args[17] = new File(testAdapter.getUnitTestBaseDir(), "flexjs/files/RoyaleTest_again_Flash.mxml").getPath();
+        args[17] = new File(testAdapter.getUnitTestBaseDir(), "royale/files/RoyaleTest_again_Flash.mxml").getPath();
 
         int result = mxmlc.mainNoExit(args, errors, true);
         assertThat(result, is(3));
@@ -885,7 +885,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @Override
     protected void addSourcePaths(List<File> sourcePaths)
     {
-        sourcePaths.add(new File(testAdapter.getUnitTestBaseDir(), "flexjs/files"));
+        sourcePaths.add(new File(testAdapter.getUnitTestBaseDir(), "royale/files"));
         super.addSourcePaths(sourcePaths);
     }
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLScript.java
index 661292c..4998307 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLScript.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.royale;
 
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.test.RoyaleTestBase;
 import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
 import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
index 05a6b1f..e867305 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
@@ -19,7 +19,7 @@
 package org.apache.royale.compiler.internal.codegen.mxml.sourcemaps;
 
 import org.apache.royale.compiler.definitions.IClassDefinition;
-import org.apache.royale.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitter;
 import org.apache.royale.compiler.internal.test.RoyaleSourceMapTestBase;
 import org.apache.royale.compiler.tree.as.IFunctionNode;
 import org.apache.royale.compiler.tree.as.IVariableNode;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
index c593bd8..f871caa 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
@@ -22,7 +22,7 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.royale.compiler.driver.IBackend;
-import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
+import org.apache.royale.compiler.internal.driver.mxml.royale.MXMLRoyaleBackend;
 import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
 import org.apache.royale.compiler.internal.projects.RoyaleProject;
 import org.apache.royale.compiler.mxml.IMXMLNamespaceMapping;
@@ -80,7 +80,7 @@ public class RoyaleTestBase extends TestBase
     {
         namespaceMappings
                 .add(new MXMLNamespaceMapping(
-                        "library://ns.apache.org/flexjs/basic", new File(
+                        "library://ns.apache.org/royale/basic", new File(
                                 env.ASJS + "/frameworks/as/basic-manifest.xml")
                                 .getAbsolutePath()));
 
@@ -91,7 +91,7 @@ public class RoyaleTestBase extends TestBase
     protected void addSourcePaths(List<File> sourcePaths)
     {
         sourcePaths.add(new File(env.ASJS + "/examples/RoyaleTest_basic/src"));
-        sourcePaths.add(new File(testAdapter.getUnitTestBaseDir(), "flexjs/files"));
+        sourcePaths.add(new File(testAdapter.getUnitTestBaseDir(), "royale/files"));
 
         super.addSourcePaths(sourcePaths);
     }
@@ -112,7 +112,7 @@ public class RoyaleTestBase extends TestBase
     protected IASNode getASNode(String code, Class<? extends IASNode> type)
     {
         code = ""
-                + "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\"><fx:Script><![CDATA["
+                + "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\"><fx:Script><![CDATA["
                 + code + "]]></fx:Script></basic:Application>";
 
         IMXMLFileNode node = compileMXML(code);
@@ -126,7 +126,7 @@ public class RoyaleTestBase extends TestBase
         if (wrapLevel >= WRAP_LEVEL_DOCUMENT)
         {
             code = ""
-                    + "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
+                    + "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/royale/basic\">"
                     + code + "</basic:Application>";
         }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <commits@royale.apache.org>.

Mime
View raw message