royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 03/20: replace org.apache.flex with org.apache.royale per Issue #17
Date Wed, 04 Oct 2017 22:34:56 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 de73650cf5467dae581263c9a53f76c5f90fd6cb
Author: Alex Harui <aharui@apache.org>
AuthorDate: Tue Oct 3 10:11:58 2017 -0700

    replace org.apache.flex with org.apache.royale per Issue #17
---
 .mvn/extensions.xml                                |   2 +-
 ApproveFalcon.xml                                  |   4 +-
 build.xml                                          |   2 +-
 compiler-build-tools/build.xml                     |   2 +-
 compiler-build-tools/pom.xml                       |   2 +-
 .../compiler/tools/annotate/AnnotateClass.java     |   2 +-
 .../tools/annotate/AnnotateClassesMojo.java        |   2 +-
 .../tools/problems/BaseProblemGeneratorMojo.java   |   2 +-
 .../tools/problems/ProblemEnumGeneratorMojo.java   |   4 +-
 .../ProblemResourceBundleGeneratorMojo.java        |   2 +-
 .../UnknownTreeHandlerGeneratorMojo.java           |   2 +-
 .../UnknownTreePatternInputOutput.java             |  16 +-
 .../compiler/tools/unpack/UnpackResourceMojo.java  |   2 +-
 compiler-jburg-types/pom.xml                       |   2 +-
 .../internal/as/codegen/IASNodeAdapter.java        |   2 +-
 compiler-jx/build.xml                              |   8 +-
 compiler-jx/pom.xml                                |   6 +-
 .../royale/compiler/asdoc/flexjs/ASDocComment.java |   6 +-
 .../apache/royale/compiler/clients/ASDOCJSC.java   |  60 ++--
 .../apache/royale/compiler/clients/COMPJSC.java    |  46 +--
 .../royale/compiler/clients/COMPJSCFlex.java       |  50 +--
 .../royale/compiler/clients/COMPJSCNative.java     |  48 +--
 .../apache/royale/compiler/clients/EXTERNC.java    |  26 +-
 .../compiler/clients/ExternCConfiguration.java     |  32 +-
 .../royale/compiler/clients/FlexJSToolGroup.java   |   6 +-
 .../compiler/clients/JSCompilerEntryPoint.java     |   4 +-
 .../royale/compiler/clients/JSConfiguration.java   |  24 +-
 .../apache/royale/compiler/clients/MXMLJSC.java    |  90 ++---
 .../royale/compiler/clients/MXMLJSCFlex.java       |  86 ++---
 .../compiler/clients/MXMLJSCFlexCordova.java       |  86 ++---
 .../royale/compiler/clients/MXMLJSCNative.java     |  86 ++---
 .../royale/compiler/clients/MXMLJSCNode.java       |  86 ++---
 .../royale/compiler/clients/MXMLJSCNodeModule.java |   4 +-
 .../codegen/IASGlobalFunctionConstants.java        |   2 +-
 .../royale/compiler/codegen/IDocEmitter.java       |   2 +-
 .../apache/royale/compiler/codegen/IEmitter.java   |   6 +-
 .../royale/compiler/codegen/IEmitterTokens.java    |   2 +-
 .../royale/compiler/codegen/INestingEmitter.java   |   2 +-
 .../royale/compiler/codegen/ISourceMapEmitter.java |   2 +-
 .../royale/compiler/codegen/ISubEmitter.java       |   4 +-
 .../royale/compiler/codegen/as/IASEmitter.java     |  98 +++---
 .../royale/compiler/codegen/as/IASWriter.java      |   2 +-
 .../royale/compiler/codegen/js/IJSDocEmitter.java  |   4 +-
 .../royale/compiler/codegen/js/IJSEmitter.java     |  14 +-
 .../royale/compiler/codegen/js/IJSPublisher.java   |   6 +-
 .../royale/compiler/codegen/js/IJSWriter.java      |   4 +-
 .../compiler/codegen/js/IMappingEmitter.java       |   4 +-
 .../compiler/codegen/js/amd/IJSAMDDocEmitter.java  |   4 +-
 .../compiler/codegen/js/amd/IJSAMDEmitter.java     |   4 +-
 .../codegen/js/flexjs/IJSFlexJSASDocEmitter.java   |   4 +-
 .../codegen/js/flexjs/IJSFlexJSEmitter.java        |   4 +-
 .../codegen/js/goog/IJSGoogDocEmitter.java         |  26 +-
 .../compiler/codegen/js/goog/IJSGoogEmitter.java   |   4 +-
 .../royale/compiler/codegen/mxml/IMXMLEmitter.java |  54 +--
 .../codegen/mxml/flexjs/IMXMLFlexJSEmitter.java    |   8 +-
 .../compiler/config/ExterncConfigurator.java       |   6 +-
 .../royale/compiler/driver/IApplication.java       |   2 +-
 .../apache/royale/compiler/driver/IBackend.java    |  40 +--
 .../apache/royale/compiler/driver/IPublisher.java  |   2 +-
 .../royale/compiler/driver/js/IJSApplication.java  |   4 +-
 .../royale/compiler/driver/js/IJSBackend.java      |   8 +-
 .../royale/compiler/internal/codegen/Emitter.java  |  14 +-
 .../internal/codegen/as/ASAfterNodeStrategy.java   |  16 +-
 .../internal/codegen/as/ASBeforeNodeStrategy.java  |  14 +-
 .../internal/codegen/as/ASBlockWalker.java         | 128 +++----
 .../compiler/internal/codegen/as/ASEmitter.java    | 152 ++++----
 .../internal/codegen/as/ASEmitterTokens.java       |   4 +-
 .../internal/codegen/as/ASFilterWriter.java        |   2 +-
 .../compiler/internal/codegen/as/ASWriter.java     |  14 +-
 .../codegen/externals/emit/ReferenceEmitter.java   |  12 +-
 .../externals/pass/AbstractCompilerPass.java       |  10 +-
 .../codegen/externals/pass/AddMemberPass.java      |   4 +-
 .../codegen/externals/pass/CollectImportsPass.java |   4 +-
 .../codegen/externals/pass/CollectTypesPass.java   |   4 +-
 .../externals/pass/NamespaceResolutionPass.java    |   8 +-
 .../codegen/externals/pass/ReferenceCompiler.java  |   4 +-
 .../externals/pass/ResolvePackagesPass.java        |   8 +-
 .../codegen/externals/reference/BaseReference.java |   4 +-
 .../externals/reference/ClassReference.java        |  12 +-
 .../externals/reference/ConstantReference.java     |   4 +-
 .../externals/reference/FieldReference.java        |   8 +-
 .../externals/reference/FunctionReference.java     |   6 +-
 .../externals/reference/MemberReference.java       |   4 +-
 .../externals/reference/MethodReference.java       |   6 +-
 .../reference/NullConstructorReference.java        |   2 +-
 .../externals/reference/ParameterReference.java    |   2 +-
 .../externals/reference/ReferenceModel.java        |  10 +-
 .../codegen/externals/utils/DebugLogUtils.java     |   2 +-
 .../codegen/externals/utils/FunctionUtils.java     |  10 +-
 .../codegen/externals/utils/JSTypeUtils.java       |  10 +-
 .../compiler/internal/codegen/js/JSDocEmitter.java |  16 +-
 .../internal/codegen/js/JSDocEmitterTokens.java    |   4 +-
 .../compiler/internal/codegen/js/JSEmitter.java    | 124 +++----
 .../internal/codegen/js/JSEmitterTokens.java       |   4 +-
 .../internal/codegen/js/JSFilterWriter.java        |   4 +-
 .../compiler/internal/codegen/js/JSPublisher.java  |  10 +-
 .../internal/codegen/js/JSSessionModel.java        |  16 +-
 .../compiler/internal/codegen/js/JSSharedData.java |   2 +-
 .../internal/codegen/js/JSSourceMapEmitter.java    |   6 +-
 .../compiler/internal/codegen/js/JSSubEmitter.java |  12 +-
 .../compiler/internal/codegen/js/JSWriter.java     |  20 +-
 .../internal/codegen/js/amd/ExportWriter.java      |   4 +-
 .../internal/codegen/js/amd/JSAMDDocEmitter.java   |   8 +-
 .../internal/codegen/js/amd/JSAMDEmitter.java      |  88 ++---
 .../codegen/js/amd/JSAMDEmitterTokens.java         |   4 +-
 .../internal/codegen/js/amd/TempTools.java         |  62 ++--
 .../js/flexjs/JSFlexJSASDocDITAEmitter.java        |  78 ++---
 .../codegen/js/flexjs/JSFlexJSASDocEmitter.java    |  76 ++--
 .../codegen/js/flexjs/JSFlexJSDocEmitter.java      |  54 +--
 .../codegen/js/flexjs/JSFlexJSEmitter.java         | 160 ++++-----
 .../codegen/js/flexjs/JSFlexJSEmitterTokens.java   |  10 +-
 .../internal/codegen/js/goog/JSGoogDocEmitter.java |  68 ++--
 .../codegen/js/goog/JSGoogDocEmitterTokens.java    |   4 +-
 .../internal/codegen/js/goog/JSGoogEmitter.java    | 104 +++---
 .../codegen/js/goog/JSGoogEmitterTokens.java       |   4 +-
 .../internal/codegen/js/goog/JSGoogPublisher.java  |  16 +-
 .../internal/codegen/js/goog/JarSourceFile.java    |   2 +-
 .../internal/codegen/js/jsc/JSCJSEmitter.java      |   4 +-
 .../internal/codegen/js/jsc/JSCPublisher.java      |  14 +-
 .../internal/codegen/js/jx/AccessorEmitter.java    |  64 ++--
 .../internal/codegen/js/jx/AsIsEmitter.java        |  32 +-
 .../codegen/js/jx/BinaryOperatorEmitter.java       |  58 +--
 .../internal/codegen/js/jx/BindableEmitter.java    |  26 +-
 .../internal/codegen/js/jx/BlockCloseEmitter.java  |  12 +-
 .../internal/codegen/js/jx/BlockOpenEmitter.java   |  12 +-
 .../internal/codegen/js/jx/CatchEmitter.java       |  14 +-
 .../internal/codegen/js/jx/ClassEmitter.java       |  48 +--
 .../js/jx/DefinePropertyFunctionEmitter.java       |  22 +-
 .../internal/codegen/js/jx/DoWhileLoopEmitter.java |  18 +-
 .../codegen/js/jx/DynamicAccessEmitter.java        |  16 +-
 .../internal/codegen/js/jx/FieldEmitter.java       |  52 +--
 .../internal/codegen/js/jx/ForEachEmitter.java     |  40 +--
 .../internal/codegen/js/jx/ForLoopEmitter.java     |  20 +-
 .../js/jx/FunctionCallArgumentsEmitter.java        |  14 +-
 .../codegen/js/jx/FunctionCallEmitter.java         |  54 +--
 .../internal/codegen/js/jx/IdentifierEmitter.java  |  52 +--
 .../compiler/internal/codegen/js/jx/IfEmitter.java |  24 +-
 .../internal/codegen/js/jx/InterfaceEmitter.java   |  38 +-
 .../codegen/js/jx/IterationFlowEmitter.java        |  14 +-
 .../codegen/js/jx/LanguageIdentifierEmitter.java   |  14 +-
 .../codegen/js/jx/LiteralContainerEmitter.java     |  16 +-
 .../internal/codegen/js/jx/LiteralEmitter.java     |  30 +-
 .../codegen/js/jx/MemberAccessEmitter.java         |  56 +--
 .../codegen/js/jx/MemberKeywordEmitter.java        |  20 +-
 .../internal/codegen/js/jx/MethodEmitter.java      |  40 +--
 .../codegen/js/jx/NumericLiteralEmitter.java       |  12 +-
 .../codegen/js/jx/ObjectDefinePropertyEmitter.java |  34 +-
 .../js/jx/ObjectLiteralValuePairEmitter.java       |  16 +-
 .../codegen/js/jx/PackageFooterEmitter.java        |  52 +--
 .../codegen/js/jx/PackageHeaderEmitter.java        |  54 +--
 .../internal/codegen/js/jx/ParameterEmitter.java   |  10 +-
 .../internal/codegen/js/jx/ParametersEmitter.java  |  14 +-
 .../internal/codegen/js/jx/ReturnEmitter.java      |  16 +-
 .../codegen/js/jx/SelfReferenceEmitter.java        |  14 +-
 .../codegen/js/jx/SourceMapDirectiveEmitter.java   |  18 +-
 .../internal/codegen/js/jx/StatementEmitter.java   |  16 +-
 .../internal/codegen/js/jx/SuperCallEmitter.java   |  50 +--
 .../internal/codegen/js/jx/SwitchEmitter.java      |  26 +-
 .../codegen/js/jx/TernaryOperatorEmitter.java      |  18 +-
 .../internal/codegen/js/jx/ThrowEmitter.java       |  12 +-
 .../internal/codegen/js/jx/TryEmitter.java         |  14 +-
 .../codegen/js/jx/UnaryOperatorEmitter.java        |  18 +-
 .../codegen/js/jx/VarDeclarationEmitter.java       |  48 +--
 .../internal/codegen/js/jx/WhileLoopEmitter.java   |  20 +-
 .../internal/codegen/js/jx/WithEmitter.java        |  18 +-
 .../codegen/js/node/NodeEmitterTokens.java         |   4 +-
 .../internal/codegen/js/node/NodePublisher.java    |   8 +-
 .../internal/codegen/js/utils/DocEmitterUtils.java |   8 +-
 .../internal/codegen/js/utils/EmitterUtils.java    |  76 ++--
 .../internal/codegen/mxml/MXMLBlockWalker.java     |  80 ++---
 .../internal/codegen/mxml/MXMLEmitter.java         |  70 ++--
 .../internal/codegen/mxml/MXMLEmitterTokens.java   |   4 +-
 .../compiler/internal/codegen/mxml/MXMLWriter.java |  26 +-
 .../mxml/flexjs/MXMLDescriptorSpecifier.java       |   4 +-
 .../codegen/mxml/flexjs/MXMLEventSpecifier.java    |   6 +-
 .../mxml/flexjs/MXMLFlexJSASDocEmitter.java        |  50 +--
 .../codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java |  24 +-
 .../mxml/flexjs/MXMLFlexJSCordovaPublisher.java    |   8 +-
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java     | 114 +++---
 .../mxml/flexjs/MXMLFlexJSEmitterTokens.java       |   4 +-
 .../codegen/mxml/flexjs/MXMLFlexJSPublisher.java   |  36 +-
 .../codegen/mxml/flexjs/MXMLNodeSpecifier.java     |   6 +-
 .../codegen/mxml/flexjs/MXMLScriptSpecifier.java   |   2 +-
 .../codegen/mxml/jsc/MXMLJSCJSEmitter.java         |   6 +-
 .../compiler/internal/driver/as/ASBackend.java     |  58 +--
 .../compiler/internal/driver/js/JSApplication.java |   4 +-
 .../compiler/internal/driver/js/JSBackend.java     |  72 ++--
 .../internal/driver/js/JSCompilationUnit.java      |  16 +-
 .../internal/driver/js/JSSourceFileHandler.java    |  14 +-
 .../internal/driver/js/amd/AMDBackend.java         |  16 +-
 .../internal/driver/js/flexjs/FlexJSBackend.java   |  18 +-
 .../driver/js/flexjs/JSCSSCompilationSession.java  |  24 +-
 .../driver/js/goog/ASDocConfiguration.java         |  10 +-
 .../internal/driver/js/goog/GoogBackend.java       |  26 +-
 .../driver/js/goog/JSGoogCompcConfiguration.java   |  20 +-
 .../driver/js/goog/JSGoogConfiguration.java        |  20 +-
 .../internal/driver/js/jsc/JSCBackend.java         |  16 +-
 .../internal/driver/js/node/NodeBackend.java       |  16 +-
 .../internal/driver/js/node/NodeModuleBackend.java |  16 +-
 .../driver/mxml/ASDocASSourceFileHandler.java      |  18 +-
 .../driver/mxml/ASDocMXMLSourceFileHandler.java    |  20 +-
 .../compiler/internal/driver/mxml/MXMLBackend.java |  32 +-
 .../driver/mxml/MXMLSourceFileHandler.java         |  16 +-
 .../driver/mxml/flexjs/MXMLFlexJSASDocBackend.java |  60 ++--
 .../mxml/flexjs/MXMLFlexJSASDocDITABackend.java    |  60 ++--
 .../driver/mxml/flexjs/MXMLFlexJSBackend.java      |  62 ++--
 .../mxml/flexjs/MXMLFlexJSCordovaBackend.java      |  22 +-
 .../driver/mxml/flexjs/MXMLFlexJSSWCBackend.java   |  58 +--
 .../internal/driver/mxml/jsc/MXMLJSCJSBackend.java |  58 +--
 .../driver/mxml/jsc/MXMLJSCJSSWCBackend.java       |  58 +--
 .../compiler/internal/graph/GoogDepsWriter.java    |  36 +-
 .../internal/graph/GoogDepsWriterCordova.java      |   6 +-
 .../internal/parsing/as/FlexJSASDocDelegate.java   |  20 +-
 .../internal/projects/FlexJSASDocProject.java      |   8 +-
 .../compiler/internal/projects/FlexJSProject.java  |  66 ++--
 .../compiler/internal/targets/FlexJSSWCTarget.java |  32 +-
 .../compiler/internal/targets/FlexJSTarget.java    |  30 +-
 .../royale/compiler/internal/targets/JSTarget.java |  22 +-
 .../internal/visitor/as/ASNodeHandler.java         |   6 +-
 .../compiler/internal/visitor/as/ASNodeSwitch.java | 116 +++---
 .../internal/visitor/as/BeforeAfterStrategy.java   |   8 +-
 .../internal/visitor/mxml/MXMLNodeSwitch.java      |  62 ++--
 .../UnsupportedLanguageFeatureProblem.java         |   6 +-
 .../apache/royale/compiler/targets/IJSTarget.java  |  12 +-
 .../apache/royale/compiler/utils/ASNodeUtils.java  |  18 +-
 .../royale/compiler/utils/DefinitionUtils.java     |   8 +-
 .../compiler/utils/JSClosureCompilerUtil.java      |   2 +-
 .../compiler/utils/JSClosureCompilerWrapper.java   |   2 +-
 .../apache/royale/compiler/utils/NativeUtils.java  |   2 +-
 .../apache/royale/compiler/utils/NodeJSUtils.java  |   2 +-
 .../royale/compiler/visitor/IASNodeStrategy.java   |   4 +-
 .../royale/compiler/visitor/IBlockVisitor.java     |   2 +-
 .../royale/compiler/visitor/IBlockWalker.java      |   6 +-
 .../compiler/visitor/as/IASBlockVisitor.java       | 108 +++---
 .../royale/compiler/visitor/as/IASBlockWalker.java |   8 +-
 .../compiler/visitor/mxml/IMXMLBlockVisitor.java   |  62 ++--
 .../compiler/visitor/mxml/IMXMLBlockWalker.java    |   8 +-
 .../internal/codegen/as/TestAccessorMembers.java   |   6 +-
 .../compiler/internal/codegen/as/TestClass.java    |   8 +-
 .../compiler/internal/codegen/as/TestComments.java |   4 +-
 .../internal/codegen/as/TestExpressions.java       |  32 +-
 .../internal/codegen/as/TestFieldMembers.java      |  10 +-
 .../internal/codegen/as/TestGlobalClasses.java     |   8 +-
 .../internal/codegen/as/TestGlobalConstants.java   |   6 +-
 .../internal/codegen/as/TestGlobalFunctions.java   |   8 +-
 .../internal/codegen/as/TestInterface.java         |   6 +-
 .../internal/codegen/as/TestMethodMembers.java     |   6 +-
 .../compiler/internal/codegen/as/TestPackage.java  |   6 +-
 .../internal/codegen/as/TestParenthesis.java       |  10 +-
 .../internal/codegen/as/TestStatements.java        |  26 +-
 .../codegen/externals/CompilerArguments.java       |   2 +-
 .../codegen/externals/ExternalsTestBase.java       |  14 +-
 .../codegen/externals/ExternalsTestUtils.java      |   6 +-
 .../codegen/externals/TestAnnotationEnum.java      |   6 +-
 .../codegen/externals/TestCollectImports.java      |   8 +-
 .../codegen/externals/TestConstructor.java         |   6 +-
 .../codegen/externals/TestExternChrome.java        |   8 +-
 .../internal/codegen/externals/TestExternES3.java  |   8 +-
 .../codegen/externals/TestExternJQuery.java        |   6 +-
 .../codegen/externals/TestExternJSMissing.java     |   6 +-
 .../codegen/externals/TestExternJasmine.java       |   6 +-
 .../internal/codegen/externals/TestExternNode.java |   6 +-
 .../codegen/externals/TestExternalsJSCompile.java  |  36 +-
 .../codegen/externals/TestPackageNamespace.java    |   6 +-
 .../codegen/externals/TestReferenceModel.java      |   4 +-
 .../codegen/externals/TestTypeExternals.java       |  10 +-
 .../codegen/externals/TestTypeInheritence.java     |   6 +-
 .../internal/codegen/js/amd/TestAMDClassA.java     |  12 +-
 .../internal/codegen/js/amd/TestAMDClassB.java     |   8 +-
 .../internal/codegen/js/amd/TestAMDEmitter.java    |  10 +-
 .../internal/codegen/js/amd/TestAMDInterfaceI.java |   4 +-
 .../codegen/js/amd/TestAMDInterfaceIOther.java     |   4 +-
 .../codegen/js/amd/TestAMDInterfaceISub.java       |   4 +-
 .../internal/codegen/js/amd/TestAMDPackage.java    |  12 +-
 .../js/flexjs/TestFlexJSAccessorMembers.java       |  10 +-
 .../codegen/js/flexjs/TestFlexJSAccessors.java     |  16 +-
 .../codegen/js/flexjs/TestFlexJSClass.java         | 216 ++++++------
 .../codegen/js/flexjs/TestFlexJSEmitter.java       |  20 +-
 .../codegen/js/flexjs/TestFlexJSExpressions.java   |  88 ++---
 .../codegen/js/flexjs/TestFlexJSFieldMembers.java  |  12 +-
 .../internal/codegen/js/flexjs/TestFlexJSFile.java |  16 +-
 .../codegen/js/flexjs/TestFlexJSGlobalClasses.java |  66 ++--
 .../js/flexjs/TestFlexJSGlobalConstants.java       |  10 +-
 .../js/flexjs/TestFlexJSGlobalFunctions.java       |  26 +-
 .../codegen/js/flexjs/TestFlexJSInterface.java     |  10 +-
 .../internal/codegen/js/flexjs/TestFlexJSJSX.java  |  10 +-
 .../codegen/js/flexjs/TestFlexJSMethodMembers.java |  12 +-
 .../codegen/js/flexjs/TestFlexJSPackage.java       |  16 +-
 .../codegen/js/flexjs/TestFlexJSProject.java       |  22 +-
 .../codegen/js/flexjs/TestFlexJSStatements.java    |  34 +-
 .../codegen/js/goog/TestGoogAccessorMembers.java   |  12 +-
 .../internal/codegen/js/goog/TestGoogClass.java    |  54 +--
 .../internal/codegen/js/goog/TestGoogEmitter.java  |  12 +-
 .../codegen/js/goog/TestGoogExpressions.java       |  20 +-
 .../codegen/js/goog/TestGoogFieldMembers.java      |  10 +-
 .../internal/codegen/js/goog/TestGoogFile.java     |  10 +-
 .../codegen/js/goog/TestGoogGlobalClasses.java     |  12 +-
 .../codegen/js/goog/TestGoogGlobalConstants.java   |  10 +-
 .../codegen/js/goog/TestGoogGlobalFunctions.java   |  12 +-
 .../codegen/js/goog/TestGoogInterface.java         |  10 +-
 .../codegen/js/goog/TestGoogMethodMembers.java     |  12 +-
 .../internal/codegen/js/goog/TestGoogPackage.java  |  10 +-
 .../internal/codegen/js/goog/TestGoogProject.java  |  10 +-
 .../codegen/js/goog/TestGoogStatements.java        |  22 +-
 .../js/sourcemaps/TestSourceMapExpressions.java    |  32 +-
 .../js/sourcemaps/TestSourceMapFieldMembers.java   |  10 +-
 .../js/sourcemaps/TestSourceMapGlobalClasses.java  |  10 +-
 .../js/sourcemaps/TestSourceMapStatements.java     |  22 +-
 .../internal/codegen/mxml/TestMXMLApplication.java |   6 +-
 .../internal/codegen/mxml/TestMXMLAttributes.java  |   8 +-
 .../internal/codegen/mxml/TestMXMLNodes.java       |   6 +-
 .../internal/codegen/mxml/TestMXMLScript.java      |   6 +-
 .../mxml/flexjs/TestFlexJSMXMLApplication.java     | 142 ++++----
 .../codegen/mxml/flexjs/TestFlexJSMXMLScript.java  |  30 +-
 .../mxml/sourcemaps/TestSourceMapMXMLEvents.java   |  10 +-
 .../mxml/sourcemaps/TestSourceMapMXMLScript.java   |  14 +-
 .../royale/compiler/internal/test/AMDTestBase.java |  28 +-
 .../royale/compiler/internal/test/ASTestBase.java  |  36 +-
 .../internal/test/FlexJSSourceMapTestBase.java     |   6 +-
 .../compiler/internal/test/FlexJSTestBase.java     |  26 +-
 .../royale/compiler/internal/test/ITestBase.java   |   2 +-
 .../compiler/internal/test/MXMLTestBase.java       |  18 +-
 .../compiler/internal/test/SourceMapTestBase.java  |   8 +-
 .../royale/compiler/internal/test/TestBase.java    |  56 +--
 .../org/apache/royale/utils/EnvProperties.java     |   2 +-
 compiler-test-utils/pom.xml                        |   2 +-
 .../org/apache/royale/utils/AntTestAdapter.java    |   2 +-
 .../org/apache/royale/utils/EnvProperties.java     |   2 +-
 .../apache/royale/utils/FilenameNormalization.java |   2 +-
 .../java/org/apache/royale/utils/ITestAdapter.java |   2 +-
 .../org/apache/royale/utils/MavenTestAdapter.java  |  18 +-
 .../apache/royale/utils/TestAdapterFactory.java    |   2 +-
 compiler/build.xml                                 |  18 +-
 compiler/pom.xml                                   |  20 +-
 .../java/org/apache/royale/abc/ABCConstants.java   |   2 +-
 .../java/org/apache/royale/abc/ABCEmitter.java     | 212 +++++------
 .../main/java/org/apache/royale/abc/ABCLinker.java |  72 ++--
 .../main/java/org/apache/royale/abc/ABCParser.java |  26 +-
 .../main/java/org/apache/royale/abc/ABCReader.java |   2 +-
 .../org/apache/royale/abc/ClassDependencySort.java |   6 +-
 .../org/apache/royale/abc/EntryOrderedStore.java   |   2 +-
 .../src/main/java/org/apache/royale/abc/Pool.java  |   2 +-
 .../org/apache/royale/abc/PoolingABCVisitor.java   |  52 +--
 .../abc/diagnostics/AbstractDiagnosticVisitor.java |  14 +-
 .../abc/diagnostics/DiagnosticsAggregator.java     |  14 +-
 .../org/apache/royale/abc/graph/IBasicBlock.java   |   4 +-
 .../org/apache/royale/abc/graph/IFlowgraph.java    |  10 +-
 .../algorithms/DepthFirstPreorderIterator.java     |   6 +-
 .../royale/abc/graph/algorithms/DominatorTree.java |   6 +-
 .../abc/instructionlist/InstructionList.java       |  12 +-
 .../royale/abc/models/FrameModelEncoder.java       |  20 +-
 .../royale/abc/models/FrameModelVisitor.java       |   6 +-
 .../apache/royale/abc/models/TreeModelEncoder.java |  18 +-
 .../apache/royale/abc/models/TreeModelVisitor.java |   8 +-
 .../apache/royale/abc/optimize/DeadCodeFilter.java |  22 +-
 .../PeepholeOptimizerMethodBodyVisitor.java        |  18 +-
 .../apache/royale/abc/print/ABCDumpVisitor.java    |  90 ++---
 .../semantics/ArbitraryOperandsInstruction.java    |   4 +-
 .../org/apache/royale/abc/semantics/Block.java     |   6 +-
 .../org/apache/royale/abc/semantics/ClassInfo.java |   6 +-
 .../royale/abc/semantics/ControlFlowGraph.java     |  14 +-
 .../apache/royale/abc/semantics/ECMASupport.java   |   4 +-
 .../apache/royale/abc/semantics/ExceptionInfo.java |   6 +-
 .../royale/abc/semantics/FrameCountVisitor.java    |  12 +-
 .../abc/semantics/ImmediateOperandInstruction.java |   4 +-
 .../apache/royale/abc/semantics/InstanceInfo.java  |  12 +-
 .../apache/royale/abc/semantics/Instruction.java   |   4 +-
 .../royale/abc/semantics/InstructionFactory.java   |   4 +-
 .../org/apache/royale/abc/semantics/Label.java     |   2 +-
 .../org/apache/royale/abc/semantics/Metadata.java  |   6 +-
 .../royale/abc/semantics/MethodBodyInfo.java       |  12 +-
 .../apache/royale/abc/semantics/MethodInfo.java    |   6 +-
 .../java/org/apache/royale/abc/semantics/Name.java |   8 +-
 .../org/apache/royale/abc/semantics/Namespace.java |   4 +-
 .../abc/semantics/NoOperandsInstruction.java       |   2 +-
 .../org/apache/royale/abc/semantics/Nsset.java     |   4 +-
 .../abc/semantics/OneOperandInstruction.java       |   2 +-
 .../apache/royale/abc/semantics/PooledValue.java   |   4 +-
 .../apache/royale/abc/semantics/ScriptInfo.java    |   6 +-
 .../org/apache/royale/abc/semantics/Trait.java     |  10 +-
 .../org/apache/royale/abc/semantics/Traits.java    |   2 +-
 .../royale/abc/visitors/DelegatingABCVisitor.java  |   4 +-
 .../abc/visitors/DelegatingClassVisitor.java       |   2 +-
 .../abc/visitors/DelegatingMetadataVisitor.java    |   4 +-
 .../abc/visitors/DelegatingMethodBodyVisitor.java  |  10 +-
 .../abc/visitors/DelegatingMethodVisitor.java      |   4 +-
 .../abc/visitors/DelegatingScriptVisitor.java      |   4 +-
 .../abc/visitors/DelegatingTraitVisitor.java       |   2 +-
 .../abc/visitors/DelegatingTraitsVisitor.java      |  10 +-
 .../apache/royale/abc/visitors/IABCVisitor.java    |  18 +-
 .../apache/royale/abc/visitors/IClassVisitor.java  |   4 +-
 .../royale/abc/visitors/IDiagnosticsVisitor.java   |  16 +-
 .../royale/abc/visitors/IFlowGraphVisitor.java     |   6 +-
 .../royale/abc/visitors/IMetadataVisitor.java      |   4 +-
 .../royale/abc/visitors/IMethodBodyVisitor.java    |  10 +-
 .../apache/royale/abc/visitors/IMethodVisitor.java |   4 +-
 .../apache/royale/abc/visitors/IScriptVisitor.java |   4 +-
 .../apache/royale/abc/visitors/ITraitVisitor.java  |   2 +-
 .../apache/royale/abc/visitors/ITraitsVisitor.java |  10 +-
 .../org/apache/royale/abc/visitors/IVisitor.java   |   2 +-
 .../apache/royale/abc/visitors/NilABCVisitor.java  |  16 +-
 .../royale/abc/visitors/NilClassVisitor.java       |   2 +-
 .../royale/abc/visitors/NilDiagnosticsVisitor.java |   4 +-
 .../royale/abc/visitors/NilMetadataVisitor.java    |   4 +-
 .../royale/abc/visitors/NilMethodBodyVisitor.java  |  10 +-
 .../royale/abc/visitors/NilMethodVisitor.java      |   4 +-
 .../royale/abc/visitors/NilScriptVisitor.java      |   4 +-
 .../royale/abc/visitors/NilTraitVisitor.java       |   2 +-
 .../royale/abc/visitors/NilTraitsVisitor.java      |  10 +-
 .../apache/royale/abc/visitors/NilVisitors.java    |   2 +-
 .../java/org/apache/royale/compiler/Messages.java  |   6 +-
 .../apache/royale/compiler/asdoc/ASDocComment.java |  12 +-
 .../compiler/asdoc/IASDocBundleDelegate.java       |   6 +-
 .../royale/compiler/asdoc/IASDocComment.java       |   6 +-
 .../royale/compiler/asdoc/IASDocDelegate.java      |  12 +-
 .../apache/royale/compiler/asdoc/IASDocTag.java    |   2 +-
 .../compiler/asdoc/IASParserASDocDelegate.java     |   8 +-
 .../asdoc/IMetadataParserASDocDelegate.java        |   6 +-
 .../royale/compiler/asdoc/IPackageDITAParser.java  |   6 +-
 .../org/apache/royale/compiler/clients/ASC.java    |  88 ++---
 .../org/apache/royale/compiler/clients/ASDOC.java  |  42 +--
 .../org/apache/royale/compiler/clients/COMPC.java  |  38 +-
 .../royale/compiler/clients/FalconToolGroup.java   |   4 +-
 .../org/apache/royale/compiler/clients/MXMLC.java  | 110 +++---
 .../apache/royale/compiler/clients/Optimizer.java  |  74 ++--
 .../clients/problems/CodeGenErrorFilter.java       |   6 +-
 .../problems/CompilerProblemCategorizer.java       |  14 +-
 .../compiler/clients/problems/IProblemFilter.java  |   4 +-
 .../compiler/clients/problems/ProblemContext.java  |   2 +-
 .../problems/ProblemFilterClassCriteria.java       |   4 +-
 .../clients/problems/ProblemFormatter.java         |   8 +-
 .../compiler/clients/problems/ProblemPrinter.java  |   4 +-
 .../compiler/clients/problems/ProblemQuery.java    |  26 +-
 .../clients/problems/ProblemQueryProvider.java     |   2 +-
 .../clients/problems/ProblemSettingsFilter.java    |  42 +--
 .../problems/WorkspaceProblemFormatter.java        |  12 +-
 .../royale/compiler/common/ASImportTarget.java     |  10 +-
 .../apache/royale/compiler/common/ASModifier.java  |   4 +-
 .../royale/compiler/common/DependencyType.java     |   4 +-
 .../royale/compiler/common/DependencyTypeSet.java  |   2 +-
 .../apache/royale/compiler/common/IDecoration.java |   4 +-
 .../compiler/common/IDefinitionPriority.java       |   2 +-
 .../royale/compiler/common/IEmbedResolver.java     |   8 +-
 .../compiler/common/IFileSpecificationGetter.java  |   8 +-
 .../royale/compiler/common/IImportTarget.java      |   4 +-
 .../apache/royale/compiler/common/IMetaInfo.java   |   8 +-
 .../royale/compiler/common/IPathResolver.java      |   2 +-
 .../royale/compiler/common/ISourceLocation.java    |   2 +-
 .../royale/compiler/common/LibraryPathUtils.java   |   4 +-
 .../royale/compiler/common/ModifiersSet.java       |   4 +-
 .../apache/royale/compiler/common/Multiname.java   |  20 +-
 .../royale/compiler/common/MutablePrefixMap.java   |   2 +-
 .../royale/compiler/common/NodeReference.java      |  12 +-
 .../apache/royale/compiler/common/PrefixMap.java   |   2 +-
 .../royale/compiler/common/PrefixedXMLName.java    |   6 +-
 .../royale/compiler/common/RecursionGuard.java     |   4 +-
 .../royale/compiler/common/SourceLocation.java     |   4 +-
 .../apache/royale/compiler/common/VersionInfo.java |   4 +-
 .../org/apache/royale/compiler/common/XMLName.java |   2 +-
 .../compiler/config/ApplicationDomainTarget.java   |   2 +-
 .../compiler/config/CommandLineConfigurator.java   |   8 +-
 .../royale/compiler/config/Configuration.java      |  38 +-
 .../compiler/config/ConfigurationBuffer.java       |  26 +-
 .../royale/compiler/config/ConfigurationInfo.java  |   4 +-
 .../compiler/config/ConfigurationPathResolver.java |   6 +-
 .../royale/compiler/config/ConfigurationValue.java |   2 +-
 .../royale/compiler/config/Configurator.java       |  68 ++--
 .../compiler/config/ICompilerProblemSettings.java  |   4 +-
 .../config/ICompilerSettingsConstants.java         |   2 +-
 .../apache/royale/compiler/config/RSLSettings.java |   4 +-
 .../compiler/constants/IASKeywordConstants.java    |   2 +-
 .../compiler/constants/IASLanguageConstants.java   |   2 +-
 .../compiler/constants/IASWarningConstants.java    |   2 +-
 .../compiler/constants/ICSSCoreConstants.java      |   2 +-
 .../compiler/constants/IMXMLCoreConstants.java     |   2 +-
 .../constants/IMetaAttributeConstants.java         |   2 +-
 .../compiler/constants/INamespaceConstants.java    |   2 +-
 .../apache/royale/compiler/css/CombinatorType.java |   2 +-
 .../apache/royale/compiler/css/ConditionType.java  |   2 +-
 .../royale/compiler/css/FontFaceSourceType.java    |   2 +-
 .../apache/royale/compiler/css/ICSSCombinator.java |   2 +-
 .../apache/royale/compiler/css/ICSSDocument.java   |   2 +-
 .../apache/royale/compiler/css/ICSSFontFace.java   |   2 +-
 .../apache/royale/compiler/css/ICSSManager.java    |  12 +-
 .../compiler/css/ICSSMediaQueryCondition.java      |   2 +-
 .../compiler/css/ICSSNamespaceDefinition.java      |   2 +-
 .../org/apache/royale/compiler/css/ICSSNode.java   |   6 +-
 .../apache/royale/compiler/css/ICSSProperty.java   |   2 +-
 .../royale/compiler/css/ICSSPropertyValue.java     |   2 +-
 .../org/apache/royale/compiler/css/ICSSRule.java   |   2 +-
 .../apache/royale/compiler/css/ICSSSelector.java   |   2 +-
 .../royale/compiler/css/ICSSSelectorCondition.java |   2 +-
 .../AppliedVectorDefinitionFactory.java            |   6 +-
 .../compiler/definitions/IAccessorDefinition.java  |   4 +-
 .../definitions/IAppliedVectorDefinition.java      |   4 +-
 .../definitions/IBindableVariableDefinition.java   |   2 +-
 .../compiler/definitions/IClassDefinition.java     |  18 +-
 .../compiler/definitions/IConstantDefinition.java  |   4 +-
 .../royale/compiler/definitions/IDefinition.java   |  24 +-
 .../definitions/IDocumentableDefinition.java       |   4 +-
 .../compiler/definitions/IEffectDefinition.java    |   6 +-
 .../compiler/definitions/IEventDefinition.java     |   4 +-
 .../compiler/definitions/IFunctionDefinition.java  |   8 +-
 .../compiler/definitions/IGetterDefinition.java    |   4 +-
 .../compiler/definitions/IInterfaceDefinition.java |   6 +-
 .../compiler/definitions/IMemberedDefinition.java  |   2 +-
 .../compiler/definitions/IMetadataDefinition.java  |   2 +-
 .../compiler/definitions/INamespaceDefinition.java |   6 +-
 .../compiler/definitions/IPackageDefinition.java   |   4 +-
 .../compiler/definitions/IParameterDefinition.java |   8 +-
 .../royale/compiler/definitions/IQualifiers.java   |   2 +-
 .../compiler/definitions/IScopedDefinition.java    |   4 +-
 .../compiler/definitions/ISetterDefinition.java    |   4 +-
 .../compiler/definitions/IStyleDefinition.java     |   6 +-
 .../compiler/definitions/ITypeDefinition.java      |   6 +-
 .../compiler/definitions/IVariableDefinition.java  |  10 +-
 .../definitions/metadata/IDeprecationInfo.java     |   2 +-
 .../compiler/definitions/metadata/IMetaTag.java    |  10 +-
 .../definitions/metadata/IMetaTagAttribute.java    |   2 +-
 .../references/INamespaceReference.java            |  10 +-
 .../definitions/references/IReference.java         |  12 +-
 .../references/IResolvedQualifiersReference.java   |  14 +-
 .../definitions/references/ReferenceFactory.java   |  24 +-
 .../compiler/exceptions/BURMAbortException.java    |   2 +-
 .../exceptions/BuildCanceledException.java         |   2 +-
 .../exceptions/CircularDependencyException.java    |   2 +-
 .../exceptions/CodegenInterruptedException.java    |   2 +-
 .../exceptions/ConfigurationException.java         |   4 +-
 .../exceptions/DuplicateLabelException.java        |   2 +-
 .../LibraryCircularDependencyException.java        |   4 +-
 .../exceptions/MissingBuiltinException.java        |   2 +-
 .../UnknownControlFlowTargetException.java         |   2 +-
 .../compiler/filespecs/BaseFileSpecification.java  |   4 +-
 .../royale/compiler/filespecs/CombinedFile.java    |   4 +-
 .../compiler/filespecs/FileSpecification.java      |   6 +-
 .../filespecs/IBinaryFileSpecification.java        |   2 +-
 .../compiler/filespecs/IFileSpecification.java     |   2 +-
 .../apache/royale/compiler/fxg/FXGConstants.java   |   2 +-
 .../apache/royale/compiler/fxg/FXGFileNode.java    |   8 +-
 .../royale/compiler/fxg/FXGParserFactory.java      |   6 +-
 .../org/apache/royale/compiler/fxg/FXGVersion.java |   2 +-
 .../org/apache/royale/compiler/fxg/IFXGParser.java |   6 +-
 .../apache/royale/compiler/fxg/IFXGTranscoder.java |  14 +-
 .../apache/royale/compiler/fxg/dom/IFXGNode.java   |   4 +-
 .../royale/compiler/fxg/flex/FXGSymbolClass.java   |   4 +-
 .../compiler/fxg/flex/FlexFXG2SWFTranscoder.java   |  78 ++---
 .../royale/compiler/fxg/flex/FlexGraphicNode.java  |   4 +-
 .../compiler/fxg/flex/FlexParagraphNode.java       |   8 +-
 .../royale/compiler/fxg/flex/FlexRichTextNode.java |   8 +-
 .../royale/compiler/fxg/flex/FlexSpanNode.java     |   8 +-
 .../compiler/fxg/flex/FlexTextGraphicNode.java     |  24 +-
 .../apache/royale/compiler/fxg/logging/FXGLog.java |   2 +-
 .../compiler/fxg/logging/FXGLoggerFactory.java     |   4 +-
 .../royale/compiler/fxg/logging/IFXGLogger.java    |   2 +-
 .../fxg/resources/FXGResourceResolverFactory.java  |   6 +-
 .../fxg/resources/IFXGResourceResolver.java        |   2 +-
 .../royale/compiler/fxg/swf/FXG2SWFTranscoder.java | 196 +++++------
 .../compiler/internal/abc/ABCScopeBuilder.java     |  60 ++--
 .../internal/abc/ClassGeneratorHelper.java         |  64 ++--
 .../internal/abc/CollectMetadataTraitVisitor.java  |  30 +-
 .../internal/abc/FunctionGeneratorHelper.java      |  14 +-
 .../abc/ScopedDefinitionTraitsVisitor.java         |  58 +--
 .../internal/abc/ScriptDefinitionBuilder.java      |  10 +-
 .../internal/abc/TypeDefinitionBuilder.java        |  18 +-
 .../internal/as/codegen/ABCGeneratingReducer.java  | 188 +++++-----
 .../compiler/internal/as/codegen/ABCGenerator.java |  72 ++--
 .../internal/as/codegen/BindableHelper.java        |  86 ++---
 .../compiler/internal/as/codegen/Binding.java      |  16 +-
 .../as/codegen/ClassDirectiveProcessor.java        | 174 ++++-----
 .../internal/as/codegen/CodeGeneratorManager.java  |   2 +-
 .../internal/as/codegen/ControlFlowContext.java    |   8 +-
 .../as/codegen/ControlFlowContextManager.java      |  24 +-
 .../internal/as/codegen/DirectiveProcessor.java    |  28 +-
 .../internal/as/codegen/DumpBURMState.java         |   6 +-
 .../as/codegen/ExceptionHandlingContext.java       |   8 +-
 .../codegen/GenerateFunctionInParallelResult.java  |  12 +-
 .../as/codegen/GlobalDirectiveProcessor.java       |  80 ++---
 .../internal/as/codegen/GlobalLexicalScope.java    |  44 +--
 .../internal/as/codegen/ICodeGenerator.java        |  26 +-
 .../internal/as/codegen/ICodeGeneratorFactory.java |   2 +-
 .../as/codegen/InlineFunctionLexicalScope.java     |  46 +--
 .../internal/as/codegen/InstructionListNode.java   |  20 +-
 .../as/codegen/InterfaceDirectiveProcessor.java    | 114 +++---
 .../as/codegen/LabelScopeControlFlowContext.java   |  18 +-
 .../LabeledStatementControlFlowContext.java        |   6 +-
 .../compiler/internal/as/codegen/LexicalScope.java |  88 ++---
 .../as/codegen/LoopControlFlowContext.java         |   8 +-
 .../as/codegen/MXMLClassDirectiveProcessor.java    | 388 ++++++++++-----------
 .../as/codegen/SwitchControlFlowContext.java       |   6 +-
 .../internal/as/codegen/UnknownTreeFinding.java    |  12 +-
 .../internal/as/codegen/UnknownTreeHandler.java    |  12 +-
 .../compiler/internal/as/codegen/WithContext.java  |  10 +-
 .../compiler/internal/caches/AssetTagCache.java    |  20 +-
 .../compiler/internal/caches/CSSDocumentCache.java |  26 +-
 .../internal/caches/CacheStoreKeyBase.java         |   2 +-
 .../internal/caches/ConcurrentCacheStoreBase.java  |   2 +-
 .../compiler/internal/caches/FileScopeCache.java   |  20 +-
 .../compiler/internal/caches/MXMLDataCache.java    |  10 +-
 .../caches/PackageNamespaceDefinitionCache.java    |   4 +-
 .../royale/compiler/internal/caches/SWFCache.java  |  22 +-
 .../compiler/internal/clients/CLIFactory.java      |   2 +-
 .../codegen/databinding/BindingAnalyzer.java       |  18 +-
 .../codegen/databinding/BindingCodeGenUtils.java   |  42 +--
 .../codegen/databinding/BindingDatabase.java       |  18 +-
 .../databinding/BindingDestinationMaker.java       |  36 +-
 .../internal/codegen/databinding/BindingInfo.java  |  76 ++--
 .../codegen/databinding/FunctionWatcherInfo.java   |   8 +-
 .../databinding/MXMLBindingDirectiveHelper.java    |  54 +--
 .../codegen/databinding/PropertyWatcherInfo.java   |   6 +-
 .../databinding/StaticPropertyWatcherInfo.java     |  18 +-
 .../codegen/databinding/WatcherAnalyzer.java       |  42 +--
 .../codegen/databinding/WatcherInfoBase.java       |  24 +-
 .../codegen/databinding/XMLWatcherInfo.java        |   6 +-
 .../royale/compiler/internal/common/Counter.java   |   2 +-
 .../internal/config/COMPCConfiguration.java        |  18 +-
 .../internal/config/CompilerProblemSettings.java   |   8 +-
 .../internal/config/DefaultsConfigurator.java      |   6 +-
 .../compiler/internal/config/FileConfigurator.java |  14 +-
 .../internal/config/FlashBuilderConfigurator.java  |   6 +-
 .../royale/compiler/internal/config/FrameInfo.java |   2 +-
 .../internal/config/ICompilerSettings.java         |   8 +-
 .../internal/config/IConfigurationFilter.java      |   2 +-
 .../compiler/internal/config/IConfigurator.java    |  18 +-
 .../internal/config/IWriteOnlyProjectSettings.java |   4 +-
 .../internal/config/LoadExternsParser.java         |  10 +-
 .../internal/config/QNameNormalization.java        |   2 +-
 .../internal/config/RSLArgumentNameGenerator.java  |   2 +-
 .../config/RuntimeSharedLibraryPathInfo.java       |   2 +-
 .../config/SystemPropertyConfigurator.java         |   6 +-
 .../compiler/internal/config/TargetSettings.java   |  16 +-
 .../config/annotations/ArgumentNameGenerator.java  |   2 +-
 .../internal/config/annotations/Arguments.java     |   2 +-
 .../internal/config/annotations/Config.java        |   2 +-
 .../config/annotations/DefaultArgumentValue.java   |   2 +-
 .../config/annotations/DeprecatedConfig.java       |   2 +-
 .../internal/config/annotations/FlexOnly.java      |   2 +-
 .../config/annotations/InfiniteArguments.java      |   2 +-
 .../internal/config/annotations/Mapping.java       |   4 +-
 .../config/annotations/SoftPrerequisites.java      |   2 +-
 .../config/localization/ILocalizedText.java        |   2 +-
 .../internal/config/localization/ILocalizer.java   |   2 +-
 .../config/localization/LocalizationManager.java   |   2 +-
 .../localization/ResourceBundleLocalizer.java      |   4 +-
 .../internal/css/CSSArrayPropertyValue.java        |   4 +-
 .../internal/css/CSSColorPropertyValue.java        |   2 +-
 .../compiler/internal/css/CSSCombinator.java       |   8 +-
 .../royale/compiler/internal/css/CSSDocument.java  |  20 +-
 .../royale/compiler/internal/css/CSSFontFace.java  |  10 +-
 .../internal/css/CSSFunctionCallPropertyValue.java |   4 +-
 .../royale/compiler/internal/css/CSSKeyFrames.java |   2 +-
 .../internal/css/CSSKeywordPropertyValue.java      |   2 +-
 .../royale/compiler/internal/css/CSSManager.java   |  40 +--
 .../internal/css/CSSMediaQueryCondition.java       |   6 +-
 .../compiler/internal/css/CSSModelTreeType.java    |   2 +-
 .../internal/css/CSSMultiValuePropertyValue.java   |   4 +-
 .../internal/css/CSSNamespaceDefinition.java       |   4 +-
 .../royale/compiler/internal/css/CSSNodeBase.java  |   6 +-
 .../internal/css/CSSNumberPropertyValue.java       |   2 +-
 .../royale/compiler/internal/css/CSSProperty.java  |   6 +-
 .../compiler/internal/css/CSSPropertyValue.java    |   4 +-
 .../internal/css/CSSRgbColorPropertyValue.java     |   2 +-
 .../internal/css/CSSRgbaColorPropertyValue.java    |   2 +-
 .../royale/compiler/internal/css/CSSRule.java      |  10 +-
 .../royale/compiler/internal/css/CSSSelector.java  |  10 +-
 .../internal/css/CSSSelectorCondition.java         |   6 +-
 .../internal/css/CSSStringPropertyValue.java       |   2 +-
 .../royale/compiler/internal/css/CSSTextNode.java  |   4 +-
 .../royale/compiler/internal/css/CSSTypedNode.java |   4 +-
 .../internal/css/CSSURLAndFormatPropertyValue.java |   4 +-
 .../css/codegen/CSSCompilationSession.java         |  44 +--
 .../internal/css/codegen/CSSModuleGenerator.java   |  26 +-
 .../compiler/internal/css/codegen/CSSReducer.java  |  84 ++---
 .../internal/css/codegen/ICSSCodeGenResult.java    |   6 +-
 .../internal/css/codegen/ICSSRuntimeConstants.java |   4 +-
 .../royale/compiler/internal/css/codegen/Pair.java |   6 +-
 .../css/semantics/ActivatedStyleSheets.java        |   8 +-
 .../css/semantics/CSSSemanticAnalyzer.java         |  80 ++---
 .../internal/definitions/AccessorDefinition.java   |  36 +-
 .../internal/definitions/AmbiguousDefinition.java  |  20 +-
 .../definitions/AppliedVectorDefinition.java       |  66 ++--
 .../internal/definitions/ClassDefinition.java      | 108 +++---
 .../internal/definitions/ClassDefinitionBase.java  |  58 +--
 .../definitions/ClassTraitsDefinition.java         |  40 +--
 .../internal/definitions/ConstantDefinition.java   |  24 +-
 .../internal/definitions/DefinitionBase.java       |  94 ++---
 .../internal/definitions/EffectDefinition.java     |  18 +-
 .../internal/definitions/EventDefinition.java      |  10 +-
 .../internal/definitions/FunctionDefinition.java   |  52 +--
 .../internal/definitions/GetterDefinition.java     |  12 +-
 .../internal/definitions/InterfaceDefinition.java  |  42 +--
 .../internal/definitions/MemberedDefinition.java   |   4 +-
 .../definitions/MetadataDefinitionBase.java        |  18 +-
 .../internal/definitions/NamespaceDefinition.java  |  56 +--
 .../internal/definitions/PackageDefinition.java    |   8 +-
 .../internal/definitions/ParameterDefinition.java  |  20 +-
 .../internal/definitions/ScopedDefinitionBase.java |   8 +-
 .../internal/definitions/SetterDefinition.java     |  12 +-
 .../internal/definitions/StyleDefinition.java      |  16 +-
 .../SyntheticBindableGetterDefinition.java         |   4 +-
 .../SyntheticBindableSetterDefinition.java         |   4 +-
 .../internal/definitions/TypeDefinitionBase.java   |  22 +-
 .../internal/definitions/VariableDefinition.java   |  52 +--
 .../internal/definitions/VectorInformation.java    |  22 +-
 .../definitions/metadata/DeprecationInfo.java      |   4 +-
 .../internal/definitions/metadata/MetaTag.java     |  34 +-
 .../definitions/metadata/MetaTagAttribute.java     |   4 +-
 .../metadata/ResourceBundleMetaTag.java            |  18 +-
 .../definitions/mxml/MXMLEventHandlerScope.java    |  14 +-
 .../definitions/references/BuiltinReference.java   |  18 +-
 .../definitions/references/LexicalReference.java   |  24 +-
 .../definitions/references/NotATypeReference.java  |  14 +-
 .../references/ParameterizedReference.java         |  20 +-
 .../definitions/references/ReferenceCache.java     |   6 +-
 .../references/ResolvedQualifiersReference.java    |  34 +-
 .../definitions/references/ResolvedReference.java  |  16 +-
 .../internal/embedding/EmbedAttribute.java         |   2 +-
 .../compiler/internal/embedding/EmbedData.java     |  76 ++--
 .../compiler/internal/embedding/EmbedMIMEType.java |   2 +-
 .../embedding/transcoders/DataTranscoder.java      |  16 +-
 .../embedding/transcoders/ImageTranscoder.java     |  54 +--
 .../embedding/transcoders/JPEGTranscoder.java      |  26 +-
 .../embedding/transcoders/MovieTranscoder.java     | 124 +++----
 .../embedding/transcoders/PBJTranscoder.java       |  44 +--
 .../embedding/transcoders/ScalableTranscoder.java  |  22 +-
 .../embedding/transcoders/SkinTranscoder.java      |  54 +--
 .../embedding/transcoders/SoundTranscoder.java     |  22 +-
 .../embedding/transcoders/TranscoderBase.java      |  48 +--
 .../embedding/transcoders/XMLTranscoder.java       |  48 +--
 .../internal/filespecs/IZipFileSpecification.java  |   4 +-
 .../internal/filespecs/SWCFileSpecification.java   |  10 +-
 .../filespecs/StringFileSpecification.java         |   6 +-
 .../internal/filespecs/ZipFileSpecification.java   |   2 +-
 .../compiler/internal/fxg/dom/AbstractFXGNode.java |  14 +-
 .../internal/fxg/dom/AbstractShapeNode.java        |  12 +-
 .../internal/fxg/dom/BitmapGraphicNode.java        |  10 +-
 .../compiler/internal/fxg/dom/CDATANode.java       |   6 +-
 .../internal/fxg/dom/ContentPropertyNode.java      |  12 +-
 .../compiler/internal/fxg/dom/DOMParserHelper.java |  38 +-
 .../compiler/internal/fxg/dom/DefinitionNode.java  |  14 +-
 .../compiler/internal/fxg/dom/DelegateNode.java    |   8 +-
 .../compiler/internal/fxg/dom/EllipseNode.java     |  14 +-
 .../internal/fxg/dom/GradientEntryNode.java        |   6 +-
 .../internal/fxg/dom/GraphicContentNode.java       |  32 +-
 .../compiler/internal/fxg/dom/GraphicContext.java  |  12 +-
 .../compiler/internal/fxg/dom/GraphicNode.java     |  44 +--
 .../internal/fxg/dom/GroupDefinitionNode.java      |  24 +-
 .../compiler/internal/fxg/dom/GroupNode.java       |  14 +-
 .../compiler/internal/fxg/dom/IFillNode.java       |   4 +-
 .../compiler/internal/fxg/dom/IFilterNode.java     |   4 +-
 .../compiler/internal/fxg/dom/IMaskableNode.java   |   6 +-
 .../compiler/internal/fxg/dom/IMaskingNode.java    |   4 +-
 .../internal/fxg/dom/IPreserveWhiteSpaceNode.java  |   2 +-
 .../internal/fxg/dom/IScalableGradientNode.java    |   4 +-
 .../compiler/internal/fxg/dom/IStrokeNode.java     |   4 +-
 .../compiler/internal/fxg/dom/ITextNode.java       |   6 +-
 .../compiler/internal/fxg/dom/ITransformNode.java  |   4 +-
 .../compiler/internal/fxg/dom/LibraryNode.java     |  12 +-
 .../royale/compiler/internal/fxg/dom/LineNode.java |  16 +-
 .../internal/fxg/dom/MaskPropertyNode.java         |   8 +-
 .../royale/compiler/internal/fxg/dom/PathNode.java |  28 +-
 .../compiler/internal/fxg/dom/PlaceObjectNode.java |   2 +-
 .../royale/compiler/internal/fxg/dom/RectNode.java |  16 +-
 .../compiler/internal/fxg/dom/RichTextNode.java    | 106 +++---
 .../compiler/internal/fxg/dom/TextGraphicNode.java |  30 +-
 .../internal/fxg/dom/fills/AbstractFillNode.java   |  10 +-
 .../internal/fxg/dom/fills/BitmapFillNode.java     |  16 +-
 .../fxg/dom/fills/LinearGradientFillNode.java      |  38 +-
 .../fxg/dom/fills/RadialGradientFillNode.java      |  26 +-
 .../internal/fxg/dom/fills/SolidColorFillNode.java |   8 +-
 .../fxg/dom/filters/AbstractFilterNode.java        |  20 +-
 .../internal/fxg/dom/filters/BevelFilterNode.java  |  10 +-
 .../internal/fxg/dom/filters/BlurFilterNode.java   |   8 +-
 .../fxg/dom/filters/ColorMatrixFilterNode.java     |  10 +-
 .../fxg/dom/filters/DropShadowFilterNode.java      |   8 +-
 .../internal/fxg/dom/filters/GlowFilterNode.java   |   8 +-
 .../fxg/dom/filters/GradientBevelFilterNode.java   |  18 +-
 .../fxg/dom/filters/GradientGlowFilterNode.java    |  16 +-
 .../dom/richtext/AbstractRichBlockTextNode.java    |  60 ++--
 .../dom/richtext/AbstractRichParagraphNode.java    |  22 +-
 .../fxg/dom/richtext/AbstractRichTextLeafNode.java |  52 +--
 .../fxg/dom/richtext/AbstractRichTextNode.java     |  16 +-
 .../compiler/internal/fxg/dom/richtext/BRNode.java |   8 +-
 .../internal/fxg/dom/richtext/DivNode.java         |  18 +-
 .../internal/fxg/dom/richtext/ImgNode.java         |  16 +-
 .../internal/fxg/dom/richtext/LinkNode.java        |  20 +-
 .../internal/fxg/dom/richtext/ParagraphNode.java   |  26 +-
 .../internal/fxg/dom/richtext/SpanNode.java        |  12 +-
 .../internal/fxg/dom/richtext/TCYNode.java         |  20 +-
 .../internal/fxg/dom/richtext/TabNode.java         |   8 +-
 .../internal/fxg/dom/richtext/TextHelper.java      |  56 +--
 .../fxg/dom/richtext/TextLayoutFormatNode.java     |   4 +-
 .../fxg/dom/richtext/TextPropertyNode.java         |  12 +-
 .../fxg/dom/strokes/AbstractStrokeNode.java        |  24 +-
 .../fxg/dom/strokes/LinearGradientStrokeNode.java  |  28 +-
 .../fxg/dom/strokes/RadialGradientStrokeNode.java  |  28 +-
 .../fxg/dom/strokes/SolidColorStrokeNode.java      |   8 +-
 .../fxg/dom/text/AbstractCharacterTextNode.java    |  20 +-
 .../internal/fxg/dom/text/AbstractTextNode.java    |  16 +-
 .../compiler/internal/fxg/dom/text/BRNode.java     |   4 +-
 .../internal/fxg/dom/text/ParagraphNode.java       |  14 +-
 .../compiler/internal/fxg/dom/text/SpanNode.java   |  12 +-
 .../fxg/dom/transforms/AbstractTransformNode.java  |  10 +-
 .../fxg/dom/transforms/ColorTransformNode.java     |   8 +-
 .../internal/fxg/dom/transforms/MatrixNode.java    |   8 +-
 .../internal/fxg/dom/types/AlignmentBaseline.java  |   2 +-
 .../internal/fxg/dom/types/BaselineOffset.java     |   2 +-
 .../internal/fxg/dom/types/BaselineShift.java      |   2 +-
 .../compiler/internal/fxg/dom/types/BevelType.java |   2 +-
 .../compiler/internal/fxg/dom/types/BlendMode.java |   2 +-
 .../internal/fxg/dom/types/BlockProgression.java   |   2 +-
 .../internal/fxg/dom/types/BreakOpportunity.java   |   2 +-
 .../compiler/internal/fxg/dom/types/Caps.java      |   2 +-
 .../internal/fxg/dom/types/ColorWithEnum.java      |   2 +-
 .../compiler/internal/fxg/dom/types/DigitCase.java |   2 +-
 .../internal/fxg/dom/types/DigitWidth.java         |   2 +-
 .../compiler/internal/fxg/dom/types/Direction.java |   2 +-
 .../internal/fxg/dom/types/DominantBaseline.java   |   2 +-
 .../compiler/internal/fxg/dom/types/FillMode.java  |   2 +-
 .../compiler/internal/fxg/dom/types/FontStyle.java |   2 +-
 .../internal/fxg/dom/types/FontWeight.java         |   2 +-
 .../fxg/dom/types/InterpolationMethod.java         |   2 +-
 .../compiler/internal/fxg/dom/types/Joints.java    |   2 +-
 .../internal/fxg/dom/types/JustificationRule.java  |   2 +-
 .../internal/fxg/dom/types/JustificationStyle.java |   2 +-
 .../compiler/internal/fxg/dom/types/Kerning.java   |   2 +-
 .../internal/fxg/dom/types/LeadingModel.java       |   2 +-
 .../internal/fxg/dom/types/LigatureLevel.java      |   2 +-
 .../compiler/internal/fxg/dom/types/LineBreak.java |   2 +-
 .../compiler/internal/fxg/dom/types/MaskType.java  |   2 +-
 .../internal/fxg/dom/types/NumberAuto.java         |   2 +-
 .../internal/fxg/dom/types/NumberInherit.java      |   2 +-
 .../internal/fxg/dom/types/NumberPercentAuto.java  |   2 +-
 .../internal/fxg/dom/types/ResizeMode.java         |   2 +-
 .../compiler/internal/fxg/dom/types/ScaleMode.java |   2 +-
 .../internal/fxg/dom/types/ScalingGrid.java        |   2 +-
 .../internal/fxg/dom/types/SpreadMethod.java       |   2 +-
 .../compiler/internal/fxg/dom/types/TextAlign.java |   2 +-
 .../internal/fxg/dom/types/TextDecoration.java     |   2 +-
 .../internal/fxg/dom/types/TextJustify.java        |   2 +-
 .../internal/fxg/dom/types/TextRotation.java       |   2 +-
 .../internal/fxg/dom/types/TypographicCase.java    |   2 +-
 .../internal/fxg/dom/types/VerticalAlign.java      |   2 +-
 .../internal/fxg/dom/types/WhiteSpaceCollapse.java |   2 +-
 .../compiler/internal/fxg/dom/types/Winding.java   |   2 +-
 .../internal/fxg/logging/AbstractLogger.java       |   4 +-
 .../internal/fxg/logging/SystemLogger.java         |   2 +-
 .../internal/fxg/resources/FXGFileResolver.java    |   4 +-
 .../fxg/sax/AbstractFXGVersionHandler.java         |   6 +-
 .../compiler/internal/fxg/sax/FXGSAXParser.java    |  10 +-
 .../compiler/internal/fxg/sax/FXGSAXScanner.java   |  42 +--
 .../fxg/sax/FXGVersionHandlerRegistry.java         |   4 +-
 .../internal/fxg/sax/FXG_v1_0_Handler.java         |  76 ++--
 .../internal/fxg/sax/FXG_v2_0_Handler.java         |  90 ++---
 .../internal/fxg/sax/IFXGVersionHandler.java       |   6 +-
 .../compiler/internal/fxg/swf/DefineImage.java     |   4 +-
 .../compiler/internal/fxg/swf/ImageHelper.java     |  54 +--
 .../compiler/internal/fxg/swf/ShapeHelper.java     |  32 +-
 .../compiler/internal/fxg/swf/TextHelper.java      |   2 +-
 .../compiler/internal/fxg/swf/TypeHelper.java      |  24 +-
 .../compiler/internal/fxg/types/FXGMatrix.java     |   8 +-
 .../royale/compiler/internal/graph/Graph.java      |   2 +-
 .../royale/compiler/internal/graph/GraphEdge.java  |   2 +-
 .../compiler/internal/graph/GraphMLWriter.java     |  18 +-
 .../royale/compiler/internal/graph/IGraph.java     |   2 +-
 .../royale/compiler/internal/graph/IGraphEdge.java |   2 +-
 .../royale/compiler/internal/graph/IGraphable.java |   2 +-
 .../compiler/internal/graph/IReportWriter.java     |   4 +-
 .../graph/InvalidationBytesCalculator.java         |   8 +-
 .../compiler/internal/graph/LinkReportWriter.java  |  20 +-
 .../compiler/internal/graph/SynchronizedGraph.java |   2 +-
 .../compiler/internal/graph/TopologicalSort.java   |   4 +-
 .../compiler/internal/graph/XMLGraphWriter.java    |   8 +-
 .../compiler/internal/mxml/EntityProcessor.java    |  14 +-
 .../royale/compiler/internal/mxml/MXMLData.java    |  36 +-
 .../compiler/internal/mxml/MXMLDataManager.java    |   8 +-
 .../royale/compiler/internal/mxml/MXMLDialect.java |  10 +-
 .../compiler/internal/mxml/MXMLDialect2006.java    |  10 +-
 .../compiler/internal/mxml/MXMLDialect2009.java    |   6 +-
 .../compiler/internal/mxml/MXMLDialect2012.java    |   8 +-
 .../internal/mxml/MXMLInstructionData.java         |   6 +-
 .../internal/mxml/MXMLManifestManager.java         |  20 +-
 .../internal/mxml/MXMLNamespaceAttributeData.java  |  10 +-
 .../internal/mxml/MXMLNamespaceMapping.java        |   4 +-
 .../compiler/internal/mxml/MXMLStateSplitter.java  |  12 +-
 .../internal/mxml/MXMLTagAttributeData.java        |  30 +-
 .../royale/compiler/internal/mxml/MXMLTagData.java |  46 +--
 .../compiler/internal/mxml/MXMLTextData.java       |  18 +-
 .../compiler/internal/mxml/MXMLUnitData.java       |  18 +-
 .../compiler/internal/mxml/StateDefinition.java    |  10 +-
 .../internal/mxml/StateDefinitionBase.java         |  10 +-
 .../internal/mxml/StateGroupDefinition.java        |   8 +-
 .../compiler/internal/parsing/FakingReader.java    |   4 +-
 .../compiler/internal/parsing/FilteringList.java   |   4 +-
 .../compiler/internal/parsing/ISourceFragment.java |   2 +-
 .../internal/parsing/ITokenStreamFilter.java       |   4 +-
 .../compiler/internal/parsing/SourceFragment.java  |   4 +-
 .../internal/parsing/SourceFragmentsReader.java    |   2 +-
 .../compiler/internal/parsing/TokenBase.java       |  12 +-
 .../internal/parsing/as/ASBalancingScanner.java    |   6 +-
 .../compiler/internal/parsing/as/ASDocToken.java   |   6 +-
 .../internal/parsing/as/ASDocTokenizer.java        |   6 +-
 .../compiler/internal/parsing/as/ASToken.java      |   8 +-
 .../compiler/internal/parsing/as/BaseASParser.java | 200 +++++------
 .../internal/parsing/as/BaseMetaTagParser.java     |  20 +-
 .../internal/parsing/as/BaseRawASTokenizer.java    |  18 +-
 .../internal/parsing/as/BaseRawTokenizer.java      |  14 +-
 .../parsing/as/BaseRepairingTokenBuffer.java       |   6 +-
 .../as/BaseTokenizerWithFakeCharacters.java        |   4 +-
 .../internal/parsing/as/ConfigCompilationUnit.java |  26 +-
 .../internal/parsing/as/ConfigProcessor.java       |  78 ++---
 .../internal/parsing/as/DeferFunctionBody.java     |   2 +-
 .../internal/parsing/as/IProblemReporter.java      |   4 +-
 .../parsing/as/IProjectConfigVariables.java        |  10 +-
 .../internal/parsing/as/IRepairingTokenBuffer.java |   4 +-
 .../internal/parsing/as/IncludeHandler.java        |  20 +-
 .../internal/parsing/as/MetaDataPayloadToken.java  |   4 +-
 .../internal/parsing/as/MetadataToken.java         |   6 +-
 .../internal/parsing/as/MetadataTokenizer.java     |   6 +-
 .../internal/parsing/as/NilASDocDelegate.java      |  18 +-
 .../compiler/internal/parsing/as/OffsetCue.java    |   2 +-
 .../compiler/internal/parsing/as/OffsetLookup.java |   4 +-
 .../internal/parsing/as/RepairingTokenBuffer.java  |   4 +-
 .../internal/parsing/as/SimpleASDocDelegate.java   |  20 +-
 .../internal/parsing/as/StreamingASTokenizer.java  |  40 +--
 .../internal/parsing/as/StreamingTokenBuffer.java  |   6 +-
 .../parsing/mxml/BalancingMXMLProcessor.java       |  14 +-
 .../parsing/mxml/BaseRawMXMLTokenizer.java         |  14 +-
 .../internal/parsing/mxml/MXMLScopeBuilder.java    |  78 ++---
 .../internal/parsing/mxml/MXMLTagDataDepth.java    |  24 +-
 .../internal/parsing/mxml/MXMLTagDataPayload.java  |   4 +-
 .../compiler/internal/parsing/mxml/MXMLToken.java  |  10 +-
 .../internal/parsing/mxml/MXMLTokenizer.java       |  26 +-
 .../parsing/mxml/MXMLUnitDataIterator.java         |   4 +-
 .../compiler/internal/projects/ASCProject.java     |  10 +-
 .../compiler/internal/projects/ASProject.java      |  30 +-
 .../internal/projects/ASSourceFileHandler.java     |   6 +-
 .../internal/projects/CompilerProject.java         |  74 ++--
 .../compiler/internal/projects/ConfigManager.java  |  22 +-
 .../internal/projects/DefinitionPriority.java      |   4 +-
 .../internal/projects/DependencyGraph.java         |  22 +-
 .../internal/projects/FXGSourceFileHandler.java    |   6 +-
 .../compiler/internal/projects/FlexProject.java    | 132 +++----
 .../internal/projects/FlexProjectConfigurator.java |  26 +-
 .../internal/projects/ISourceFileHandler.java      |   4 +-
 .../internal/projects/LibraryDependencyGraph.java  |  18 +-
 .../internal/projects/LibraryPathManager.java      |  36 +-
 .../internal/projects/MXMLSourceFileHandler.java   |   6 +-
 .../projects/ResourceBundleSourceFileHandler.java  |   6 +-
 .../internal/projects/SourceListManager.java       |  12 +-
 .../internal/projects/SourcePathManager.java       |  26 +-
 .../compiler/internal/projects/ThemeUtilities.java |   4 +-
 .../resourcebundles/PropertiesFileParser.java      |  40 +--
 .../resourcebundles/ResourceBundleUtils.java       |  34 +-
 .../compiler/internal/scopes/ASFileScope.java      |  42 +--
 .../internal/scopes/ASFileScopeProvider.java       |   8 +-
 .../compiler/internal/scopes/ASProjectScope.java   |  56 +--
 .../royale/compiler/internal/scopes/ASScope.java   |  56 +--
 .../compiler/internal/scopes/ASScopeBase.java      |  28 +-
 .../compiler/internal/scopes/ASScopeCache.java     |  28 +-
 .../compiler/internal/scopes/CatchScope.java       |   6 +-
 .../compiler/internal/scopes/ClosureScope.java     |   2 +-
 .../internal/scopes/EmptyDefinitionStore.java      |   6 +-
 .../compiler/internal/scopes/FXGFileScope.java     |   4 +-
 .../compiler/internal/scopes/FunctionScope.java    |   4 +-
 .../compiler/internal/scopes/IDefinitionStore.java |   6 +-
 .../internal/scopes/IMutableDefinitionSet.java     |   8 +-
 .../internal/scopes/LargeDefinitionSet.java        |   8 +-
 .../internal/scopes/LargeDefinitionStore.java      |   6 +-
 .../compiler/internal/scopes/MXMLFileScope.java    |  32 +-
 .../internal/scopes/NamespaceSetPredicate.java     |  10 +-
 .../internal/scopes/NoDefinitionScope.java         |  14 +-
 .../compiler/internal/scopes/PackageScope.java     |  22 +-
 .../internal/scopes/SWCFileScopeProvider.java      |  24 +-
 .../royale/compiler/internal/scopes/ScopeView.java |  28 +-
 .../internal/scopes/SmallDefinitionSet.java        |   8 +-
 .../internal/scopes/SmallDefinitionStore1.java     |   6 +-
 .../internal/scopes/SmallDefinitionStore2.java     |   6 +-
 .../internal/scopes/SmallDefinitionStore4.java     |   6 +-
 .../internal/scopes/SmallDefinitionStore8.java     |   6 +-
 .../internal/scopes/SmallDefinitionStoreBase.java  |   8 +-
 .../royale/compiler/internal/scopes/TypeScope.java |  32 +-
 .../royale/compiler/internal/scopes/WithScope.java |   2 +-
 .../semantics/MethodBodySemanticChecker.java       | 210 +++++------
 .../internal/semantics/PostProcessStep.java        |   2 +-
 .../compiler/internal/semantics/SemanticUtils.java | 216 ++++++------
 .../compiler/internal/targets/AppSWFTarget.java    |  52 +--
 .../internal/targets/FlexAppSWFTarget.java         | 126 +++----
 .../targets/FlexApplicationFrame1Info.java         |  36 +-
 .../compiler/internal/targets/FlexFontInfo.java    |   4 +-
 .../compiler/internal/targets/FlexFrame1Info.java  |  32 +-
 .../internal/targets/FlexLibraryFrame1Info.java    |   6 +-
 .../internal/targets/FlexLibrarySWFTarget.java     |  42 +--
 .../compiler/internal/targets/FlexRSLInfo.java     |  16 +-
 .../internal/targets/FlexSplashScreenImage.java    |   8 +-
 .../compiler/internal/targets/FlexTarget.java      |  82 ++---
 .../internal/targets/ILibrarySWFTarget.java        |   6 +-
 .../internal/targets/ITargetAttributes.java        |   2 +-
 .../internal/targets/LibrarySWFTarget.java         |  22 +-
 .../compiler/internal/targets/LinkageChecker.java  |  14 +-
 .../internal/targets/NilTargetAttributes.java      |   2 +-
 .../compiler/internal/targets/SWCTarget.java       |  96 ++---
 .../compiler/internal/targets/SWFTarget.java       |  94 ++---
 .../compiler/internal/targets/TagSorter.java       |  20 +-
 .../royale/compiler/internal/targets/Target.java   |  56 +--
 .../internal/targets/TargetAttributeBase.java      |   4 +-
 .../internal/targets/TargetAttributesMap.java      |   4 +-
 .../internal/targets/TargetAttributesMetadata.java |   4 +-
 .../compiler/internal/targets/TargetReport.java    |  14 +-
 .../testing/NodesToXMLStringFormatter.java         |   6 +-
 .../compiler/internal/tree/as/AccessorNode.java    |  34 +-
 .../internal/tree/as/ArrayLiteralNode.java         |  16 +-
 .../internal/tree/as/BaseDefinitionNode.java       |  50 +--
 .../internal/tree/as/BaseLiteralContainerNode.java |  18 +-
 .../tree/as/BaseStatementExpressionNode.java       |   6 +-
 .../internal/tree/as/BaseStatementNode.java        |   6 +-
 .../internal/tree/as/BaseTypedDefinitionNode.java  |  36 +-
 .../internal/tree/as/BaseVariableNode.java         |  36 +-
 .../internal/tree/as/BinaryOperatorAsNode.java     |  14 +-
 .../tree/as/BinaryOperatorAssignmentNode.java      |  10 +-
 .../as/BinaryOperatorBitwiseAndAssignmentNode.java |  12 +-
 .../tree/as/BinaryOperatorBitwiseAndNode.java      |  12 +-
 ...naryOperatorBitwiseLeftShiftAssignmentNode.java |  12 +-
 .../as/BinaryOperatorBitwiseLeftShiftNode.java     |  12 +-
 .../as/BinaryOperatorBitwiseOrAssignmentNode.java  |  12 +-
 .../tree/as/BinaryOperatorBitwiseOrNode.java       |  12 +-
 ...aryOperatorBitwiseRightShiftAssignmentNode.java |  12 +-
 .../as/BinaryOperatorBitwiseRightShiftNode.java    |  12 +-
 ...torBitwiseUnsignedRightShiftAssignmentNode.java |  12 +-
 ...inaryOperatorBitwiseUnsignedRightShiftNode.java |  14 +-
 .../as/BinaryOperatorBitwiseXorAssignmentNode.java |  12 +-
 .../tree/as/BinaryOperatorBitwiseXorNode.java      |  12 +-
 .../internal/tree/as/BinaryOperatorCommaNode.java  |  10 +-
 .../as/BinaryOperatorDivisionAssignmentNode.java   |  12 +-
 .../tree/as/BinaryOperatorDivisionNode.java        |  12 +-
 .../internal/tree/as/BinaryOperatorEqualNode.java  |  12 +-
 .../as/BinaryOperatorGreaterThanEqualsNode.java    |  12 +-
 .../tree/as/BinaryOperatorGreaterThanNode.java     |  12 +-
 .../internal/tree/as/BinaryOperatorInNode.java     |  12 +-
 .../tree/as/BinaryOperatorInstanceOfNode.java      |  12 +-
 .../internal/tree/as/BinaryOperatorIsNode.java     |  12 +-
 .../tree/as/BinaryOperatorLessThanEqualsNode.java  |  12 +-
 .../tree/as/BinaryOperatorLessThanNode.java        |  12 +-
 .../as/BinaryOperatorLogicalAndAssignmentNode.java |  12 +-
 .../tree/as/BinaryOperatorLogicalAndNode.java      |  10 +-
 .../as/BinaryOperatorLogicalOrAssignmentNode.java  |  12 +-
 .../tree/as/BinaryOperatorLogicalOrNode.java       |  10 +-
 .../tree/as/BinaryOperatorMinusAssignmentNode.java |  12 +-
 .../internal/tree/as/BinaryOperatorMinusNode.java  |  12 +-
 .../as/BinaryOperatorModuloAssignmentNode.java     |  12 +-
 .../internal/tree/as/BinaryOperatorModuloNode.java |  12 +-
 ...BinaryOperatorMultiplicationAssignmentNode.java |  12 +-
 .../tree/as/BinaryOperatorMultiplicationNode.java  |  12 +-
 .../internal/tree/as/BinaryOperatorNodeBase.java   |  20 +-
 .../tree/as/BinaryOperatorNotEqualNode.java        |  12 +-
 .../tree/as/BinaryOperatorPlusAssignmentNode.java  |  12 +-
 .../internal/tree/as/BinaryOperatorPlusNode.java   |  12 +-
 .../tree/as/BinaryOperatorStrictEqualNode.java     |  12 +-
 .../tree/as/BinaryOperatorStrictNotEqualNode.java  |  12 +-
 .../compiler/internal/tree/as/BlockNode.java       |  12 +-
 .../compiler/internal/tree/as/CatchNode.java       |  24 +-
 .../internal/tree/as/ChainedVariableNode.java      |  16 +-
 .../compiler/internal/tree/as/ClassNode.java       |  60 ++--
 .../internal/tree/as/ClassReferenceNode.java       |   6 +-
 .../compiler/internal/tree/as/ConditionalNode.java |  12 +-
 .../internal/tree/as/ConfigConditionBlockNode.java |   4 +-
 .../compiler/internal/tree/as/ConfigConstNode.java |  10 +-
 .../internal/tree/as/ConfigExpressionNode.java     |  10 +-
 .../internal/tree/as/ConfigNamespaceNode.java      |   4 +-
 .../compiler/internal/tree/as/ContainerNode.java   |   6 +-
 .../internal/tree/as/DefaultXMLNamespaceNode.java  |   8 +-
 .../compiler/internal/tree/as/DoWhileLoopNode.java |   8 +-
 .../internal/tree/as/DynamicAccessNode.java        |   8 +-
 .../compiler/internal/tree/as/EmbedNode.java       |  36 +-
 .../internal/tree/as/ExpressionNodeBase.java       |  32 +-
 .../royale/compiler/internal/tree/as/FileNode.java |  58 +--
 .../internal/tree/as/FixedChildrenNode.java        |   2 +-
 .../compiler/internal/tree/as/ForLoopNode.java     |  18 +-
 .../compiler/internal/tree/as/FullNameNode.java    |   8 +-
 .../internal/tree/as/FunctionCallNode.java         |  32 +-
 .../compiler/internal/tree/as/FunctionNode.java    |  86 ++---
 .../internal/tree/as/FunctionObjectNode.java       |  20 +-
 .../compiler/internal/tree/as/GetterNode.java      |  16 +-
 .../tree/as/IInitializableDefinitionNode.java      |   6 +-
 .../compiler/internal/tree/as/IdentifierNode.java  | 106 +++---
 .../royale/compiler/internal/tree/as/IfNode.java   |  16 +-
 .../compiler/internal/tree/as/ImportNode.java      |  38 +-
 .../compiler/internal/tree/as/InterfaceNode.java   |  40 +--
 .../internal/tree/as/IterationFlowNode.java        |  14 +-
 .../compiler/internal/tree/as/KeywordNode.java     |  12 +-
 .../internal/tree/as/LabeledStatementNode.java     |   8 +-
 .../internal/tree/as/LanguageIdentifierNode.java   |  44 +--
 .../compiler/internal/tree/as/LiteralNode.java     |  18 +-
 .../tree/as/MemberAccessExpressionNode.java        |  32 +-
 .../compiler/internal/tree/as/MemberedNode.java    |   6 +-
 .../compiler/internal/tree/as/ModifierNode.java    |  10 +-
 .../internal/tree/as/ModifiersContainerNode.java   |   4 +-
 .../tree/as/NamespaceAccessExpressionNode.java     |  18 +-
 .../internal/tree/as/NamespaceIdentifierNode.java  |  38 +-
 .../compiler/internal/tree/as/NamespaceNode.java   |  38 +-
 .../royale/compiler/internal/tree/as/NilNode.java  |   6 +-
 .../royale/compiler/internal/tree/as/NodeBase.java |  46 +--
 .../tree/as/NonResolvingIdentifierNode.java        |   8 +-
 .../internal/tree/as/NumericLiteralNode.java       |  14 +-
 .../internal/tree/as/ObjectLiteralNode.java        |  10 +-
 .../tree/as/ObjectLiteralValuePairNode.java        |  16 +-
 .../internal/tree/as/OperatorNodeBase.java         |   8 +-
 .../compiler/internal/tree/as/PackageNode.java     |  28 +-
 .../compiler/internal/tree/as/ParameterNode.java   |  42 +--
 .../tree/as/QualifiedNameExpressionNode.java       |   4 +-
 .../tree/as/QualifiedNamespaceExpressionNode.java  |  12 +-
 .../internal/tree/as/RegExpLiteralNode.java        |  18 +-
 .../compiler/internal/tree/as/ReturnNode.java      |  12 +-
 .../tree/as/RuntimeNameExpressionNode.java         |   8 +-
 .../compiler/internal/tree/as/ScopedBlockNode.java |  22 +-
 .../compiler/internal/tree/as/SetterNode.java      |  26 +-
 .../compiler/internal/tree/as/SwitchNode.java      |  16 +-
 .../compiler/internal/tree/as/TerminalNode.java    |  12 +-
 .../internal/tree/as/TernaryOperatorNode.java      |  20 +-
 .../compiler/internal/tree/as/ThrowNode.java       |  12 +-
 .../internal/tree/as/TransparentContainerNode.java |   6 +-
 .../royale/compiler/internal/tree/as/TreeNode.java |   6 +-
 .../royale/compiler/internal/tree/as/TryNode.java  |  18 +-
 .../internal/tree/as/TypedExpressionNode.java      |  34 +-
 .../internal/tree/as/UnaryOperatorAtNode.java      |   6 +-
 .../tree/as/UnaryOperatorBitwiseNotNode.java       |  12 +-
 .../internal/tree/as/UnaryOperatorDeleteNode.java  |  12 +-
 .../tree/as/UnaryOperatorLogicalNotNode.java       |  12 +-
 .../internal/tree/as/UnaryOperatorMinusNode.java   |  12 +-
 .../internal/tree/as/UnaryOperatorNodeBase.java    |  20 +-
 .../internal/tree/as/UnaryOperatorPlusNode.java    |  12 +-
 .../tree/as/UnaryOperatorPostDecrementNode.java    |  10 +-
 .../tree/as/UnaryOperatorPostIncrementNode.java    |  10 +-
 .../tree/as/UnaryOperatorPostfixNodeBase.java      |   4 +-
 .../tree/as/UnaryOperatorPreDecrementNode.java     |  10 +-
 .../tree/as/UnaryOperatorPreIncrementNode.java     |  10 +-
 .../internal/tree/as/UnaryOperatorTypeOfNode.java  |  12 +-
 .../internal/tree/as/UnaryOperatorVoidNode.java    |   6 +-
 .../internal/tree/as/UseNamespaceNode.java         |  20 +-
 .../internal/tree/as/VariableExpressionNode.java   |  14 +-
 .../compiler/internal/tree/as/VariableNode.java    |  30 +-
 .../internal/tree/as/VectorLiteralNode.java        |  16 +-
 .../compiler/internal/tree/as/WhileLoopNode.java   |   8 +-
 .../royale/compiler/internal/tree/as/WithNode.java |  24 +-
 .../internal/tree/as/XMLListLiteralNode.java       |  10 +-
 .../compiler/internal/tree/as/XMLLiteralNode.java  |  18 +-
 .../tree/as/metadata/AccessibilityTagNode.java     |   6 +-
 .../tree/as/metadata/AlternativeTagNode.java       |   4 +-
 .../as/metadata/BaseDefinitionMetaTagNode.java     |  32 +-
 .../tree/as/metadata/BasicMetaTagNode.java         |   4 +-
 .../tree/as/metadata/DefaultPropertyTagNode.java   |  14 +-
 .../internal/tree/as/metadata/EffectTagNode.java   |  16 +-
 .../internal/tree/as/metadata/EventTagNode.java    |  18 +-
 .../tree/as/metadata/EventTriggerTagNode.java      |  14 +-
 .../tree/as/metadata/InspectableTagNode.java       |  14 +-
 .../internal/tree/as/metadata/MetaTagNode.java     |  26 +-
 .../internal/tree/as/metadata/MetaTagValue.java    |   6 +-
 .../internal/tree/as/metadata/MetaTagsNode.java    |  40 +--
 .../tree/as/metadata/MultiValueMetaTagNode.java    |   6 +-
 .../tree/as/metadata/ResourceBundleTagNode.java    |  24 +-
 .../tree/as/metadata/SkinClassTagNode.java         |   4 +-
 .../internal/tree/as/metadata/StyleTagNode.java    |  22 +-
 .../internal/tree/as/metadata/TypedTagNode.java    |  10 +-
 .../as/parts/AccessorFunctionContentsPart.java     |   4 +-
 .../internal/tree/as/parts/DecorationPart.java     |  12 +-
 .../tree/as/parts/FunctionContentsPart.java        |  10 +-
 .../as/parts/IAccessorFunctionContentsPart.java    |   4 +-
 .../internal/tree/as/parts/IDecorationPart.java    |  10 +-
 .../tree/as/parts/IFunctionContentsPart.java       |   8 +-
 .../tree/as/parts/SparseDecorationPart.java        |  10 +-
 .../tree/as/parts/VariableDecorationPart.java      |   6 +-
 .../internal/tree/mxml/MXMLApplicationNode.java    |  14 +-
 .../compiler/internal/tree/mxml/MXMLArrayNode.java |  52 +--
 .../tree/mxml/MXMLBindingAttributeNode.java        |  32 +-
 .../internal/tree/mxml/MXMLBindingNode.java        |  36 +-
 .../internal/tree/mxml/MXMLBooleanNode.java        |  12 +-
 .../tree/mxml/MXMLClassDefinitionNode.java         |  88 ++---
 .../compiler/internal/tree/mxml/MXMLClassNode.java |  30 +-
 .../tree/mxml/MXMLClassReferenceNodeBase.java      |  54 +--
 .../compiler/internal/tree/mxml/MXMLClearNode.java |  10 +-
 .../tree/mxml/MXMLCompilerDirectiveNodeBase.java   |  16 +-
 .../tree/mxml/MXMLCompilerDirectiveParser.java     |  22 +-
 .../internal/tree/mxml/MXMLComponentNode.java      |  38 +-
 .../tree/mxml/MXMLConcatenatedDataBindingNode.java |  10 +-
 .../internal/tree/mxml/MXMLDataBindingParser.java  |  42 +--
 .../internal/tree/mxml/MXMLDeclarationsNode.java   |  28 +-
 .../tree/mxml/MXMLDeferredInstanceNode.java        |  34 +-
 .../internal/tree/mxml/MXMLDefinitionNode.java     |  44 +--
 .../internal/tree/mxml/MXMLDesignLayerNode.java    |  18 +-
 .../internal/tree/mxml/MXMLDocumentNode.java       |  22 +-
 .../tree/mxml/MXMLEffectSpecifierNode.java         |  10 +-
 .../compiler/internal/tree/mxml/MXMLEmbedNode.java |  34 +-
 .../internal/tree/mxml/MXMLEventSpecifierNode.java |  56 +--
 .../internal/tree/mxml/MXMLExpressionNodeBase.java |  32 +-
 .../internal/tree/mxml/MXMLFactoryNode.java        |  20 +-
 .../compiler/internal/tree/mxml/MXMLFileNode.java  |  92 ++---
 .../internal/tree/mxml/MXMLFunctionNode.java       |  22 +-
 .../internal/tree/mxml/MXMLHTTPServiceNode.java    |  14 +-
 .../mxml/MXMLHTTPServiceRequestPropertyNode.java   |  16 +-
 .../internal/tree/mxml/MXMLImplementsNode.java     |  42 +--
 .../internal/tree/mxml/MXMLImplicitImportNode.java |  14 +-
 .../internal/tree/mxml/MXMLInstanceNode.java       |  72 ++--
 .../compiler/internal/tree/mxml/MXMLIntNode.java   |  12 +-
 .../internal/tree/mxml/MXMLLibraryNode.java        |  20 +-
 .../internal/tree/mxml/MXMLLiteralNode.java        |   8 +-
 .../internal/tree/mxml/MXMLMetadataNode.java       |  26 +-
 .../compiler/internal/tree/mxml/MXMLModelNode.java |  32 +-
 .../mxml/MXMLModelPropertyContainerNodeBase.java   |  14 +-
 .../internal/tree/mxml/MXMLModelPropertyNode.java  |  32 +-
 .../internal/tree/mxml/MXMLModelRootNode.java      |  12 +-
 .../compiler/internal/tree/mxml/MXMLNodeBase.java  |  92 ++---
 .../internal/tree/mxml/MXMLNumberNode.java         |  12 +-
 .../internal/tree/mxml/MXMLObjectNode.java         |  10 +-
 .../internal/tree/mxml/MXMLPrivateNode.java        |  14 +-
 .../tree/mxml/MXMLPropertySpecifierNode.java       |  58 +--
 .../internal/tree/mxml/MXMLRegExpNode.java         |  14 +-
 .../tree/mxml/MXMLRemoteObjectMethodNode.java      |  24 +-
 .../internal/tree/mxml/MXMLRemoteObjectNode.java   |  14 +-
 .../internal/tree/mxml/MXMLReparentNode.java       |  30 +-
 .../internal/tree/mxml/MXMLRepeaterNode.java       |   8 +-
 .../internal/tree/mxml/MXMLResourceNode.java       |  32 +-
 .../internal/tree/mxml/MXMLScriptNode.java         |  52 +--
 .../tree/mxml/MXMLSingleDataBindingNode.java       |  12 +-
 .../internal/tree/mxml/MXMLSpecifierNodeBase.java  |  12 +-
 .../compiler/internal/tree/mxml/MXMLStateNode.java |  38 +-
 .../internal/tree/mxml/MXMLStringNode.java         |  28 +-
 .../compiler/internal/tree/mxml/MXMLStyleNode.java |  30 +-
 .../internal/tree/mxml/MXMLStyleSpecifierNode.java |  22 +-
 .../internal/tree/mxml/MXMLTreeBuilder.java        | 112 +++---
 .../compiler/internal/tree/mxml/MXMLUintNode.java  |  12 +-
 .../internal/tree/mxml/MXMLVectorNode.java         |  54 +--
 .../internal/tree/mxml/MXMLWebServiceNode.java     |  14 +-
 .../tree/mxml/MXMLWebServiceOperationNode.java     |  24 +-
 .../internal/tree/mxml/MXMLXMLListNode.java        |  18 +-
 .../compiler/internal/tree/mxml/MXMLXMLNode.java   |  36 +-
 .../compiler/internal/tree/mxml/XMLBuilder.java    |  32 +-
 .../tree/properties/ResourceBundleEntryNode.java   |  10 +-
 .../tree/properties/ResourceBundleFileNode.java    |  10 +-
 .../internal/units/ABCCompilationUnit.java         |  46 +--
 .../compiler/internal/units/ASCompilationUnit.java |  66 ++--
 .../internal/units/CompilationUnitBase.java        | 102 +++---
 .../internal/units/EmbedCompilationUnit.java       |  70 ++--
 .../units/EmbedCompilationUnitFactory.java         |  20 +-
 .../internal/units/FXGCompilationUnit.java         |  86 ++---
 .../internal/units/ImportedASCompilationUnit.java  |  14 +-
 .../internal/units/InvisibleCompilationUnit.java   |  32 +-
 .../internal/units/MXMLCompilationUnit.java        |  60 ++--
 .../units/ResourceBundleCompilationUnit.java       | 106 +++---
 .../units/ResourceModuleCompilationUnit.java       |  66 ++--
 .../internal/units/SWCCompilationUnit.java         |  86 ++---
 .../internal/units/ServicesXMLCompilationUnit.java |  14 +-
 .../units/SourceCompilationUnitFactory.java        |  10 +-
 .../internal/units/StringToCompilationUnitMap.java |   6 +-
 .../internal/units/StyleModuleCompilationUnit.java |  68 ++--
 .../units/requests/ABCBytesRequestResult.java      |  12 +-
 .../units/requests/ABCFileScopeRequestResult.java  |  10 +-
 .../units/requests/ASFileScopeRequestResult.java   |  28 +-
 .../requests/EmbedFileScopeRequestResult.java      |   6 +-
 .../units/requests/FileScopeRequestResultBase.java |  12 +-
 .../internal/units/requests/RequestMaker.java      |   8 +-
 .../units/requests/SWFTagsRequestResult.java       |  18 +-
 .../units/requests/SyntaxTreeRequestResult.java    |  10 +-
 .../compiler/internal/workspaces/Workspace.java    |  64 ++--
 .../org/apache/royale/compiler/mxml/IMXMLData.java |  12 +-
 .../royale/compiler/mxml/IMXMLDataManager.java     |   4 +-
 .../royale/compiler/mxml/IMXMLInstructionData.java |   2 +-
 .../compiler/mxml/IMXMLLanguageConstants.java      |   4 +-
 .../royale/compiler/mxml/IMXMLManifestManager.java |   4 +-
 .../compiler/mxml/IMXMLNamespaceAttributeData.java |   2 +-
 .../compiler/mxml/IMXMLNamespaceMapping.java       |   2 +-
 .../compiler/mxml/IMXMLTagAttributeData.java       |  12 +-
 .../apache/royale/compiler/mxml/IMXMLTagData.java  |   8 +-
 .../apache/royale/compiler/mxml/IMXMLTextData.java |   6 +-
 .../royale/compiler/mxml/IMXMLTypeConstants.java   |  16 +-
 .../apache/royale/compiler/mxml/IMXMLUnitData.java |  10 +-
 .../royale/compiler/mxml/IStateDefinition.java     |   2 +-
 .../royale/compiler/mxml/IStateDefinitionBase.java |   6 +-
 .../compiler/mxml/IStateGroupDefinition.java       |   2 +-
 .../royale/compiler/mxml/IXMLNameResolver.java     |  10 +-
 .../compiler/parsing/GenericTokenStream.java       |   4 +-
 .../compiler/parsing/IASBalancingScanner.java      |   2 +-
 .../apache/royale/compiler/parsing/IASToken.java   |   6 +-
 .../royale/compiler/parsing/IASTokenizer.java      |   2 +-
 .../apache/royale/compiler/parsing/ICMToken.java   |   4 +-
 .../apache/royale/compiler/parsing/IMXMLToken.java |   2 +-
 .../royale/compiler/parsing/IMXMLTokenizer.java    |   2 +-
 .../royale/compiler/parsing/IMetadataParser.java   |   4 +-
 .../royale/compiler/parsing/MXMLTokenFactory.java  |   4 +-
 .../royale/compiler/parsing/MXMLTokenTypes.java    |   2 +-
 .../problems/ANELibraryNotAllowedProblem.java      |   2 +-
 .../compiler/problems/ASDocNotClosedProblem.java   |   6 +-
 .../problems/AbstractDeprecatedAPIProblem.java     |   4 +-
 .../compiler/problems/AbstractSemanticProblem.java |   6 +-
 .../problems/AccessUndefinedMemberProblem.java     |   4 +-
 .../AccessUndefinedPropertyInPackageProblem.java   |   4 +-
 .../problems/AccessUndefinedPropertyProblem.java   |   4 +-
 .../problems/AccessorTypesMustMatchProblem.java    |   4 +-
 .../problems/AmbiguousGotoTargetProblem.java       |   6 +-
 .../problems/AmbiguousReferenceProblem.java        |   4 +-
 .../AnyNamespaceCannotBeQualifierProblem.java      |   4 +-
 .../royale/compiler/problems/ArrayCastProblem.java |   6 +-
 .../compiler/problems/ArrayDowncastProblem.java    |   6 +-
 .../compiler/problems/AssignToConstProblem.java    |   4 +-
 .../compiler/problems/AssignToFunctionProblem.java |   4 +-
 .../problems/AssignToNonReferenceValueProblem.java |   4 +-
 .../problems/AssignToReadOnlyPropertyProblem.java  |   4 +-
 .../problems/AssignmentInConditionalProblem.java   |   6 +-
 .../AttemptToDeleteFixedPropertyProblem.java       |   6 +-
 .../problems/AttributesAreNotCallableProblem.java  |   4 +-
 ...ibutesNotAllowedOnPackageDefinitionProblem.java |   4 +-
 .../BURMDiagnosticForEachExpectedInProblem.java    |   4 +-
 .../BURMDiagnosticNotAllowedHereProblem.java       |   6 +-
 .../problems/BURMPatternMatchFailureProblem.java   |   6 +-
 .../problems/BadAccessInterfaceMemberProblem.java  |   4 +-
 .../compiler/problems/BadCharacterProblem.java     |   4 +-
 .../problems/BadSetterReturnTypeProblem.java       |   4 +-
 .../compiler/problems/BaseClassIsFinalProblem.java |   4 +-
 .../compiler/problems/CDataNotClosedProblem.java   |   6 +-
 .../compiler/problems/CSSCodeGenProblem.java       |   2 +-
 .../compiler/problems/CSSEmbedAssetProblem.java    |   4 +-
 .../problems/CSSExcludedStylePropertyProblem.java  |   4 +-
 .../royale/compiler/problems/CSSParserProblem.java |   6 +-
 .../royale/compiler/problems/CSSProblem.java       |   4 +-
 .../CSSUndefinedNamespacePrefixProblem.java        |   4 +-
 .../compiler/problems/CSSUndefinedTypeProblem.java |   4 +-
 .../CSSUnknownDefaultNamespaceProblem.java         |   4 +-
 .../CSSUnresolvedClassReferenceProblem.java        |   6 +-
 .../problems/CSSUnusedTypeSelectorProblem.java     |   6 +-
 .../compiler/problems/CallNonFunctionProblem.java  |   4 +-
 .../problems/CallUndefinedMethodProblem.java       |   4 +-
 .../problems/CanNotInsertSemicolonProblem.java     |   6 +-
 .../CannotDeleteSuperDescendantsProblem.java       |   4 +-
 .../problems/CannotExtendClassProblem.java         |   4 +-
 .../problems/CannotExtendInterfaceProblem.java     |   6 +-
 .../CannotResolveConfigExpressionProblem.java      |   4 +-
 ...ResolveProjectLevelConfigExpressionProblem.java |   2 +-
 .../problems/CircularTypeReferenceProblem.java     |   4 +-
 .../ClassesMappedToSameRemoteAliasProblem.java     |   2 +-
 .../compiler/problems/CodegenInternalProblem.java  |   6 +-
 .../royale/compiler/problems/CodegenProblem.java   |   6 +-
 .../compiler/problems/CommentNotClosedProblem.java |   6 +-
 .../ComparisonBetweenUnrelatedTypesProblem.java    |   6 +-
 .../problems/CompiledAsAComponentProblem.java      |   4 +-
 .../royale/compiler/problems/CompilerProblem.java  |  16 +-
 .../problems/CompilerProblemClassification.java    |   4 +-
 .../compiler/problems/CompilerProblemSeverity.java |   2 +-
 .../problems/ComponentTagWithoutURIProblem.java    |   4 +-
 .../problems/ConfigurationFileNotFoundProblem.java |   2 +-
 .../compiler/problems/ConfigurationProblem.java    |   8 +-
 ...ConflictingInheritedNameInNamespaceProblem.java |   4 +-
 .../ConflictingNameInNamespaceProblem.java         |   4 +-
 .../problems/ConstNotInitializedProblem.java       |   4 +-
 .../ConstructorCannotHaveReturnTypeProblem.java    |   4 +-
 .../problems/ConstructorInInterfaceProblem.java    |   6 +-
 .../problems/ConstructorIsGetterSetterProblem.java |   4 +-
 .../problems/ConstructorIsStaticProblem.java       |   4 +-
 .../problems/ConstructorMustBePublicProblem.java   |   4 +-
 .../problems/CountedForLoopInitializerProblem.java |   6 +-
 .../compiler/problems/CyclicalIncludesProblem.java |   4 +-
 .../royale/compiler/problems/DateCastProblem.java  |   6 +-
 .../problems/DecrementMustBeReferenceProblem.java  |   4 +-
 .../DefinitionShadowedByPackageNameProblem.java    |   4 +-
 .../problems/DependencyNotCompatibleProblem.java   |   2 +-
 .../compiler/problems/DeprecatedAPIProblem.java    |   4 +-
 .../problems/DeprecatedAPIWithMessageProblem.java  |   4 +-
 .../DeprecatedAPIWithReplacementProblem.java       |   4 +-
 ...eprecatedAPIWithSinceAndReplacementProblem.java |   4 +-
 .../problems/DeprecatedAPIWithSinceProblem.java    |   4 +-
 .../DeprecatedConfigurationOptionProblem.java      |   4 +-
 .../problems/DuplicateAttributeProblem.java        |   4 +-
 .../problems/DuplicateClassDefinitionProblem.java  |   4 +-
 .../DuplicateFunctionDefinitionProblem.java        |   4 +-
 .../problems/DuplicateImportAliasProblem.java      |   4 +-
 .../DuplicateInterfaceDefinitionProblem.java       |   4 +-
 .../problems/DuplicateInterfaceProblem.java        |   6 +-
 .../compiler/problems/DuplicateLabelProblem.java   |   4 +-
 .../DuplicateNamespaceDefinitionProblem.java       |   4 +-
 .../DuplicateQNameInSourcePathProblem.java         |   6 +-
 .../compiler/problems/DuplicateScriptProblem.java  |   2 +-
 .../problems/DuplicateSkinStateProblem.java        |   8 +-
 .../problems/DuplicateSourceFileProblem.java       |   2 +-
 .../problems/DuplicateSwitchCaseProblem.java       |   4 +-
 .../DuplicateVariableDefinitionProblem.java        |   6 +-
 .../problems/DynamicNotOnClassProblem.java         |   4 +-
 .../problems/EmbedAS2TagsModifiedProblem.java      |   4 +-
 .../problems/EmbedBadScalingGridTargetProblem.java |   4 +-
 ...edCouldNotDetermineSampleFrameCountProblem.java |   6 +-
 .../EmbedExceptionWhileTranscodingProblem.java     |   2 +-
 .../problems/EmbedInitialValueProblem.java         |   4 +-
 .../EmbedInvalidAttributeValueProblem.java         |   4 +-
 .../problems/EmbedInvalidUnicodeRangeProblem.java  |   2 +-
 .../problems/EmbedMissingSymbolProblem.java        |   4 +-
 .../problems/EmbedMovieScalingNoSymbolProblem.java |   4 +-
 .../problems/EmbedMultipleMetaTagsProblem.java     |   4 +-
 .../compiler/problems/EmbedNoSkinClassProblem.java |   4 +-
 .../problems/EmbedNoSourceAttributeProblem.java    |   4 +-
 .../problems/EmbedOnlyOnClassesAndVarsProblem.java |   4 +-
 .../EmbedQualityRequiresCompressionProblem.java    |   4 +-
 .../problems/EmbedQualityValueProblem.java         |   4 +-
 .../compiler/problems/EmbedScalingGridProblem.java |   4 +-
 .../problems/EmbedScalingGridValueProblem.java     |   6 +-
 .../problems/EmbedSkinClassNotFoundProblem.java    |   4 +-
 .../EmbedSourceAttributeCouldNotBeReadProblem.java |   2 +-
 .../EmbedSourceAttributeDoesNotExistProblem.java   |   6 +-
 .../problems/EmbedSourceFileNotFoundProblem.java   |   4 +-
 .../problems/EmbedTypeNotEmbeddableProblem.java    |   4 +-
 .../problems/EmbedUnableToReadSourceProblem.java   |   2 +-
 .../problems/EmbedUnknownAttributeProblem.java     |   4 +-
 .../problems/EmbedUnknownMimeTypeProblem.java      |   6 +-
 .../problems/EmbedUnrecogniedFileTypeProblem.java  |   4 +-
 .../problems/EmbedUnsupportedAttributeProblem.java |   8 +-
 .../EmbedUnsupportedSamplingRateProblem.java       |   6 +-
 .../problems/EmbedUnsupportedTypeProblem.java      |   4 +-
 ...pectDefinitionKeywordAfterAttributeProblem.java |   4 +-
 .../problems/ExpectXmlBeforeNamespaceProblem.java  |   4 +-
 .../ExtraCharactersAfterEndOfProgramProblem.java   |   4 +-
 .../problems/ExtraneousSuperStatementProblem.java  |   4 +-
 .../problems/FXGChildNodeNotSupportedProblem.java  |   2 +-
 .../problems/FXGContentNotContiguousProblem.java   |   2 +-
 .../problems/FXGDefinitionNotFoundProblem.java     |   2 +-
 .../problems/FXGErrorEmbeddingImageProblem.java    |   2 +-
 .../problems/FXGInvalidBooleanValueProblem.java    |   2 +-
 .../FXGInvalidChildColorTransformNodeProblem.java  |   2 +-
 .../problems/FXGInvalidChildMatrixNodeProblem.java |   2 +-
 .../problems/FXGInvalidChildNodeProblem.java       |   2 +-
 .../FXGInvalidColorMatrixValueProblem.java         |   2 +-
 .../problems/FXGInvalidColorValueProblem.java      |   2 +-
 .../problems/FXGInvalidDefinitionNameProblem.java  |   2 +-
 .../problems/FXGInvalidDoubleValueProblem.java     |   2 +-
 .../problems/FXGInvalidFloatValueProblem.java      |   2 +-
 .../FXGInvalidGroupIDAttributeProblem.java         |   2 +-
 .../problems/FXGInvalidIntegerValueProblem.java    |   2 +-
 .../problems/FXGInvalidLibraryElementProblem.java  |   2 +-
 .../problems/FXGInvalidMaskElementProblem.java     |   2 +-
 .../problems/FXGInvalidNestingElementsProblem.java |   2 +-
 .../problems/FXGInvalidNodeAttributeProblem.java   |   2 +-
 .../problems/FXGInvalidPathDataProblem.java        |   2 +-
 .../problems/FXGInvalidPercentValueProblem.java    |   2 +-
 ...GInvalidRectRadiusXRadiusYAttributeProblem.java |   2 +-
 .../problems/FXGInvalidRootNodeProblem.java        |   2 +-
 .../FXGInvalidScaleGridGroupChildProblem.java      |   2 +-
 ...XGInvalidScaleGridRotationAttributeProblem.java |   2 +-
 .../problems/FXGInvalidTabStopsProblem.java        |   2 +-
 .../problems/FXGInvalidVersionProblem.java         |   2 +-
 .../problems/FXGMissingAttributeProblem.java       |   2 +-
 .../problems/FXGMissingGroupChildNodeProblem.java  |   2 +-
 .../problems/FXGMultipleElementProblem.java        |   2 +-
 .../problems/FXGOutOfRangeValueProblem.java        |   2 +-
 .../royale/compiler/problems/FXGParserProblem.java |   2 +-
 .../FXGPrivateElementNotChildOfGraphicProblem.java |   2 +-
 .../problems/FXGPrivateElementNotLastProblem.java  |   2 +-
 .../royale/compiler/problems/FXGProblem.java       |   4 +-
 .../compiler/problems/FXGScanningProblem.java      |   2 +-
 .../problems/FXGUndefinedPropertyProblem.java      |   2 +-
 .../problems/FXGUnknownAttributeValueProblem.java  |   2 +-
 .../FXGUnknownElementInVersionProblem.java         |   2 +-
 .../FXGVersionHandlerNotRegisteredProblem.java     |   2 +-
 .../royale/compiler/problems/FatalProblem.java     |   4 +-
 .../royale/compiler/problems/FileIOProblem.java    |   2 +-
 .../compiler/problems/FileInLibraryIOProblem.java  |   2 +-
 .../problems/FileInLibraryNotFoundProblem.java     |   2 +-
 .../compiler/problems/FileNotFoundProblem.java     |   6 +-
 .../royale/compiler/problems/FileWriteProblem.java |   2 +-
 .../problems/FinalOutsideClassProblem.java         |   4 +-
 .../FlexOnlyConfigurationOptionNotSupported.java   |   4 +-
 .../problems/FontEmbeddingNotSupported.java        |   4 +-
 .../ForwardReferenceToBaseClassProblem.java        |   4 +-
 .../problems/FunctionNotMarkedOverrideProblem.java |   4 +-
 .../problems/FunctionWithoutBodyProblem.java       |   4 +-
 .../GetterCannotHaveParametersProblem.java         |   4 +-
 .../problems/GetterMustNotBeVoidProblem.java       |   4 +-
 .../problems/GlobalBindablePropertyProblem.java    |   4 +-
 .../HostComponentClassNotFoundProblem.java         |   4 +-
 .../problems/HostComponentMustHaveTypeProblem.java |   4 +-
 .../royale/compiler/problems/ICompilerProblem.java |   4 +-
 .../problems/IllegalAssignmentToClassProblem.java  |   4 +-
 .../problems/IllogicalComparionWithNaNProblem.java |   4 +-
 .../IllogicalComparisonWithUndefinedProblem.java   |   4 +-
 .../problems/ImplicitCoercionToSubtypeProblem.java |   4 +-
 .../ImplicitCoercionToUnrelatedTypeProblem.java    |   4 +-
 ...citTypeCheckCoercionToUnrelatedTypeProblem.java |   4 +-
 .../ImproperlyConfiguredTargetProblem.java         |   6 +-
 .../InaccessibleMethodReferenceProblem.java        |   4 +-
 .../InaccessiblePropertyReferenceProblem.java      |   4 +-
 .../IncompatibleDefaultValueOfTypeNullProblem.java |   4 +-
 .../IncompatibleInitializerTypeProblem.java        |   4 +-
 .../IncompatibleInterfaceMethodProblem.java        |   4 +-
 .../problems/IncompatibleOverrideProblem.java      |   4 +-
 .../problems/IncrementMustBeReferenceProblem.java  |   4 +-
 .../InitializerValueNotAnIntegerProblem.java       |   4 +-
 .../InitializerValueOutOfRangeProblem.java         |   4 +-
 ...nlineFunctionNotFinalStaticOrGlobalProblem.java |   4 +-
 .../problems/InlineFunctionTooLargeProblem.java    |   2 +-
 .../InlineNestedInliningNotSupportedProblem.java   |   2 +-
 .../compiler/problems/InlineNoSourceProblem.java   |   2 +-
 .../InlineUnsupportedInstructionProblem.java       |   2 +-
 .../problems/InlineUnsupportedNodeProblem.java     |   4 +-
 .../compiler/problems/InstanceOfProblem.java       |   4 +-
 .../problems/InterfaceBindablePropertyProblem.java |   4 +-
 .../InterfaceCannotBeInstantiatedProblem.java      |   4 +-
 .../problems/InterfaceMethodOverrideProblem.java   |   4 +-
 .../problems/InterfaceMethodWithBodyProblem.java   |   4 +-
 .../problems/InterfaceModifierProblem.java         |   4 +-
 .../InterfaceNamespaceAttributeProblem.java        |   4 +-
 .../compiler/problems/InternalCompilerProblem.java |   4 +-
 .../problems/InternalCompilerProblem2.java         |   2 +-
 .../problems/InvalidABCByteCodeProblem.java        |   2 +-
 .../compiler/problems/InvalidAttributeProblem.java |   4 +-
 .../problems/InvalidBackgroundColorProblem.java    |   2 +-
 .../problems/InvalidByteCodeGeneratedProblem.java  |  14 +-
 .../problems/InvalidConfigLocationProblem.java     |   4 +-
 .../problems/InvalidDecrementOperandProblem.java   |   4 +-
 .../problems/InvalidForInInitializerProblem.java   |   6 +-
 .../problems/InvalidImportFileProblem.java         |   2 +-
 .../problems/InvalidIncrementOperandProblem.java   |   4 +-
 .../compiler/problems/InvalidLabelProblem.java     |   4 +-
 .../compiler/problems/InvalidLvalueProblem.java    |   4 +-
 .../InvalidNamespaceInitializerProblem.java        |   4 +-
 .../compiler/problems/InvalidNamespaceProblem.java |   4 +-
 .../compiler/problems/InvalidOverrideProblem.java  |   4 +-
 .../InvalidPrivateNamespaceAttrProblem.java        |   4 +-
 .../problems/InvalidPrivateNamespaceProblem.java   |   4 +-
 .../InvalidProtectedNamespaceAttrProblem.java      |   4 +-
 .../problems/InvalidProtectedNamespaceProblem.java |   4 +-
 .../InvalidPublicNamespaceAttrProblem.java         |   4 +-
 .../problems/InvalidPublicNamespaceProblem.java    |   4 +-
 .../InvalidRestParameterDeclarationProblem.java    |   4 +-
 .../problems/InvalidSuperExpressionProblem.java    |   4 +-
 .../problems/InvalidSuperStatementProblem.java     |   4 +-
 .../compiler/problems/InvalidTypeProblem.java      |   4 +-
 .../compiler/problems/LibraryNotFoundProblem.java  |   2 +-
 .../problems/LocalBindablePropertyProblem.java     |   4 +-
 .../compiler/problems/LossyConversionProblem.java  |   4 +-
 .../problems/MXMLAttributeVersionProblem.java      |   4 +-
 .../MXMLBadChildTagPropertyAssignmentProblem.java  |   4 +-
 .../compiler/problems/MXMLClassNodeProblem.java    |   4 +-
 .../MXMLConstructorHasParametersProblem.java       |   4 +-
 .../problems/MXMLContentAfterRootTagProblem.java   |   4 +-
 .../problems/MXMLContentBeforeRootTagProblem.java  |   4 +-
 .../MXMLDatabindingSourceNotBindableProblem.java   |   6 +-
 .../compiler/problems/MXMLDualContentProblem.java  |   4 +-
 .../problems/MXMLDuplicateAttributeProblem.java    |   4 +-
 .../problems/MXMLDuplicateChildTagProblem.java     |   4 +-
 .../compiler/problems/MXMLDuplicateIDProblem.java  |   4 +-
 .../problems/MXMLEmptyAttributeProblem.java        |   4 +-
 .../problems/MXMLEmptyEventHandlerProblem.java     |   6 +-
 ...MLExecutableStatementsInScriptBlockProblem.java |   6 +-
 .../compiler/problems/MXMLFinalClassProblem.java   |   4 +-
 .../MXMLIncludeInAndExcludeFromProblem.java        |   4 +-
 .../MXMLIncompatibleArrayElementProblem.java       |   4 +-
 .../MXMLIncompatibleVectorElementProblem.java      |   4 +-
 .../MXMLInvalidDatabindingExpressionProblem.java   |   4 +-
 .../problems/MXMLInvalidDefinitionNameProblem.java |   4 +-
 .../problems/MXMLInvalidEntityProblem.java         |   4 +-
 .../compiler/problems/MXMLInvalidIDProblem.java    |   4 +-
 .../MXMLInvalidItemCreationPolicyProblem.java      |   4 +-
 .../MXMLInvalidItemDestructionPolicyProblem.java   |   4 +-
 .../problems/MXMLInvalidPercentageProblem.java     |   4 +-
 .../MXMLInvalidSourceAttributeProblem.java         |   4 +-
 .../compiler/problems/MXMLInvalidStyleProblem.java |   4 +-
 .../problems/MXMLInvalidTextForTypeProblem.java    |   4 +-
 .../MXMLInvalidVectorFixedAttributeProblem.java    |   4 +-
 .../MXMLInvalidVectorTypeAttributeProblem.java     |   4 +-
 .../MXMLLibraryTagNotTheFirstChildProblem.java     |   4 +-
 .../problems/MXMLMissingRootTagProblem.java        |   2 +-
 .../MXMLMissingVectorTypeAttributeProblem.java     |   4 +-
 .../problems/MXMLMultipleInitializersProblem.java  |   4 +-
 .../problems/MXMLMultipleRootTagsProblem.java      |   4 +-
 .../problems/MXMLNoAllowedAttributesProblem.java   |   4 +-
 .../compiler/problems/MXMLNotAClassProblem.java    |   4 +-
 .../MXMLOtherLanguageNamespaceProblem.java         |   4 +-
 .../MXMLOuterDocumentAlreadyDeclaredProblem.java   |   4 +-
 .../problems/MXMLPercentageNotAllowedProblem.java  |   4 +-
 .../problems/MXMLPrivateAttributeProblem.java      |   6 +-
 .../problems/MXMLPrivateTagLocationProblem.java    |   4 +-
 .../problems/MXMLRequiredAttributeProblem.java     |   4 +-
 ...MXMLSameBindingSourceAndDestinationProblem.java |   4 +-
 .../compiler/problems/MXMLSemanticProblem.java     |   6 +-
 .../compiler/problems/MXMLSyntaxProblem.java       |   6 +-
 .../compiler/problems/MXMLUnclosedTagProblem.java  |   8 +-
 .../problems/MXMLUnexpectedAttributeProblem.java   |   4 +-
 .../problems/MXMLUnexpectedDatabindingProblem.java |   4 +-
 .../problems/MXMLUnexpectedTagProblem.java         |   4 +-
 .../problems/MXMLUnexpectedTextProblem.java        |   4 +-
 .../problems/MXMLUnknownNamespaceProblem.java      |   4 +-
 .../problems/MXMLUnknownXMLFormatProblem.java      |   4 +-
 .../MXMLUnrecognizedCompilerDirectiveProblem.java  |   4 +-
 .../problems/MXMLUnresolvedTagProblem.java         |   4 +-
 .../problems/MXMLUnterminatedEntityProblem.java    |   4 +-
 .../problems/MXMLXMLListMixedContentProblem.java   |   4 +-
 .../problems/MXMLXMLOnlyOneRootTagProblem.java     |   4 +-
 ...XMLXMLProcessingInstructionLocationProblem.java |   4 +-
 .../problems/MXMLXMLRequireContentProblem.java     |   4 +-
 .../royale/compiler/problems/ManifestProblem.java  |   2 +-
 .../problems/MethodCannotBeConstructorProblem.java |   4 +-
 .../compiler/problems/MissingBuiltinProblem.java   |   4 +-
 .../problems/MissingCatchOrFinallyProblem.java     |   6 +-
 .../MissingFactoryClassInFrameMetadataProblem.java |   4 +-
 .../MissingLeftBraceBeforeFunctionBodyProblem.java |   4 +-
 .../problems/MissingPropertyNameProblem.java       |   4 +-
 .../MissingRequirementConfigurationProblem.java    |   2 +-
 .../problems/MissingSignedDigestProblem.java       |   2 +-
 .../compiler/problems/MissingSkinPartProblem.java  |   4 +-
 .../compiler/problems/MissingSkinStateProblem.java |   2 +-
 .../problems/MissingUnsignedDigestProblem.java     |   2 +-
 .../MultipleConfigNamespaceDecorationsProblem.java |   4 +-
 .../MultipleContructorDefinitionsProblem.java      |   4 +-
 ...ultipleExternallyVisibleDefinitionsProblem.java |   4 +-
 .../MultipleNamespaceAttributesProblem.java        |   4 +-
 ...MultipleReservedNamespaceAttributesProblem.java |   4 +-
 .../problems/MultipleSwitchDefaultsProblem.java    |   4 +-
 .../NamespaceAttributeNotAllowedProblem.java       |   6 +-
 .../problems/NamespaceInInterfaceProblem.java      |   4 +-
 .../NamespaceOverrideInsideFunctionProblem.java    |   4 +-
 .../problems/NativeMethodWithBodyProblem.java      |   4 +-
 .../problems/NativeNotOnFunctionProblem.java       |   4 +-
 .../problems/NativeUsedInInterfaceProblem.java     |   4 +-
 .../compiler/problems/NativeVariableProblem.java   |   4 +-
 .../compiler/problems/NestedClassProblem.java      |   4 +-
 .../problems/NestedGetterSetterProblem.java        |   4 +-
 .../compiler/problems/NestedInterfaceProblem.java  |   4 +-
 .../compiler/problems/NestedPackageProblem.java    |   4 +-
 .../NoCompilationUnitForDefinitionProblem.java     |   2 +-
 .../NoDefaultConstructorInBaseClassProblem.java    |   4 +-
 .../NoDefinitionForSWCDependencyProblem.java       |   4 +-
 .../compiler/problems/NoMainDefinitionProblem.java |   4 +-
 .../NoScopesInABCCompilationUnitProblem.java       |   2 +-
 .../NoSourceForClassInNamespaceProblem.java        |   2 +-
 .../compiler/problems/NoSourceForClassProblem.java |   2 +-
 .../problems/NonConstConfigVarProblem.java         |   4 +-
 .../problems/NonConstantConfigInitProblem.java     |   4 +-
 .../NonConstantParamInitializerProblem.java        |   4 +-
 .../problems/NonDirectoryInSourcePathProblem.java  |   4 +-
 .../NullUsedWhereOtherExpectedProblem.java         |   4 +-
 .../OnlyOneHostComponentAllowedProblem.java        |   4 +-
 .../problems/OperandStackUnderflowProblem.java     |  10 +-
 .../problems/OverlappingSourcePathProblem.java     |   6 +-
 .../compiler/problems/OverrideFinalProblem.java    |   4 +-
 .../compiler/problems/OverrideNotFoundProblem.java |   4 +-
 .../problems/OverrideOutsideClassProblem.java      |   4 +-
 .../PackageCannotBeUsedAsValueProblem.java         |   4 +-
 .../royale/compiler/problems/ParserProblem.java    |   6 +-
 .../problems/PropertyIsWriteOnlyProblem.java       |   4 +-
 .../problems/PrototypeInvalidAttributeProblem.java |   4 +-
 .../RemovedConfigurationOptionProblem.java         |   4 +-
 .../RequiredParameterAfterOptionalProblem.java     |   4 +-
 .../ResourceBundleMalformedEncodingProblem.java    |   4 +-
 .../ResourceBundleNoBundleParameterProblem.java    |   4 +-
 .../ResourceBundleNoKeyParameterProblem.java       |   4 +-
 .../ResourceBundleNotFoundForLocaleProblem.java    |   6 +-
 .../problems/ResourceBundleNotFoundProblem.java    |   4 +-
 .../RestParamAndArgumentsUsedTogetherProblem.java  |   4 +-
 .../problems/RestParameterMustBeLastProblem.java   |   4 +-
 .../ReturnCannotBeUsedInGlobalProblem.java         |   4 +-
 .../ReturnCannotBeUsedInPackageProblem.java        |   4 +-
 .../ReturnCannotBeUsedInStaticProblem.java         |   4 +-
 .../problems/ReturnMustReturnValueProblem.java     |   4 +-
 .../ReturnValueHasNoTypeDeclarationProblem.java    |   4 +-
 .../problems/ReturnValueInConstructorProblem.java  |   4 +-
 .../ReturnValueMustBeUndefinedProblem.java         |   4 +-
 ...WFCSMTextSettingsWrongReferenceTypeProblem.java |   2 +-
 .../problems/SWFCharacterIDNotFoundProblem.java    |   4 +-
 ...neFontAlignZonesLinkToIncorrectFontProblem.java |   4 +-
 .../problems/SWFFrameCountMismatchProblem.java     |   4 +-
 .../problems/SWFInvalidSignatureProblem.java       |   2 +-
 .../problems/SWFTagLengthTooLongProblem.java       |   4 +-
 .../problems/SWFUnableToReadTagBodyProblem.java    |   4 +-
 .../problems/SWFUnexpectedEndOfFileProblem.java    |   2 +-
 .../problems/SWFUnknownFillStyleProblem.java       |   4 +-
 .../problems/ScopeStackUnderflowProblem.java       |  10 +-
 .../problems/ScopedToDefaultNamespaceProblem.java  |   4 +-
 .../royale/compiler/problems/SemanticProblem.java  |   6 +-
 .../compiler/problems/SemanticWarningProblem.java  |   6 +-
 .../problems/SetterCannotHaveOptionalProblem.java  |   4 +-
 .../SetterMustHaveOneParameterProblem.java         |   4 +-
 .../problems/ShadowedConfigNamespaceProblem.java   |   4 +-
 .../problems/SkinPartsMustBePublicProblem.java     |   4 +-
 .../problems/SourcePathNotFoundProblem.java        |   2 +-
 .../problems/StaticAndOverrideProblem.java         |   4 +-
 .../problems/StaticNamespaceDefinitionProblem.java |   4 +-
 .../problems/StaticOutsideClassProblem.java        |   4 +-
 .../compiler/problems/StrictSemanticsProblem.java  |   4 +-
 .../problems/StrictUndefinedMethodProblem.java     |   4 +-
 ...eralMustBeTerminatedBeforeLineBreakProblem.java |   6 +-
 .../problems/StringLiteralNotClosedProblem.java    |   6 +-
 .../royale/compiler/problems/SyntaxProblem.java    |   8 +-
 .../problems/ThisUsedInStaticFunctionProblem.java  |   4 +-
 .../problems/TooFewFunctionParametersProblem.java  |   4 +-
 .../problems/TooManyFunctionParametersProblem.java |   4 +-
 .../problems/UnableToBuildReportProblem.java       |   4 +-
 .../compiler/problems/UnableToBuildSWFProblem.java |   2 +-
 .../problems/UnableToBuildSWFTagProblem.java       |   2 +-
 .../problems/UnableToCreateLinkReportProblem.java  |   4 +-
 .../UnableToFindRootClassDefinitionProblem.java    |   2 +-
 .../problems/UnableToListFilesProblem.java         |   4 +-
 .../compiler/problems/UnboundMetadataProblem.java  |   6 +-
 .../problems/UndefinedConfigNameProblem.java       |   4 +-
 .../problems/UndefinedConfigNamespaceProblem.java  |   4 +-
 .../compiler/problems/UnexpectedEOFProblem.java    |   6 +-
 .../problems/UnexpectedExceptionProblem.java       |   2 +-
 .../compiler/problems/UnexpectedReturnProblem.java |   4 +-
 .../compiler/problems/UnexpectedTokenProblem.java  |   6 +-
 .../compiler/problems/UnfoundPropertyProblem.java  |   4 +-
 .../UnimplementedInterfaceMethodProblem.java       |   4 +-
 .../problems/UnknownBreakTargetProblem.java        |   4 +-
 .../problems/UnknownContinueTargetProblem.java     |   4 +-
 .../problems/UnknownGotoTargetProblem.java         |   4 +-
 .../compiler/problems/UnknownImportProblem.java    |   4 +-
 .../compiler/problems/UnknownInterfaceProblem.java |   6 +-
 .../compiler/problems/UnknownNamespaceProblem.java |   4 +-
 .../problems/UnknownSuperclassProblem.java         |   6 +-
 .../compiler/problems/UnknownTypeProblem.java      |   4 +-
 .../problems/UnknownWildcardImportProblem.java     |   4 +-
 .../compiler/problems/UnreachableBlockProblem.java |   6 +-
 .../problems/UnresolvedClassReferenceProblem.java  |   4 +-
 .../problems/UnresolvedNamespaceProblem.java       |   6 +-
 .../problems/UnsupportedSourceFileProblem.java     |   2 +-
 .../compiler/problems/VarInInterfaceProblem.java   |   4 +-
 ...riableDefinitionDuplicatesParameterProblem.java |   6 +-
 .../VariableHasNoTypeDeclarationProblem.java       |   4 +-
 .../problems/VirtualOutsideClassProblem.java       |   4 +-
 .../royale/compiler/problems/VoidTypeProblem.java  |   4 +-
 .../compiler/problems/WrongSkinPartProblem.java    |   6 +-
 .../problems/XMLOpenCloseTagNotMatchProblem.java   |   4 +-
 .../problems/annotations/DefaultSeverity.java      |   4 +-
 .../annotations/ProblemClassification.java         |   4 +-
 .../collections/CompositeProblemFilter.java        |   6 +-
 .../problems/collections/FilteredIterator.java     |   6 +-
 .../royale/compiler/projects/IASCProject.java      |   2 +-
 .../royale/compiler/projects/IASProject.java       |  10 +-
 .../royale/compiler/projects/ICompilerProject.java |  32 +-
 .../royale/compiler/projects/IFlexProject.java     |  32 +-
 .../royale/compiler/projects/ProjectFactory.java   |  10 +-
 .../apache/royale/compiler/scopes/IASScope.java    |   8 +-
 .../royale/compiler/scopes/IDefinitionSet.java     |   4 +-
 .../apache/royale/compiler/scopes/IFileScope.java  |   4 +-
 .../royale/compiler/scopes/IFileScopeProvider.java |  10 +-
 .../apache/royale/compiler/targets/ISWCTarget.java |   6 +-
 .../apache/royale/compiler/targets/ISWFTarget.java |   6 +-
 .../apache/royale/compiler/targets/ITarget.java    |   8 +-
 .../compiler/targets/ITargetProgressMonitor.java   |   2 +-
 .../royale/compiler/targets/ITargetReport.java     |   6 +-
 .../royale/compiler/targets/ITargetSettings.java   |   8 +-
 .../compiler/targets/TargetSettingsProxy.java      |   6 +-
 .../org/apache/royale/compiler/tree/ASTNodeID.java |   2 +-
 .../apache/royale/compiler/tree/as/IASNode.java    |   8 +-
 .../royale/compiler/tree/as/IAccessorNode.java     |   2 +-
 .../compiler/tree/as/IBinaryOperatorNode.java      |   2 +-
 .../apache/royale/compiler/tree/as/IBlockNode.java |   2 +-
 .../apache/royale/compiler/tree/as/ICatchNode.java |   2 +-
 .../apache/royale/compiler/tree/as/IClassNode.java |   4 +-
 .../royale/compiler/tree/as/ICommonClassNode.java  |   8 +-
 .../compiler/tree/as/ICompoundAssignmentNode.java  |   6 +-
 .../royale/compiler/tree/as/IConditionalNode.java  |   2 +-
 .../royale/compiler/tree/as/IContainerNode.java    |   2 +-
 .../compiler/tree/as/IDefaultXMLNamespaceNode.java |   2 +-
 .../royale/compiler/tree/as/IDefinitionNode.java   |  10 +-
 .../tree/as/IDocumentableDefinitionNode.java       |   4 +-
 .../compiler/tree/as/IDynamicAccessNode.java       |   2 +-
 .../apache/royale/compiler/tree/as/IEmbedNode.java |   4 +-
 .../royale/compiler/tree/as/IExpressionNode.java   |   8 +-
 .../apache/royale/compiler/tree/as/IFileNode.java  |  12 +-
 .../compiler/tree/as/IFileNodeAccumulator.java     |   6 +-
 .../royale/compiler/tree/as/IForLoopNode.java      |   2 +-
 .../royale/compiler/tree/as/IFunctionCallNode.java |  10 +-
 .../royale/compiler/tree/as/IFunctionNode.java     |   6 +-
 .../compiler/tree/as/IFunctionObjectNode.java      |   4 +-
 .../royale/compiler/tree/as/IGetterNode.java       |   2 +-
 .../royale/compiler/tree/as/IIdentifierNode.java   |   2 +-
 .../apache/royale/compiler/tree/as/IIfNode.java    |   2 +-
 .../royale/compiler/tree/as/IImportNode.java       |   8 +-
 .../royale/compiler/tree/as/IInterfaceNode.java    |   4 +-
 .../compiler/tree/as/IIterationFlowNode.java       |   2 +-
 .../royale/compiler/tree/as/IKeywordNode.java      |   2 +-
 .../compiler/tree/as/ILabeledStatementNode.java    |   4 +-
 .../compiler/tree/as/ILanguageIdentifierNode.java  |   4 +-
 .../compiler/tree/as/ILiteralContainerNode.java    |   6 +-
 .../royale/compiler/tree/as/ILiteralNode.java      |   4 +-
 .../tree/as/IMemberAccessExpressionNode.java       |   2 +-
 .../royale/compiler/tree/as/IModifierNode.java     |   4 +-
 .../tree/as/INamespaceAccessExpressionNode.java    |   2 +-
 .../compiler/tree/as/INamespaceDecorationNode.java |   4 +-
 .../royale/compiler/tree/as/INamespaceNode.java    |   4 +-
 .../tree/as/INonResolvingIdentifierNode.java       |   2 +-
 .../compiler/tree/as/INumericLiteralNode.java      |   4 +-
 .../tree/as/IObjectLiteralValuePairNode.java       |   2 +-
 .../royale/compiler/tree/as/IOperatorNode.java     |   4 +-
 .../royale/compiler/tree/as/IPackageNode.java      |   2 +-
 .../royale/compiler/tree/as/IParameterNode.java    |   2 +-
 .../compiler/tree/as/IRegExpLiteralNode.java       |   2 +-
 .../royale/compiler/tree/as/IReturnNode.java       |   2 +-
 .../compiler/tree/as/IScopedDefinitionNode.java    |   2 +-
 .../royale/compiler/tree/as/IScopedNode.java       |   4 +-
 .../royale/compiler/tree/as/ISetterNode.java       |   2 +-
 .../royale/compiler/tree/as/IStatementNode.java    |   2 +-
 .../royale/compiler/tree/as/ISwitchNode.java       |   2 +-
 .../royale/compiler/tree/as/ITerminalNode.java     |   2 +-
 .../compiler/tree/as/ITernaryOperatorNode.java     |   2 +-
 .../apache/royale/compiler/tree/as/IThrowNode.java |   2 +-
 .../tree/as/ITransparentContainerNode.java         |   2 +-
 .../apache/royale/compiler/tree/as/ITryNode.java   |   2 +-
 .../apache/royale/compiler/tree/as/ITypeNode.java  |   2 +-
 .../royale/compiler/tree/as/ITypedClassNode.java   |   8 +-
 .../compiler/tree/as/ITypedExpressionNode.java     |   2 +-
 .../apache/royale/compiler/tree/as/ITypedNode.java |   2 +-
 .../compiler/tree/as/IUnaryOperatorNode.java       |   2 +-
 .../royale/compiler/tree/as/IUseNamespaceNode.java |   2 +-
 .../compiler/tree/as/IVariableExpressionNode.java  |   2 +-
 .../royale/compiler/tree/as/IVariableNode.java     |   4 +-
 .../royale/compiler/tree/as/IWhileLoopNode.java    |   2 +-
 .../apache/royale/compiler/tree/as/IWithNode.java  |   2 +-
 .../tree/as/decorators/IVariableTypeDecorator.java |   4 +-
 .../as/decorators/SymbolDecoratorProvider.java     |   6 +-
 .../tree/metadata/IAccessibilityTagNode.java       |   2 +-
 .../tree/metadata/IDefaultPropertyTagNode.java     |   8 +-
 .../compiler/tree/metadata/IEffectTagNode.java     |   6 +-
 .../compiler/tree/metadata/IEventTagNode.java      |   6 +-
 .../tree/metadata/IEventTriggerTagNode.java        |   2 +-
 .../tree/metadata/IInspectableTagNode.java         |   2 +-
 .../compiler/tree/metadata/IMetaTagNode.java       |   8 +-
 .../compiler/tree/metadata/IMetaTagsNode.java      |   4 +-
 .../tree/metadata/IMultiValueMetaTagNode.java      |   2 +-
 .../tree/metadata/IResourceBundleTagNode.java      |   2 +-
 .../compiler/tree/metadata/IStyleTagNode.java      |   6 +-
 .../compiler/tree/metadata/ITypedTagNode.java      |   2 +-
 .../compiler/tree/mxml/IMXMLApplicationNode.java   |   2 +-
 .../royale/compiler/tree/mxml/IMXMLArrayNode.java  |   2 +-
 .../tree/mxml/IMXMLBindingAttributeNode.java       |   4 +-
 .../compiler/tree/mxml/IMXMLBindingNode.java       |   2 +-
 .../compiler/tree/mxml/IMXMLBooleanNode.java       |   6 +-
 .../tree/mxml/IMXMLClassDefinitionNode.java        |  10 +-
 .../royale/compiler/tree/mxml/IMXMLClassNode.java  |  10 +-
 .../tree/mxml/IMXMLClassReferenceNode.java         |   6 +-
 .../royale/compiler/tree/mxml/IMXMLClearNode.java  |   2 +-
 .../tree/mxml/IMXMLCompilerDirectiveNodeBase.java  |   4 +-
 .../compiler/tree/mxml/IMXMLComponentNode.java     |   4 +-
 .../mxml/IMXMLConcatenatedDataBindingNode.java     |   4 +-
 .../compiler/tree/mxml/IMXMLDataBindingNode.java   |   2 +-
 .../tree/mxml/IMXMLDataBindingNodeContainer.java   |   2 +-
 .../compiler/tree/mxml/IMXMLDeclarationsNode.java  |   2 +-
 .../tree/mxml/IMXMLDeferredInstanceNode.java       |   2 +-
 .../compiler/tree/mxml/IMXMLDefinitionNode.java    |   4 +-
 .../compiler/tree/mxml/IMXMLDesignLayerNode.java   |   2 +-
 .../compiler/tree/mxml/IMXMLDocumentNode.java      |   2 +-
 .../tree/mxml/IMXMLEffectSpecifierNode.java        |   2 +-
 .../royale/compiler/tree/mxml/IMXMLEmbedNode.java  |   2 +-
 .../tree/mxml/IMXMLEventSpecifierNode.java         |   8 +-
 .../compiler/tree/mxml/IMXMLExpressionNode.java    |   8 +-
 .../compiler/tree/mxml/IMXMLFactoryNode.java       |   2 +-
 .../royale/compiler/tree/mxml/IMXMLFileNode.java   |  10 +-
 .../compiler/tree/mxml/IMXMLFunctionNode.java      |   6 +-
 .../compiler/tree/mxml/IMXMLHTTPServiceNode.java   |   2 +-
 .../mxml/IMXMLHTTPServiceRequestPropertyNode.java  |   2 +-
 .../compiler/tree/mxml/IMXMLImplementsNode.java    |   4 +-
 .../compiler/tree/mxml/IMXMLInstanceNode.java      |   4 +-
 .../royale/compiler/tree/mxml/IMXMLIntNode.java    |   6 +-
 .../compiler/tree/mxml/IMXMLLibraryNode.java       |   2 +-
 .../compiler/tree/mxml/IMXMLLiteralNode.java       |   2 +-
 .../compiler/tree/mxml/IMXMLMetadataNode.java      |   4 +-
 .../royale/compiler/tree/mxml/IMXMLModelNode.java  |   2 +-
 .../tree/mxml/IMXMLModelPropertyContainerNode.java |   2 +-
 .../compiler/tree/mxml/IMXMLModelPropertyNode.java |   2 +-
 .../compiler/tree/mxml/IMXMLModelRootNode.java     |   2 +-
 .../royale/compiler/tree/mxml/IMXMLNode.java       |   4 +-
 .../royale/compiler/tree/mxml/IMXMLNumberNode.java |   6 +-
 .../royale/compiler/tree/mxml/IMXMLObjectNode.java |   2 +-
 .../compiler/tree/mxml/IMXMLPrivateNode.java       |   2 +-
 .../tree/mxml/IMXMLPropertySpecifierNode.java      |   6 +-
 .../royale/compiler/tree/mxml/IMXMLRegExpNode.java |   2 +-
 .../tree/mxml/IMXMLRemoteObjectMethodNode.java     |   2 +-
 .../compiler/tree/mxml/IMXMLRemoteObjectNode.java  |   2 +-
 .../compiler/tree/mxml/IMXMLReparentNode.java      |   2 +-
 .../compiler/tree/mxml/IMXMLRepeaterNode.java      |   2 +-
 .../compiler/tree/mxml/IMXMLResourceNode.java      |   4 +-
 .../royale/compiler/tree/mxml/IMXMLScriptNode.java |  10 +-
 .../tree/mxml/IMXMLSingleDataBindingNode.java      |   4 +-
 .../compiler/tree/mxml/IMXMLSpecifierNode.java     |   4 +-
 .../royale/compiler/tree/mxml/IMXMLStateNode.java  |   4 +-
 .../royale/compiler/tree/mxml/IMXMLStringNode.java |   6 +-
 .../royale/compiler/tree/mxml/IMXMLStyleNode.java  |   6 +-
 .../tree/mxml/IMXMLStyleSpecifierNode.java         |   2 +-
 .../royale/compiler/tree/mxml/IMXMLUintNode.java   |   6 +-
 .../royale/compiler/tree/mxml/IMXMLVectorNode.java |   4 +-
 .../compiler/tree/mxml/IMXMLWebServiceNode.java    |   2 +-
 .../tree/mxml/IMXMLWebServiceOperationNode.java    |   2 +-
 .../compiler/tree/mxml/IMXMLXMLListNode.java       |   4 +-
 .../royale/compiler/tree/mxml/IMXMLXMLNode.java    |   4 +-
 .../compiler/tree/mxml/IOldMXMLFileNode.java       |   8 +-
 .../tree/properties/IResourceBundleEntryNode.java  |   8 +-
 .../tree/properties/IResourceBundleFileNode.java   |   4 +-
 .../royale/compiler/units/ICompilationUnit.java    |  28 +-
 .../compiler/units/IInvisibleCompilationUnit.java  |   8 +-
 .../units/requests/IABCBytesRequestResult.java     |   8 +-
 .../units/requests/IFileScopeRequestResult.java    |   8 +-
 .../IOutgoingDependenciesRequestResult.java        |   6 +-
 .../royale/compiler/units/requests/IRequest.java   |   4 +-
 .../compiler/units/requests/IRequestResult.java    |   6 +-
 .../units/requests/ISWFTagsRequestResult.java      |   8 +-
 .../units/requests/ISyntaxTreeRequestResult.java   |   6 +-
 .../compiler/workspaces/IIndexingReader.java       |   4 +-
 .../compiler/workspaces/IInvalidationListener.java |   6 +-
 .../royale/compiler/workspaces/IWorkspace.java     |  18 +-
 .../workspaces/IWorkspaceProfilingDelegate.java    |   4 +-
 .../src/main/java/org/apache/royale/swc/ISWC.java  |   6 +-
 .../java/org/apache/royale/swc/ISWCComponent.java  |   2 +-
 .../java/org/apache/royale/swc/ISWCDigest.java     |   2 +-
 .../java/org/apache/royale/swc/ISWCFileEntry.java  |   2 +-
 .../java/org/apache/royale/swc/ISWCLibrary.java    |   6 +-
 .../java/org/apache/royale/swc/ISWCManager.java    |  10 +-
 .../java/org/apache/royale/swc/ISWCScript.java     |   4 +-
 .../java/org/apache/royale/swc/ISWCVersion.java    |   2 +-
 .../src/main/java/org/apache/royale/swc/SWC.java   |   6 +-
 .../java/org/apache/royale/swc/SWCComponent.java   |   2 +-
 .../java/org/apache/royale/swc/SWCDepends.java     |  68 ++--
 .../main/java/org/apache/royale/swc/SWCDigest.java |   2 +-
 .../java/org/apache/royale/swc/SWCLibrary.java     |   8 +-
 .../java/org/apache/royale/swc/SWCManager.java     |  18 +-
 .../main/java/org/apache/royale/swc/SWCScript.java |   4 +-
 .../java/org/apache/royale/swc/SWCVersion.java     |   2 +-
 .../royale/swc/catalog/ICatalogXMLConstants.java   |   2 +-
 .../apache/royale/swc/catalog/SWCFileEntry.java    |   6 +-
 .../royale/swc/catalog/StAXCatalogReader.java      |  26 +-
 .../royale/swc/catalog/StAXCatalogWriter.java      |  18 +-
 .../apache/royale/swc/catalog/XMLFormatter.java    |   2 +-
 .../org/apache/royale/swc/dita/IDITAEntry.java     |   6 +-
 .../java/org/apache/royale/swc/dita/IDITAList.java |   6 +-
 .../java/org/apache/royale/swc/io/ISWCReader.java  |   4 +-
 .../java/org/apache/royale/swc/io/ISWCWriter.java  |   4 +-
 .../apache/royale/swc/io/SWCDirectoryWriter.java   |  16 +-
 .../java/org/apache/royale/swc/io/SWCReader.java   |  18 +-
 .../java/org/apache/royale/swc/io/SWCWriter.java   |  16 +-
 .../org/apache/royale/swc/io/SWCWriterBase.java    |  20 +-
 .../main/java/org/apache/royale/swf/Header.java    |   4 +-
 .../src/main/java/org/apache/royale/swf/ISWF.java  |  16 +-
 .../java/org/apache/royale/swf/ISWFConstants.java  |   2 +-
 .../java/org/apache/royale/swf/ITagContainer.java  |   6 +-
 .../src/main/java/org/apache/royale/swf/SWF.java   |  10 +-
 .../main/java/org/apache/royale/swf/SWFFrame.java  |  20 +-
 .../main/java/org/apache/royale/swf/TagType.java   |   2 +-
 .../apache/royale/swf/builders/IShapeIterator.java |   2 +-
 .../apache/royale/swf/builders/ITagBuilder.java    |   4 +-
 .../apache/royale/swf/builders/ShapeBuilder.java   |  26 +-
 .../org/apache/royale/swf/io/IInputBitStream.java  |   2 +-
 .../org/apache/royale/swf/io/IOutputBitStream.java |   2 +-
 .../java/org/apache/royale/swf/io/ISWFReader.java  |   4 +-
 .../java/org/apache/royale/swf/io/ISWFWriter.java  |   4 +-
 .../apache/royale/swf/io/ISWFWriterFactory.java    |   8 +-
 .../org/apache/royale/swf/io/InputBitStream.java   |   6 +-
 .../org/apache/royale/swf/io/LZMACompressor.java   |   4 +-
 .../org/apache/royale/swf/io/LZMAInputStream.java  |   4 +-
 .../org/apache/royale/swf/io/OutputBitStream.java  |   4 +-
 .../java/org/apache/royale/swf/io/SWFDump.java     |  98 +++---
 .../java/org/apache/royale/swf/io/SWFReader.java   | 132 +++----
 .../java/org/apache/royale/swf/io/SWFWriter.java   | 108 +++---
 .../java/org/apache/royale/swf/io/SizeReport.java  |   2 +-
 .../royale/swf/io/SizeReportWritingSWFWriter.java  |  36 +-
 .../apache/royale/swf/tags/CSMTextSettingsTag.java |   4 +-
 .../royale/swf/tags/CharacterIterableFactory.java  |   2 +-
 .../org/apache/royale/swf/tags/CharacterTag.java   |   4 +-
 .../royale/swf/tags/DefineBinaryDataTag.java       |   4 +-
 .../apache/royale/swf/tags/DefineBitsJPEG2Tag.java |   4 +-
 .../apache/royale/swf/tags/DefineBitsJPEG3Tag.java |   4 +-
 .../royale/swf/tags/DefineBitsLossless2Tag.java    |   6 +-
 .../royale/swf/tags/DefineBitsLosslessTag.java     |   4 +-
 .../org/apache/royale/swf/tags/DefineBitsTag.java  |   4 +-
 .../apache/royale/swf/tags/DefineButton2Tag.java   |   4 +-
 .../royale/swf/tags/DefineButtonCxformTag.java     |   6 +-
 .../royale/swf/tags/DefineButtonSoundTag.java      |   6 +-
 .../apache/royale/swf/tags/DefineButtonTag.java    |   6 +-
 .../apache/royale/swf/tags/DefineEditTextTag.java  |   8 +-
 .../org/apache/royale/swf/tags/DefineFont2Tag.java |   8 +-
 .../org/apache/royale/swf/tags/DefineFont3Tag.java |   4 +-
 .../org/apache/royale/swf/tags/DefineFont4Tag.java |   4 +-
 .../royale/swf/tags/DefineFontAlignZonesTag.java   |   6 +-
 .../apache/royale/swf/tags/DefineFontInfo2Tag.java |   4 +-
 .../apache/royale/swf/tags/DefineFontInfoTag.java  |   4 +-
 .../apache/royale/swf/tags/DefineFontNameTag.java  |   4 +-
 .../org/apache/royale/swf/tags/DefineFontTag.java  |   6 +-
 .../royale/swf/tags/DefineMorphShape2Tag.java      |   6 +-
 .../royale/swf/tags/DefineMorphShapeTag.java       |   8 +-
 .../royale/swf/tags/DefineScalingGridTag.java      |   6 +-
 .../swf/tags/DefineSceneAndFrameLabelDataTag.java  |   4 +-
 .../apache/royale/swf/tags/DefineShape2Tag.java    |   4 +-
 .../apache/royale/swf/tags/DefineShape3Tag.java    |   4 +-
 .../apache/royale/swf/tags/DefineShape4Tag.java    |   6 +-
 .../org/apache/royale/swf/tags/DefineShapeTag.java |   8 +-
 .../org/apache/royale/swf/tags/DefineSoundTag.java |   4 +-
 .../apache/royale/swf/tags/DefineSpriteTag.java    |   4 +-
 .../org/apache/royale/swf/tags/DefineText2Tag.java |   4 +-
 .../org/apache/royale/swf/tags/DefineTextTag.java  |  10 +-
 .../royale/swf/tags/DefineVideoStreamTag.java      |   4 +-
 .../java/org/apache/royale/swf/tags/DoABCTag.java  |   4 +-
 .../apache/royale/swf/tags/EnableDebugger2Tag.java |   4 +-
 .../apache/royale/swf/tags/EnableTelemetryTag.java |   4 +-
 .../java/org/apache/royale/swf/tags/EndTag.java    |   4 +-
 .../apache/royale/swf/tags/ExportAssetsTag.java    |   4 +-
 .../apache/royale/swf/tags/FileAttributesTag.java  |   4 +-
 .../org/apache/royale/swf/tags/FrameLabelTag.java  |   4 +-
 .../org/apache/royale/swf/tags/IAlwaysLongTag.java |   2 +-
 .../apache/royale/swf/tags/ICharacterReferrer.java |   2 +-
 .../org/apache/royale/swf/tags/ICharacterTag.java  |   2 +-
 .../royale/swf/tags/IDefineBinaryImageTag.java     |   4 +-
 .../org/apache/royale/swf/tags/IDefineFontTag.java |   2 +-
 .../java/org/apache/royale/swf/tags/IFontInfo.java |   2 +-
 .../org/apache/royale/swf/tags/IManagedTag.java    |   4 +-
 .../main/java/org/apache/royale/swf/tags/ITag.java |   4 +-
 .../org/apache/royale/swf/tags/JPEGTablesTag.java  |   4 +-
 .../org/apache/royale/swf/tags/MetadataTag.java    |   4 +-
 .../apache/royale/swf/tags/PlaceObject2Tag.java    |   8 +-
 .../apache/royale/swf/tags/PlaceObject3Tag.java    |   6 +-
 .../org/apache/royale/swf/tags/PlaceObjectTag.java |   8 +-
 .../org/apache/royale/swf/tags/ProductInfoTag.java |   4 +-
 .../java/org/apache/royale/swf/tags/RawTag.java    |   4 +-
 .../apache/royale/swf/tags/RemoveObject2Tag.java   |   4 +-
 .../apache/royale/swf/tags/RemoveObjectTag.java    |   4 +-
 .../apache/royale/swf/tags/ScriptLimitsTag.java    |   4 +-
 .../royale/swf/tags/SetBackgroundColorTag.java     |   6 +-
 .../org/apache/royale/swf/tags/SetTabIndexTag.java |   4 +-
 .../org/apache/royale/swf/tags/ShowFrameTag.java   |   4 +-
 .../royale/swf/tags/SoundStreamBlockTag.java       |   4 +-
 .../royale/swf/tags/SoundStreamHead2Tag.java       |   4 +-
 .../apache/royale/swf/tags/SoundStreamHeadTag.java |   4 +-
 .../org/apache/royale/swf/tags/StartSound2Tag.java |   6 +-
 .../org/apache/royale/swf/tags/StartSoundTag.java  |   6 +-
 .../org/apache/royale/swf/tags/SymbolClassTag.java |   4 +-
 .../main/java/org/apache/royale/swf/tags/Tag.java  |   4 +-
 .../org/apache/royale/swf/tags/VideoFrameTag.java  |   4 +-
 .../java/org/apache/royale/swf/types/ARGB.java     |   2 +-
 .../org/apache/royale/swf/types/BevelFilter.java   |   2 +-
 .../org/apache/royale/swf/types/BlurFilter.java    |   2 +-
 .../org/apache/royale/swf/types/ButtonRecord.java  |   2 +-
 .../java/org/apache/royale/swf/types/CXForm.java   |   2 +-
 .../apache/royale/swf/types/CXFormWithAlpha.java   |   2 +-
 .../org/apache/royale/swf/types/ClipActions.java   |   2 +-
 .../apache/royale/swf/types/ConvolutionFilter.java |   2 +-
 .../apache/royale/swf/types/CurvedEdgeRecord.java  |   4 +-
 .../apache/royale/swf/types/DropShadowFilter.java  |   2 +-
 .../org/apache/royale/swf/types/EdgeRecord.java    |   2 +-
 .../apache/royale/swf/types/EndShapeRecord.java    |   2 +-
 .../org/apache/royale/swf/types/FillStyle.java     |   8 +-
 .../apache/royale/swf/types/FillStyleArray.java    |   8 +-
 .../java/org/apache/royale/swf/types/Filter.java   |   2 +-
 .../org/apache/royale/swf/types/FocalGradient.java |   4 +-
 .../org/apache/royale/swf/types/GlowFilter.java    |   2 +-
 .../org/apache/royale/swf/types/GlyphEntry.java    |   2 +-
 .../org/apache/royale/swf/types/GradRecord.java    |   2 +-
 .../java/org/apache/royale/swf/types/Gradient.java |   2 +-
 .../royale/swf/types/GradientBevelFilter.java      |   2 +-
 .../royale/swf/types/GradientGlowFilter.java       |   2 +-
 .../org/apache/royale/swf/types/IDataType.java     |   2 +-
 .../org/apache/royale/swf/types/IFillStyle.java    |   4 +-
 .../org/apache/royale/swf/types/ILineStyle.java    |   2 +-
 .../org/apache/royale/swf/types/KerningRecord.java |   2 +-
 .../org/apache/royale/swf/types/LineStyle.java     |   2 +-
 .../org/apache/royale/swf/types/LineStyle2.java    |   4 +-
 .../apache/royale/swf/types/LineStyleArray.java    |   2 +-
 .../java/org/apache/royale/swf/types/Matrix.java   |   2 +-
 .../apache/royale/swf/types/MorphFillStyle.java    |   6 +-
 .../apache/royale/swf/types/MorphGradRecord.java   |   2 +-
 .../org/apache/royale/swf/types/MorphGradient.java |   2 +-
 .../apache/royale/swf/types/MorphLineStyle.java    |   2 +-
 .../apache/royale/swf/types/MorphLineStyle2.java   |   6 +-
 .../main/java/org/apache/royale/swf/types/RGB.java |   2 +-
 .../java/org/apache/royale/swf/types/RGBA.java     |   2 +-
 .../java/org/apache/royale/swf/types/Rect.java     |   2 +-
 .../java/org/apache/royale/swf/types/Shape.java    |   8 +-
 .../org/apache/royale/swf/types/ShapeRecord.java   |   2 +-
 .../apache/royale/swf/types/ShapeWithStyle.java    |   6 +-
 .../org/apache/royale/swf/types/SoundEnvelope.java |   2 +-
 .../org/apache/royale/swf/types/SoundInfo.java     |   2 +-
 .../royale/swf/types/StraightEdgeRecord.java       |   4 +-
 .../apache/royale/swf/types/StyleChangeRecord.java |   8 +-
 .../java/org/apache/royale/swf/types/Styles.java   |   8 +-
 .../org/apache/royale/swf/types/TextRecord.java    |   8 +-
 .../java/org/apache/royale/swf/types/ZoneData.java |   2 +-
 .../org/apache/royale/swf/types/ZoneRecord.java    |   4 +-
 .../java/org/apache/royale/utils/ArgumentUtil.java |   2 +-
 .../main/java/org/apache/royale/utils/Base64.java  |   2 +-
 .../java/org/apache/royale/utils/CheapArray.java   |   2 +-
 .../royale/utils/DAByteArrayOutputStream.java      |   2 +-
 .../java/org/apache/royale/utils/DirectoryID.java  |   2 +-
 .../org/apache/royale/utils/ExceptionUtil.java     |   2 +-
 .../java/org/apache/royale/utils/FastStack.java    |   2 +-
 .../main/java/org/apache/royale/utils/FileID.java  |   2 +-
 .../java/org/apache/royale/utils/FileUtils.java    |   2 +-
 .../apache/royale/utils/FilenameNormalization.java |   2 +-
 .../apache/royale/utils/ILengthAwareReader.java    |   2 +-
 .../main/java/org/apache/royale/utils/IntMap.java  |   2 +-
 .../org/apache/royale/utils/IntMapLRUCache.java    |   2 +-
 .../main/java/org/apache/royale/utils/JSXUtil.java |  24 +-
 .../royale/utils/NonLockingStringReader.java       |   2 +-
 .../main/java/org/apache/royale/utils/Point.java   |   2 +-
 .../org/apache/royale/utils/StringEncoder.java     |   2 +-
 .../java/org/apache/royale/utils/StringUtils.java  |   2 +-
 .../main/java/org/apache/royale/utils/Trace.java   |   2 +-
 .../main/java/org/apache/royale/utils/Version.java |   2 +-
 compiler/src/test/java/as/ASFeatureTestsBase.java  |   6 +-
 compiler/src/test/java/f/SDKSWCTests.java          |  24 +-
 .../java/mxml/tags/MXMLDefinitionTagTests.java     |   2 +-
 .../test/java/mxml/tags/MXMLFeatureTestsBase.java  |   6 +-
 .../java/mxml/tags/MXMLInstanceTagTestsBase.java   |   2 +-
 .../test/java/mxml/tags/MXMLMetadataTagTests.java  |   2 +-
 .../internal/css/CSSArrayPropertyValueTests.java   |   4 +-
 .../royale/compiler/internal/css/CSSBaseTests.java |  18 +-
 .../internal/css/CSSColorPropertyValueTests.java   |   4 +-
 .../compiler/internal/css/CSSCombinatorTests.java  |  10 +-
 .../compiler/internal/css/CSSDocumentTests.java    |   4 +-
 .../compiler/internal/css/CSSFontFaceTests.java    |   6 +-
 .../css/CSSFunctionCallPropertyValueTests.java     |   4 +-
 .../internal/css/CSSKeywordPropertyValueTests.java |   4 +-
 .../internal/css/CSSMediaQueryConditionTests.java  |  10 +-
 .../internal/css/CSSNamespaceDefinitionTests.java  |   4 +-
 .../internal/css/CSSNumberPropertyValueTests.java  |   4 +-
 .../compiler/internal/css/CSSPropertyTests.java    |   6 +-
 .../internal/css/CSSPropertyValueTests.java        |   8 +-
 .../css/CSSRgbColorPropertyValueTests.java         |   4 +-
 .../royale/compiler/internal/css/CSSRuleTests.java |   4 +-
 .../internal/css/CSSSelectorConditionTests.java    |  10 +-
 .../compiler/internal/css/CSSSelectorTests.java    |   8 +-
 .../internal/css/CSSStringPropertyValueTests.java  |   4 +-
 .../compiler/internal/mxml/MXMLDataTests.java      |  18 +-
 .../internal/mxml/MXMLInstructionDataTests.java    |   6 +-
 .../compiler/internal/mxml/MXMLTextDataTests.java  |   6 +-
 .../compiler/internal/mxml/MXMLUnitDataTests.java  |   6 +-
 .../internal/parsing/mxml/MXMLTokenizerTests.java  |   4 +-
 .../internal/tree/mxml/MXMLArrayNodeTests.java     |  14 +-
 .../internal/tree/mxml/MXMLBindingNodeTests.java   |  10 +-
 .../internal/tree/mxml/MXMLBooleanNodeTests.java   |  10 +-
 .../internal/tree/mxml/MXMLClassNodeTests.java     |  10 +-
 .../tree/mxml/MXMLClassReferenceNodeTests.java     |   2 +-
 .../internal/tree/mxml/MXMLComponentNodeTests.java |  14 +-
 .../tree/mxml/MXMLDeclarationsNodeTests.java       |   8 +-
 .../tree/mxml/MXMLDefinitionNodeTests.java         |  14 +-
 .../tree/mxml/MXMLDesignLayerNodeTests.java        |  10 +-
 .../tree/mxml/MXMLEventSpecifierNodeTests.java     |  14 +-
 .../tree/mxml/MXMLExpressionNodeBaseTests.java     |   6 +-
 .../internal/tree/mxml/MXMLFunctionNodeTests.java  |  12 +-
 .../tree/mxml/MXMLHTTPServiceNodeTests.java        |  12 +-
 .../tree/mxml/MXMLImplementsNodeTests.java         |  12 +-
 .../internal/tree/mxml/MXMLInstanceNodeTests.java  |   4 +-
 .../internal/tree/mxml/MXMLIntNodeTests.java       |  10 +-
 .../internal/tree/mxml/MXMLLibraryNodeTests.java   |   8 +-
 .../internal/tree/mxml/MXMLMetadataNodeTests.java  |  12 +-
 .../internal/tree/mxml/MXMLModelNodeTests.java     |  12 +-
 .../internal/tree/mxml/MXMLNodeBaseTests.java      |  26 +-
 .../internal/tree/mxml/MXMLNumberNodeTests.java    |   8 +-
 .../internal/tree/mxml/MXMLObjectNodeTests.java    |  12 +-
 .../internal/tree/mxml/MXMLPrivateNodeTests.java   |   8 +-
 .../MXMLPropertySpecifierNodeBooleanTests.java     |   8 +-
 .../mxml/MXMLPropertySpecifierNodeClassTests.java  |   8 +-
 .../mxml/MXMLPropertySpecifierNodeIntTests.java    |   8 +-
 .../mxml/MXMLPropertySpecifierNodeNumberTests.java |   8 +-
 .../mxml/MXMLPropertySpecifierNodeStringTests.java |   8 +-
 .../tree/mxml/MXMLPropertySpecifierNodeTests.java  |  10 +-
 .../mxml/MXMLPropertySpecifierNodeUintTests.java   |   8 +-
 .../internal/tree/mxml/MXMLRegExpNodeTests.java    |  10 +-
 .../tree/mxml/MXMLRemoteObjectNodeTests.java       |  12 +-
 .../internal/tree/mxml/MXMLResourceNodeTests.java  |  10 +-
 .../internal/tree/mxml/MXMLScriptNodeTests.java    |   8 +-
 .../tree/mxml/MXMLSpecifierNodeBaseTests.java      |   2 +-
 .../internal/tree/mxml/MXMLStateNodeTests.java     |  10 +-
 .../internal/tree/mxml/MXMLStringNodeTests.java    |   8 +-
 .../internal/tree/mxml/MXMLStyleNodeTests.java     |  16 +-
 .../internal/tree/mxml/MXMLUintNodeTests.java      |  10 +-
 .../internal/tree/mxml/MXMLVectorNodeTests.java    |  16 +-
 .../tree/mxml/MXMLWebServiceNodeTests.java         |  12 +-
 .../internal/tree/mxml/MXMLXMLListNodeTests.java   |   8 +-
 .../internal/tree/mxml/MXMLXMLNodeTests.java       |   8 +-
 .../java/properties/MXMLPropertyTestsBase.java     |   2 +-
 debugger/build.xml                                 |   2 +-
 debugger/pom.xml                                   |  10 +-
 .../debugger/expression/AS3DebuggerReducer.java    |  32 +-
 .../tools/debugger/expression/ASTBuilder.java      |   4 +-
 .../debugger/expression/DebuggerExpression.java    |  18 +-
 .../expression/DebuggerExpressionEvaluator.java    |   8 +-
 .../tools/debugger/expression/DebuggerUtil.java    |  22 +-
 .../debugger/expression/FoldedExpressionNode.java  |  12 +-
 .../tools/debugger/expression/IASTFolder.java      |   2 +-
 .../debugger/expression/IExpressionEvaluator.java  |   2 +-
 .../expression/LogicalOperatorsFolder.java         |  14 +-
 flex-compiler-oem/pom.xml                          |   8 +-
 .../src/main/java/flex2/tools/CompJSC.java         |   6 +-
 .../src/main/java/flex2/tools/Compc.java           |   2 +-
 .../src/main/java/flex2/tools/MxmlJSC.java         |  10 +-
 .../src/main/java/flex2/tools/Mxmlc.java           |   2 +-
 .../src/main/java/flex2/tools/Tool.java            |  30 +-
 .../src/main/java/flex2/tools/oem/Application.java |  18 +-
 .../src/main/java/flex2/tools/oem/Library.java     |  12 +-
 .../java/flex2/tools/oem/internal/OEMUtil.java     |   8 +-
 flexjs-ant-tasks/pom.xml                           |   2 +-
 .../org/apache/royale/compiler/ant/COMPCTask.java  |  34 +-
 .../org/apache/royale/compiler/ant/FlexTask.java   |  10 +-
 .../org/apache/royale/compiler/ant/MXMLCTask.java  |  34 +-
 .../compiler/ant/config/BaseConfigVariable.java    |   2 +-
 .../compiler/ant/config/ConfigAppendString.java    |   2 +-
 .../royale/compiler/ant/config/ConfigBoolean.java  |   2 +-
 .../royale/compiler/ant/config/ConfigInt.java      |   2 +-
 .../royale/compiler/ant/config/ConfigString.java   |   2 +-
 .../royale/compiler/ant/config/ConfigVariable.java |   2 +-
 .../royale/compiler/ant/config/IOptionSource.java  |   2 +-
 .../ant/config/NestedAttributeElement.java         |   4 +-
 .../royale/compiler/ant/config/OptionSpec.java     |   2 +-
 .../ant/config/RepeatableConfigString.java         |   2 +-
 .../ant/config/RepeatableConfigVariable.java       |   2 +-
 .../compiler/ant/types/DefaultScriptLimits.java    |   6 +-
 .../royale/compiler/ant/types/DefaultSize.java     |   6 +-
 .../royale/compiler/ant/types/FlexFileSet.java     |   6 +-
 .../royale/compiler/ant/types/FlexSWCFileSet.java  |   4 +-
 .../apache/royale/compiler/ant/types/Fonts.java    |  16 +-
 .../apache/royale/compiler/ant/types/Metadata.java |  12 +-
 .../ant/types/RuntimeSharedLibraryPath.java        |   6 +-
 .../royale/compiler/ant/types/URLElement.java      |   4 +-
 flexjs-maven-extension/pom.xml                     |   2 +-
 .../flexjs/extension/FlexJsLanguageSupport.java    |   2 +-
 .../maven/flexjs/extension/FlexJsScopeDeriver.java |   2 +-
 .../flexjs/extension/FlexJsScopeSelector.java      |   2 +-
 flexjs-maven-plugin/pom.xml                        |   4 +-
 .../royale/maven/flexjs/BaseCompileMojo.java       |   4 +-
 .../org/apache/royale/maven/flexjs/BaseMojo.java   |  10 +-
 .../apache/royale/maven/flexjs/ClassExclude.java   |   2 +-
 .../royale/maven/flexjs/CompileASDocMojo.java      |   4 +-
 .../apache/royale/maven/flexjs/CompileASMojo.java  |   4 +-
 .../apache/royale/maven/flexjs/CompileAppMojo.java |   4 +-
 .../apache/royale/maven/flexjs/CompileJSMojo.java  |   4 +-
 .../royale/maven/flexjs/CompileTypedefsMojo.java   |   4 +-
 .../org/apache/royale/maven/flexjs/Define.java     |   2 +-
 .../org/apache/royale/maven/flexjs/Exclude.java    |   2 +-
 .../apache/royale/maven/flexjs/ExterncConfig.java  |   2 +-
 .../apache/royale/maven/flexjs/FieldExclude.java   |   2 +-
 .../royale/maven/flexjs/GenerateExterncMojo.java   |   2 +-
 .../royale/maven/flexjs/GenerateManifestsMojo.java |   4 +-
 .../apache/royale/maven/flexjs/IncludeFile.java    |   2 +-
 .../org/apache/royale/maven/flexjs/Namespace.java  |   2 +-
 .../apache/royale/maven/flexjs/PackageJSMojo.java  |   2 +-
 .../org/apache/royale/maven/flexjs/TrustMojo.java  |   4 +-
 .../maven/flexjs/trust/DefaultTrustHandler.java    |   2 +-
 .../royale/maven/flexjs/trust/TrustHandler.java    |   2 +-
 .../royale/maven/flexjs/types/FlexScope.java       |   2 +-
 .../maven/flexjs/utils/DependencyHelper.java       |   2 +-
 .../main/resources/META-INF/plexus/components.xml  |  22 +-
 .../main/resources/config/compile-app-config.xml   |  30 +-
 .../resources/config/compile-asdoc-js-config.xml   |   4 +-
 .../resources/config/compile-asdoc-swf-config.xml  |   4 +-
 .../main/resources/config/compile-js-config.xml    |  30 +-
 .../main/resources/config/compile-swf-config.xml   |  30 +-
 pom.xml                                            |   2 +-
 2245 files changed, 15177 insertions(+), 15177 deletions(-)

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index aac946c..c1d6e9d 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -22,7 +22,7 @@
             xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
 
     <extension>
-        <groupId>org.apache.flex.utilities.converter</groupId>
+        <groupId>org.apache.royale.utilities.converter</groupId>
         <artifactId>flex-sdk-converter-maven-extension</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </extension>
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 49d5677..2abb97c 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -296,7 +296,7 @@
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
-                <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
+                <exclude name="**/org.apache.royale.tools.FlexToolGroup"/>
                 <exclude name="debugger/META-INF/MANIFEST.MF"/>
                 <exclude name="flex-typedefs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
                 <exclude name="**/*.patch"/>
@@ -368,7 +368,7 @@
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
-                <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
+                <exclude name="**/org.apache.royale.tools.FlexToolGroup"/>
                 <exclude name="debugger/META-INF/MANIFEST.MF"/>
                 <exclude name="flex-typedefs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
                 <exclude name="**/*.patch"/>
diff --git a/build.xml b/build.xml
index 3f39b8b..315ac40 100644
--- a/build.xml
+++ b/build.xml
@@ -752,7 +752,7 @@
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
-                <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
+                <exclude name="**/org.apache.royale.tools.FlexToolGroup"/>
                 <exclude name="debugger/META-INF/MANIFEST.MF"/>
                 <exclude name="royale-typedefs/target/maven-shared-archive-resources/META-INF/DEPENDENCIES"/>
                 <exclude name="**/*.patch"/>
diff --git a/compiler-build-tools/build.xml b/compiler-build-tools/build.xml
index 5a23ce0..2f950bc 100644
--- a/compiler-build-tools/build.xml
+++ b/compiler-build-tools/build.xml
@@ -96,7 +96,7 @@
     </target>
 	
 	<!-- The ProblemLocalizer tool is used to create a problems_en.properties file -->
-	<!-- filled with localization strings from classes extending org.apache.flex.compiler.CompilerProblem -->
+	<!-- filled with localization strings from classes extending org.apache.royale.compiler.CompilerProblem -->
 	<target name="problem.localizer"
 	        description="Compiles the ProblemLocalizer build tool">
 	    <mkdir dir="${compiler-build-tools}/target/classes"/>
diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml
index cbfe596..395925f 100644
--- a/compiler-build-tools/pom.xml
+++ b/compiler-build-tools/pom.xml
@@ -27,7 +27,7 @@
     <relativePath />
   </parent>
 
-  <groupId>org.apache.flex.flexjs.compiler</groupId>
+  <groupId>org.apache.royale.flexjs.compiler</groupId>
   <artifactId>compiler-build-tools</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClass.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClass.java
index 8f046ff..d3cb8f5 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClass.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClass.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.annotate;
+package org.apache.royale.compiler.tools.annotate;
 
 import java.io.*;
 import java.util.Collections;
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClassesMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClassesMojo.java
index 9791557..47872fb 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClassesMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/annotate/AnnotateClassesMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.annotate;
+package org.apache.royale.compiler.tools.annotate;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
index ec3cac2..3af7b1c 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.problems;
+package org.apache.royale.compiler.tools.problems;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemEnumGeneratorMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemEnumGeneratorMojo.java
index d7d9483..f657254 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemEnumGeneratorMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemEnumGeneratorMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.problems;
+package org.apache.royale.compiler.tools.problems;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -87,7 +87,7 @@ public class ProblemEnumGeneratorMojo
         writer.println(" *  limitations under the License.");
         writer.println(" */");
         writer.println();
-        writer.println("package org.apache.flex.compiler.problems;");
+        writer.println("package org.apache.royale.compiler.problems;");
         writer.println();
         writer.println("import java.util.EnumSet;");
         writer.println("import com.google.common.collect.ImmutableMap;");
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemResourceBundleGeneratorMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemResourceBundleGeneratorMojo.java
index 81ac042..4deea22 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemResourceBundleGeneratorMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/ProblemResourceBundleGeneratorMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.problems;
+package org.apache.royale.compiler.tools.problems;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreeHandlerGeneratorMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreeHandlerGeneratorMojo.java
index 5e8e131..6cce78f 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreeHandlerGeneratorMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreeHandlerGeneratorMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.unknowntreehandler;
+package org.apache.royale.compiler.tools.unknowntreehandler;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java
index 70a611b..2ad0d36 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unknowntreehandler/UnknownTreePatternInputOutput.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.flex.compiler.tools.unknowntreehandler;
+package org.apache.royale.compiler.tools.unknowntreehandler;
 
 import java.io.PrintWriter;
 
@@ -47,7 +47,7 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
     /**
      *  Package name to use.  Hard-coded for now.
      */
-    String packageName = "org.apache.flex.compiler.internal.as.codegen";
+    String packageName = "org.apache.royale.compiler.internal.as.codegen";
 
     /**
      *  Class name to use.  Also hard-coded.
@@ -57,7 +57,7 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
     /**
      *  Emitter to use.  Hard-coded.
      */
-    String emitterName = "org.apache.flex.compiler.internal.as.codegen.CmcEmitter";
+    String emitterName = "org.apache.royale.compiler.internal.as.codegen.CmcEmitter";
 
     /**
      *  Load a map of templates from an XML file.
@@ -133,7 +133,7 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
                     if ( attr_value.startsWith("org.apache.") )
                         class_name = attr_value;
                     else
-                        class_name = "org.apache.flex.compiler.problems." + attr_value;
+                        class_name = "org.apache.royale.compiler.problems." + attr_value;
                     template.problemClass = class_name;
                 }
                 else if ( "nodeClass".equals(attr_name) )
@@ -142,7 +142,7 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
                     if ( attr_value.startsWith("org.apache.") )
                         class_name = attr_value;
                     else
-                        class_name = "org.apache.flex.compiler.internal.tree.as." + attr_value;
+                        class_name = "org.apache.royale.compiler.internal.tree.as." + attr_value;
                     template.nodeClass = class_name;
                 }
                 else if ( "provisional".equals(attr_name) )
@@ -197,7 +197,7 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
     {
         if ( argv.length < 2 )
         {
-            System.err.println("Usage: java org.apache.flex.compiler.tools.unknowntreehandler.UnknownTreePatternInputOutput <xml pattern file> <destination java file>");
+            System.err.println("Usage: java org.apache.royale.compiler.tools.unknowntreehandler.UnknownTreePatternInputOutput <xml pattern file> <destination java file>");
             System.exit(1);
         }
 
@@ -223,8 +223,8 @@ class UnknownTreePatternInputOutput extends DefaultHandler2
         output.println("import java.util.ArrayList;");
         output.println("import java.util.HashMap;");
         output.println("import java.util.Map;");
-        output.println("import org.apache.flex.compiler.tree.ASTNodeID;");
-        output.println("import static org.apache.flex.compiler.tree.ASTNodeID.*;");
+        output.println("import org.apache.royale.compiler.tree.ASTNodeID;");
+        output.println("import static org.apache.royale.compiler.tree.ASTNodeID.*;");
         output.println("import " + this.emitterName + ";");
         output.println();
         output.println("public class " + this.className);
diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unpack/UnpackResourceMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unpack/UnpackResourceMojo.java
index a943578..33438a4 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unpack/UnpackResourceMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/unpack/UnpackResourceMojo.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.apache.flex.compiler.tools.unpack;
+package org.apache.royale.compiler.tools.unpack;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml
index a31ad41..fffd34d 100644
--- a/compiler-jburg-types/pom.xml
+++ b/compiler-jburg-types/pom.xml
@@ -28,7 +28,7 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.apache.flex.flexjs.compiler</groupId>
+  <groupId>org.apache.royale.flexjs.compiler</groupId>
   <artifactId>compiler-jburg-types</artifactId>
   <version>1.1.0-SNAPSHOT</version>
 
diff --git a/compiler-jburg-types/src/main/java/org/apache/royale/compiler/internal/as/codegen/IASNodeAdapter.java b/compiler-jburg-types/src/main/java/org/apache/royale/compiler/internal/as/codegen/IASNodeAdapter.java
index a2d4dd0..01d9bdc 100644
--- a/compiler-jburg-types/src/main/java/org/apache/royale/compiler/internal/as/codegen/IASNodeAdapter.java
+++ b/compiler-jburg-types/src/main/java/org/apache/royale/compiler/internal/as/codegen/IASNodeAdapter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.as.codegen;
+package org.apache.royale.compiler.internal.as.codegen;
 
 import jburg.burg.emitlangs.EmitLang;
 import jburg.burg.inode.InodeAdapter;
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index ea0948c..35a9367 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -131,7 +131,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-				<attribute name="Main-Class" value="org.apache.flex.compiler.clients.MXMLJSC" />
+				<attribute name="Main-Class" value="org.apache.royale.compiler.clients.MXMLJSC" />
                 <attribute name="Class-Path" value="args4j.jar org.json.jar jsc.jar" />
 			</manifest>
 		</jar>
@@ -145,7 +145,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-				<attribute name="Main-Class" value="org.apache.flex.compiler.clients.COMPJSC" />
+				<attribute name="Main-Class" value="org.apache.royale.compiler.clients.COMPJSC" />
                 <attribute name="Class-Path" value="jsc.jar" />
 			</manifest>
 		</jar>
@@ -159,7 +159,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.EXTERNC" />
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.EXTERNC" />
                 <attribute name="Class-Path" value="jsc.jar" />
             </manifest>
         </jar>
@@ -173,7 +173,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.ASDOCJSC" />
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.ASDOCJSC" />
                 <attribute name="Class-Path" value="jsc.jar" />
             </manifest>
         </jar>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index 77cb744..19e6757 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs.compiler</groupId>
+    <groupId>org.apache.royale.flexjs.compiler</groupId>
     <artifactId>flexjs-compiler-parent</artifactId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
@@ -78,7 +78,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.flex.flexjs.compiler</groupId>
+      <groupId>org.apache.royale.flexjs.compiler</groupId>
       <artifactId>compiler</artifactId>
       <version>0.9.0-SNAPSHOT</version>
     </dependency>
@@ -110,7 +110,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.flex.flexjs.compiler</groupId>
+      <groupId>org.apache.royale.flexjs.compiler</groupId>
       <artifactId>compiler-test-utils</artifactId>
       <version>0.9.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/flexjs/ASDocComment.java b/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/flexjs/ASDocComment.java
index 0f0a4dc..749a76c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/flexjs/ASDocComment.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/asdoc/flexjs/ASDocComment.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc.flexjs;
+package org.apache.royale.compiler.asdoc.flexjs;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.asdoc.IASDocComment;
-import org.apache.flex.compiler.asdoc.IASDocTag;
+import org.apache.royale.compiler.asdoc.IASDocComment;
+import org.apache.royale.compiler.asdoc.IASDocTag;
 
 import antlr.Token;
 
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 095e8c2..c962991 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -29,35 +29,35 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.internal.driver.as.ASBackend;
-import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocBackend;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocDITABackend;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
-import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleASDocProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
+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.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.jsc.MXMLJSCJSSWCBackend;
+import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleASDocProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
index ca76771..6565af4 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,28 +38,28 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.internal.codegen.js.JSWriter;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogCompcConfiguration;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.LibraryNotFoundProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.swc.io.SWCReader;
-import org.apache.flex.utils.ArgumentUtil;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.js.goog.JSGoogCompcConfiguration;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.LibraryNotFoundProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.swc.io.SWCReader;
+import org.apache.royale.utils.ArgumentUtil;
 
 /**
  * @author Erik de Bruin
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 d9d1990..2925b93 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,30 +38,30 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.internal.codegen.js.JSWriter;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleSWCBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.LibraryNotFoundProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.swc.io.SWCReader;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.LibraryNotFoundProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.swc.io.SWCReader;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
index 0861dc8..bf262d1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,29 +38,29 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.internal.codegen.js.JSWriter;
-import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSSWCBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.LibraryNotFoundProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.swc.io.SWCReader;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.jsc.MXMLJSCJSSWCBackend;
+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;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.LibraryNotFoundProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.swc.io.SWCReader;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
index a3fb2f4..ea6bf09 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/EXTERNC.java
@@ -17,25 +17,25 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.flex.compiler.clients.problems.ProblemFormatter;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ExterncConfigurator;
-import org.apache.flex.compiler.internal.codegen.externals.emit.ReferenceEmitter;
-import org.apache.flex.compiler.internal.codegen.externals.pass.ReferenceCompiler;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.tools.FlexTool;
+import org.apache.royale.compiler.clients.problems.ProblemFormatter;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ExterncConfigurator;
+import org.apache.royale.compiler.internal.codegen.externals.emit.ReferenceEmitter;
+import org.apache.royale.compiler.internal.codegen.externals.pass.ReferenceCompiler;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.tools.FlexTool;
 
 import com.google.javascript.jscomp.Result;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
index 67bc814..83d4673 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/ExternCConfiguration.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,21 +25,21 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.exceptions.ConfigurationException.CannotOpen;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IncorrectArgumentCount;
-import org.apache.flex.compiler.internal.codegen.externals.pass.ReferenceCompiler.ExternalFile;
-import org.apache.flex.compiler.internal.codegen.externals.reference.BaseReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.FieldReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.MemberReference;
-import org.apache.flex.compiler.internal.config.annotations.Arguments;
-import org.apache.flex.compiler.internal.config.annotations.Config;
-import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
-import org.apache.flex.compiler.internal.config.annotations.Mapping;
-import org.apache.flex.compiler.utils.NodeJSUtils;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.exceptions.ConfigurationException.CannotOpen;
+import org.apache.royale.compiler.exceptions.ConfigurationException.IncorrectArgumentCount;
+import org.apache.royale.compiler.internal.codegen.externals.pass.ReferenceCompiler.ExternalFile;
+import org.apache.royale.compiler.internal.codegen.externals.reference.BaseReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.FieldReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.MemberReference;
+import org.apache.royale.compiler.internal.config.annotations.Arguments;
+import org.apache.royale.compiler.internal.config.annotations.Config;
+import org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
+import org.apache.royale.compiler.internal.config.annotations.Mapping;
+import org.apache.royale.compiler.utils.NodeJSUtils;
+import org.apache.royale.utils.FilenameNormalization;
 
 public class ExternCConfiguration extends Configuration
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/FlexJSToolGroup.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/FlexJSToolGroup.java
index 2a6c2fb..2dda4e5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/FlexJSToolGroup.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/FlexJSToolGroup.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocDITABackend;
-import org.apache.flex.tools.AbstractFlexToolGroup;
+import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleASDocDITABackend;
+import org.apache.royale.tools.AbstractFlexToolGroup;
 
 /**
  * Created by christoferdutz on 10.11.14.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSCompilerEntryPoint.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSCompilerEntryPoint.java
index 6b028da..8f06376 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSCompilerEntryPoint.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSCompilerEntryPoint.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
-import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 
 import java.util.List;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
index 9f6bbe9..93751e7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/JSConfiguration.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,17 +25,17 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.clients.MXMLJSC.JSTargetType;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.CannotOpen;
-import org.apache.flex.compiler.internal.config.annotations.Arguments;
-import org.apache.flex.compiler.internal.config.annotations.Config;
-import org.apache.flex.compiler.internal.config.annotations.FlexOnly;
-import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
-import org.apache.flex.compiler.internal.config.annotations.Mapping;
-import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping;
+import org.apache.royale.compiler.clients.MXMLJSC.JSTargetType;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.exceptions.ConfigurationException.CannotOpen;
+import org.apache.royale.compiler.internal.config.annotations.Arguments;
+import org.apache.royale.compiler.internal.config.annotations.Config;
+import org.apache.royale.compiler.internal.config.annotations.FlexOnly;
+import org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
+import org.apache.royale.compiler.internal.config.annotations.Mapping;
+import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
 
 import com.google.common.collect.ImmutableList;
 
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 22290e6..b8cfde2 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -34,50 +34,50 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.swf.ISWF;
-import org.apache.flex.swf.SWF;
-import org.apache.flex.swf.types.RGB;
-import org.apache.flex.swf.types.Rect;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.ArgumentUtil;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.ProblemQueryProvider;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.swf.ISWF;
+import org.apache.royale.swf.SWF;
+import org.apache.royale.swf.types.RGB;
+import org.apache.royale.swf.types.Rect;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.ArgumentUtil;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
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 0fd0349..4988aa9 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -33,48 +33,48 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.ArgumentUtil;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.ProblemQueryProvider;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.ArgumentUtil;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
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 0b84a59..2e8f87b 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -32,48 +32,48 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleCordovaBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.ArgumentUtil;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.ProblemQueryProvider;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.ArgumentUtil;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
index f91d3bd..dad75f0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNative.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -32,48 +32,48 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.ArgumentUtil;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.ProblemQueryProvider;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.js.jsc.JSCBackend;
+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;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.ArgumentUtil;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
index f7114c0..4bba727 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNode.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -32,48 +32,48 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.ProblemQueryProvider;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.exceptions.ConfigurationException.IOError;
-import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget;
-import org.apache.flex.compiler.exceptions.ConfigurationException.OnlyOneSource;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.js.node.NodeBackend;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.problems.UnexpectedExceptionProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.ArgumentUtil;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.ProblemQueryProvider;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+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.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.js.node.NodeBackend;
+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;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.problems.UnexpectedExceptionProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.ArgumentUtil;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNodeModule.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNodeModule.java
index 7b65fc1..0633dea 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNodeModule.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/MXMLJSCNodeModule.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
-import org.apache.flex.compiler.internal.driver.js.node.NodeModuleBackend;
+import org.apache.royale.compiler.internal.driver.js.node.NodeModuleBackend;
 
 public class MXMLJSCNodeModule extends MXMLJSCNode
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IASGlobalFunctionConstants.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IASGlobalFunctionConstants.java
index 6d0106e..01f41cf 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IASGlobalFunctionConstants.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IASGlobalFunctionConstants.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
 /**
  * AS3 language global functions, such as Array, encodeURI, isNaN etc.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IDocEmitter.java
index f71ae5e..494a562 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
 /**
  * Base interface for documentation emitters.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitter.java
index 5e2e596..ad5c9c9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitter.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitterTokens.java
index 09be781..670890b 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/IEmitterTokens.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
 public interface IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/INestingEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/INestingEmitter.java
index 36889c5..45f2478 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/INestingEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/INestingEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
 public interface INestingEmitter extends IEmitter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISourceMapEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISourceMapEmitter.java
index 3fef28e..9834709 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISourceMapEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISourceMapEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
 /**
  * Base interface for source map emitters.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISubEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISubEmitter.java
index 1dc614b..20503b2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISubEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/ISubEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen;
+package org.apache.royale.compiler.codegen;
 
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 /**
  * The {@link IEmitter} emitter can use composition for it's more
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASEmitter.java
index 077a824..815a80c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASEmitter.java
@@ -17,58 +17,58 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.as;
+package org.apache.royale.compiler.codegen.as;
 
 import java.io.Writer;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.INestingEmitter;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IUseNamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.INestingEmitter;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralContainerNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IUseNamespaceNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 /**
  * The {@link IASEmitter} interface allows abstraction between the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASWriter.java
index c2c2ded..d0c0e75 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/as/IASWriter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.as;
+package org.apache.royale.compiler.codegen.as;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSDocEmitter.java
index e37dd18..e0e144f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSDocEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js;
+package org.apache.royale.compiler.codegen.js;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.IDocEmitter;
 
 /**
  * The {@link IJSDocEmitter} interface allows the abstraction of JavaScript
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSEmitter.java
index f71eb90..ae36a77 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js;
+package org.apache.royale.compiler.codegen.js;
 
 import java.io.Writer;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.internal.codegen.js.JSSessionModel;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * The {@link IJSEmitter} interface allows abstraction between the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSPublisher.java
index 2d62436..5966de2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSPublisher.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js;
+package org.apache.royale.compiler.codegen.js;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.driver.IPublisher;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.driver.IPublisher;
 
 /**
  * The {@link IJSPublisher} interface allows the abstraction of project output
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSWriter.java
index aae8011..50ea5cc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IJSWriter.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js;
+package org.apache.royale.compiler.codegen.js;
 
 import java.io.File;
 import java.io.OutputStream;
 
-import org.apache.flex.compiler.codegen.as.IASWriter;
+import org.apache.royale.compiler.codegen.as.IASWriter;
 
 /**
  * A JavaScript writer that outputs cross compiled string data to the output
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IMappingEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IMappingEmitter.java
index dc4bb6b..bcc5757 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IMappingEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/IMappingEmitter.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js;
+package org.apache.royale.compiler.codegen.js;
 
 import java.util.List;
 
-import org.apache.flex.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.common.ISourceLocation;
 
 import com.google.debugging.sourcemap.FilePosition;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDDocEmitter.java
index 02eb3cb..8609914 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDDocEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.amd;
+package org.apache.royale.compiler.codegen.js.amd;
 
-import org.apache.flex.compiler.codegen.js.IJSDocEmitter;
+import org.apache.royale.compiler.codegen.js.IJSDocEmitter;
 
 /**
  * The {@link IJSAMDDocEmitter} interface allows the abstraction of JavaScript
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDEmitter.java
index 2e117e6..b088e31 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/amd/IJSAMDEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.amd;
+package org.apache.royale.compiler.codegen.js.amd;
 
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
 
 /**
  * The {@link IJSAMDEmitter} interface allows abstraction between the base
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSASDocEmitter.java
index ee78254..9ca20c4 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSASDocEmitter.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.flexjs;
+package org.apache.royale.compiler.codegen.js.flexjs;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.flex.compiler.internal.projects.RoyaleASDocProject;
+import org.apache.royale.compiler.internal.projects.RoyaleASDocProject;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSEmitter.java
index e886b9d..396f916 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/flexjs/IJSFlexJSEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.flexjs;
+package org.apache.royale.compiler.codegen.js.flexjs;
 
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogEmitter;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogEmitter;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
index 7b433cd..112f3a0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogDocEmitter.java
@@ -17,19 +17,19 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.goog;
-
-import org.apache.flex.compiler.codegen.js.IJSDocEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+package org.apache.royale.compiler.codegen.js.goog;
+
+import org.apache.royale.compiler.codegen.js.IJSDocEmitter;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 /**
  * The {@link IJSGoogDocEmitter} interface allows the abstraction of JavaScript
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogEmitter.java
index 5e5bd50..7284b07 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/js/goog/IJSGoogEmitter.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.js.goog;
+package org.apache.royale.compiler.codegen.js.goog;
 
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
 
 /**
  * The {@link IJSGoogEmitter} interface allows abstraction between the base
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
index a8dc6dc..38b5082 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/IMXMLEmitter.java
@@ -17,36 +17,36 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.mxml;
+package org.apache.royale.compiler.codegen.mxml;
 
 import java.io.Writer;
 
-import org.apache.flex.compiler.codegen.IEmitter;
-import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLImplementsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLMetadataNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLObjectNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStringNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLUintNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.codegen.IEmitter;
+import org.apache.royale.compiler.tree.mxml.IMXMLArrayNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDataBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeclarationsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEmbedNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFactoryNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLImplementsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLIntNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLLiteralNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLUintNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLVectorNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 /**
  * The {@link IMXMLEmitter} interface allows abstraction between the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
index 10343a9..5e4291e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/codegen/mxml/flexjs/IMXMLFlexJSEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.codegen.mxml.flexjs;
+package org.apache.royale.compiler.codegen.mxml.flexjs;
 
 import java.io.Writer;
 
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * The {@link IMXMLRoyaleEmitter} interface allows abstraction between the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/config/ExterncConfigurator.java b/compiler-jx/src/main/java/org/apache/royale/compiler/config/ExterncConfigurator.java
index 1e741ef..abdb2a6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/config/ExterncConfigurator.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/config/ExterncConfigurator.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.config;
+package org.apache.royale.compiler.config;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
 
 public class ExterncConfigurator extends Configurator
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IApplication.java b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IApplication.java
index 3654806..9d432c2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IApplication.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IApplication.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.driver;
+package org.apache.royale.compiler.driver;
 
 /**
  * The ActionScript model interface used when implementing build targets that
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IBackend.java
index f12554a..bf0eff8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IBackend.java
@@ -17,31 +17,31 @@
  *
  */
 
-package org.apache.flex.compiler.driver;
+package org.apache.royale.compiler.driver;
 
 import java.io.File;
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.clients.MXMLJSC;
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.clients.MXMLJSC;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+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.internal.codegen.as.ASFilterWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * The backend strategy for the {@link MXMLJSC} javascript compiler.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IPublisher.java
index a2535bd..ca64f2a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/IPublisher.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.driver;
+package org.apache.royale.compiler.driver;
 
 public interface IPublisher
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSApplication.java b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSApplication.java
index c61aa90..cf3d756 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSApplication.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSApplication.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.driver.js;
+package org.apache.royale.compiler.driver.js;
 
-import org.apache.flex.compiler.driver.IApplication;
+import org.apache.royale.compiler.driver.IApplication;
 
 /**
  * The JavaScript model interface used when implementing build targets that
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSBackend.java
index 80099b6..5bb93f9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/driver/js/IJSBackend.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.driver.js;
+package org.apache.royale.compiler.driver.js;
 
-import org.apache.flex.compiler.codegen.ISourceMapEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.driver.IBackend;
+import org.apache.royale.compiler.codegen.ISourceMapEmitter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.driver.IBackend;
 
 public interface IJSBackend extends IBackend
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/Emitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/Emitter.java
index d559058..f35fb29 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/Emitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/Emitter.java
@@ -17,19 +17,19 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen;
+package org.apache.royale.compiler.internal.codegen;
 
 import java.io.FilterWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IEmitter;
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.codegen.IEmitter;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
 
 /**
  * The base implementation for an ActionScript emitter.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASAfterNodeStrategy.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASAfterNodeStrategy.java
index 6ef1c9d..b5d81e5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASAfterNodeStrategy.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASAfterNodeStrategy.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IContainerNode.ContainerType;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IContainerNode.ContainerType;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * A concrete implementation of the {@link IASNodeStrategy} that allows
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBeforeNodeStrategy.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBeforeNodeStrategy.java
index 9750bc5..792b583 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBeforeNodeStrategy.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBeforeNodeStrategy.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IContainerNode.ContainerType;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IContainerNode.ContainerType;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * A concrete implementation of the {@link IASNodeStrategy} that allows
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBlockWalker.java
index 5247583..208ccd7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASBlockWalker.java
@@ -17,73 +17,73 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.internal.semantics.SemanticUtils;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.IASProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefaultXMLNamespaceNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode.ForLoopKind;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode.LiteralType;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IUseNamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode.WhileLoopKind;
-import org.apache.flex.compiler.tree.as.IWithNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.utils.DefinitionUtils;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.as.IASBlockVisitor;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.internal.semantics.SemanticUtils;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.IASProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefaultXMLNamespaceNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode.ForLoopKind;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralContainerNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode.LiteralType;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IUseNamespaceNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode.WhileLoopKind;
+import org.apache.royale.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.utils.DefinitionUtils;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.as.IASBlockVisitor;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
 
 /**
  * A base implementation of the {@link IASBlockVisitor} that will walk the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitter.java
index c34eadb..f80c674 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitter.java
@@ -17,88 +17,88 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
 import java.io.FilterWriter;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.IEmitter;
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.IImportTarget;
-import org.apache.flex.compiler.common.ModifiersSet;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
-import org.apache.flex.compiler.internal.tree.as.ContainerNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IConditionalNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IContainerNode.ContainerType;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IOperatorNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.IScopedNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.IStatementNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IUseNamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.IEmitter;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.IImportTarget;
+import org.apache.royale.compiler.common.ModifiersSet;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.tree.as.ChainedVariableNode;
+import org.apache.royale.compiler.internal.tree.as.ContainerNode;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IConditionalNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IContainerNode.ContainerType;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralContainerNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IOperatorNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.IScopedNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.IStatementNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IUseNamespaceNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
 
 /**
  * The base implementation for an ActionScript emitter.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitterTokens.java
index 9296a78..99e121a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASEmitterTokens.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASFilterWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASFilterWriter.java
index c9fe02e..6863410 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASFilterWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASFilterWriter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
 import java.io.FilterWriter;
 import java.io.Writer;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASWriter.java
index 9d1d8d1..4f79f30 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/as/ASWriter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -25,12 +25,12 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
 
 public class ASWriter implements IASWriter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/emit/ReferenceEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/emit/ReferenceEmitter.java
index ed30377..c552734 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/emit/ReferenceEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/emit/ReferenceEmitter.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.emit;
+package org.apache.royale.compiler.internal.codegen.externals.emit;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.flex.compiler.internal.codegen.externals.reference.BaseReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ConstantReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.FunctionReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.BaseReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ConstantReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.FunctionReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.jstype.JSType;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AbstractCompilerPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AbstractCompilerPass.java
index 0bf5966..930b123 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AbstractCompilerPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AbstractCompilerPass.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
 import java.util.Collection;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.pass.ReferenceCompiler.ExternalFile;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
-import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.pass.ReferenceCompiler.ExternalFile;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.utils.DebugLogUtils;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.CompilerPass;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AddMemberPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AddMemberPass.java
index 64fc9a9..2a24cc7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AddMemberPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/AddMemberPass.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.NodeTraversal;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectImportsPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectImportsPass.java
index d934610..19880e8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectImportsPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectImportsPass.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
 import java.util.List;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.*;
+import org.apache.royale.compiler.internal.codegen.externals.reference.*;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.NodeTraversal;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectTypesPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectTypesPass.java
index 81e2ae2..ce90b43 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectTypesPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/CollectTypesPass.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.NodeTraversal;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/NamespaceResolutionPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/NamespaceResolutionPass.java
index 8a8ec24..65778d3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/NamespaceResolutionPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/NamespaceResolutionPass.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.problems.VariableHasNoTypeDeclarationProblem;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.problems.VariableHasNoTypeDeclarationProblem;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.NodeTraversal;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ReferenceCompiler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
index b2b6bdc..75b8cf0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.jscomp.*;
 import com.google.javascript.jscomp.Compiler;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ResolvePackagesPass.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ResolvePackagesPass.java
index b446d8c..f670aa1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ResolvePackagesPass.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/pass/ResolvePackagesPass.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.pass;
+package org.apache.royale.compiler.internal.codegen.externals.pass;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.FieldReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.FieldReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.jscomp.AbstractCompiler;
 import com.google.javascript.jscomp.NodeTraversal;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/BaseReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/BaseReference.java
index cabc9bb..fe8434d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/BaseReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/BaseReference.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.io.File;
 import java.util.Set;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfo.Marker;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ClassReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ClassReference.java
index 75f927b..7135b05 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ClassReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ClassReference.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,11 +28,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.compiler.internal.codegen.externals.pass.AbstractCompilerPass;
-import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
-import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.problems.UnresolvedClassReferenceProblem;
+import org.apache.royale.compiler.internal.codegen.externals.pass.AbstractCompilerPass;
+import org.apache.royale.compiler.internal.codegen.externals.utils.DebugLogUtils;
+import org.apache.royale.compiler.internal.codegen.externals.utils.JSTypeUtils;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.problems.UnresolvedClassReferenceProblem;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSDocInfoBuilder;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ConstantReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ConstantReference.java
index ff123ce..6d5f866 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ConstantReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ConstantReference.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.io.File;
 import java.util.HashMap;
 
-import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
+import org.apache.royale.compiler.internal.codegen.externals.utils.JSTypeUtils;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FieldReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FieldReference.java
index 674fa19..dbf5338 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FieldReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FieldReference.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
-import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
-import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.internal.codegen.externals.utils.FunctionUtils;
+import org.apache.royale.compiler.internal.codegen.externals.utils.JSTypeUtils;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.JSTypeExpression;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FunctionReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FunctionReference.java
index 5ce9f98..f6d4f04 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FunctionReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/FunctionReference.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,8 +25,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
-import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.internal.codegen.externals.utils.FunctionUtils;
 
 import com.google.common.collect.Lists;
 import com.google.javascript.rhino.JSDocInfo;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MemberReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MemberReference.java
index 8e753ed..5c4a5ee 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MemberReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MemberReference.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MethodReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MethodReference.java
index e978bf7..87357d8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MethodReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/MethodReference.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
-import org.apache.flex.compiler.internal.codegen.externals.utils.FunctionUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.internal.codegen.externals.utils.FunctionUtils;
 
 import com.google.common.collect.Lists;
 import com.google.javascript.rhino.JSDocInfo;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/NullConstructorReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/NullConstructorReference.java
index f1caf7a..4c3e512 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/NullConstructorReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/NullConstructorReference.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import com.google.javascript.rhino.JSDocInfo;
 import com.google.javascript.rhino.Node;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ParameterReference.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ParameterReference.java
index 30d7c15..8dd5347 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ParameterReference.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ParameterReference.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import com.google.javascript.rhino.Node;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ReferenceModel.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ReferenceModel.java
index 1e0a6ec..7d0f236 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ReferenceModel.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/reference/ReferenceModel.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.reference;
+package org.apache.royale.compiler.internal.codegen.externals.reference;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.clients.ExternCConfiguration.ExcludedMember;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.internal.codegen.externals.utils.DebugLogUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.clients.ExternCConfiguration.ExcludedMember;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.internal.codegen.externals.utils.DebugLogUtils;
 
 import com.google.javascript.jscomp.Compiler;
 import com.google.javascript.jscomp.NodeUtil;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/DebugLogUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/DebugLogUtils.java
index 5dcdc48..0623d62 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/DebugLogUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/DebugLogUtils.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.utils;
+package org.apache.royale.compiler.internal.codegen.externals.utils;
 
 import com.google.javascript.rhino.Node;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/FunctionUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/FunctionUtils.java
index 15d83f4..21a92a0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/FunctionUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/FunctionUtils.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.utils;
+package org.apache.royale.compiler.internal.codegen.externals.utils;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.BaseReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.MemberReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.BaseReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.MemberReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.common.base.Strings;
 import com.google.javascript.rhino.JSDocInfo;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/JSTypeUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/JSTypeUtils.java
index 966007e..5945849 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/JSTypeUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/externals/utils/JSTypeUtils.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals.utils;
+package org.apache.royale.compiler.internal.codegen.externals.utils;
 
 import java.util.HashMap;
 
-import org.apache.flex.compiler.internal.codegen.externals.reference.BaseReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ConstantReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.compiler.internal.codegen.externals.reference.BaseReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ConstantReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
 
 import com.google.javascript.rhino.JSTypeExpression;
 import com.google.javascript.rhino.jstype.JSType;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitter.java
index 743ecce..de44564 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
-
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.IEmitter;
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.tree.as.IASNode;
+package org.apache.royale.compiler.internal.codegen.js;
+
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.IEmitter;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 public class JSDocEmitter implements IDocEmitter, IEmitter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitterTokens.java
index 813e36b..d39dff0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSDocEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum JSDocEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitter.java
index c70b98c..bc2649a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitter.java
@@ -17,73 +17,73 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.io.FilterWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IEmitter;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.jx.BlockCloseEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.BlockOpenEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.CatchEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.DoWhileLoopEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.DynamicAccessEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ForLoopEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallArgumentsEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.IfEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.IterationFlowEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.LanguageIdentifierEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.LiteralContainerEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.MemberKeywordEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.NumericLiteralEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ObjectLiteralValuePairEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ParameterEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ParametersEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ReturnEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.SourceMapDirectiveEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.StatementEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.SwitchEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.TernaryOperatorEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ThrowEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.TryEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.UnaryOperatorEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.WhileLoopEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.WithEmitter;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.codegen.IEmitter;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.jx.BlockCloseEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.BlockOpenEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.CatchEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.DoWhileLoopEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.DynamicAccessEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ForLoopEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.FunctionCallArgumentsEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.IfEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.IterationFlowEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.LanguageIdentifierEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.LiteralContainerEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.MemberKeywordEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.NumericLiteralEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ObjectLiteralValuePairEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ParameterEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ParametersEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ReturnEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.SourceMapDirectiveEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.StatementEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.SwitchEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.TernaryOperatorEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ThrowEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.TryEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.UnaryOperatorEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.WhileLoopEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.WithEmitter;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralContainerNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
 
 import com.google.debugging.sourcemap.FilePosition;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitterTokens.java
index be2aafc..454f265 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum JSEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSFilterWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSFilterWriter.java
index bf17a87..fc2a6ff 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSFilterWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSFilterWriter.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.io.Writer;
 
-import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter;
+import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSPublisher.java
index 1091566..e5a4afb 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSPublisher.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
 
 public class JSPublisher implements IJSPublisher
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSessionModel.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSessionModel.java
index 8ceb44d..6d24b66 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSessionModel.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSessionModel.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,13 +25,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSharedData.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSharedData.java
index be82477..c421b3f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSharedData.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSharedData.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 // TODO (mschmalle) This class sucks, figure out some other way instead of using
 // a static singleton class like this, change when implementing Configuration
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSourceMapEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSourceMapEmitter.java
index 5b6c26c..aebb455 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSourceMapEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSourceMapEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.ISourceMapEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.codegen.ISourceMapEmitter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
 
 import com.google.debugging.sourcemap.SourceMapGeneratorV3;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSubEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSubEmitter.java
index 97cf074..6e347bd 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSubEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSSubEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 public class JSSubEmitter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSWriter.java
index 458fbde..c155b9d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/JSWriter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js;
+package org.apache.royale.compiler.internal.codegen.js;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -27,15 +27,15 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.flex.compiler.codegen.ISourceMapEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.driver.js.IJSBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.codegen.ISourceMapEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.driver.js.IJSBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
 
 public class JSWriter implements IJSWriter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/ExportWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/ExportWriter.java
index 92244db..c0f72af 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/ExportWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/ExportWriter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.flex.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
index c79dd3d..70e3906 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDDocEmitter.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.amd.IJSAMDDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSDocEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.amd.IJSAMDDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSDocEmitter;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitter.java
index fd19e42..e9413b4 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
 import java.io.FilterWriter;
 import java.util.ArrayList;
@@ -26,49 +26,49 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.codegen.js.amd.IJSAMDDocEmitter;
-import org.apache.flex.compiler.codegen.js.amd.IJSAMDEmitter;
-import org.apache.flex.compiler.definitions.IAccessorDefinition;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IConstantDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IInterfaceDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.definitions.references.IReference;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.ClassTraitsDefinition;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.scopes.IASScope;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.codegen.js.amd.IJSAMDDocEmitter;
+import org.apache.royale.compiler.codegen.js.amd.IJSAMDEmitter;
+import org.apache.royale.compiler.definitions.IAccessorDefinition;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IConstantDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IInterfaceDefinition;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.definitions.references.IReference;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.ClassTraitsDefinition;
+import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.scopes.IASScope;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 /**
  * Concrete implementation of the 'AMD' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitterTokens.java
index 122f711..2795f46 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/JSAMDEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum JSAMDEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/TempTools.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/TempTools.java
index 4d0d6f2..59f07e5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/TempTools.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/amd/TempTools.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,36 +25,36 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IParameterDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.definitions.references.IReference;
-import org.apache.flex.compiler.internal.definitions.ClassTraitsDefinition;
-import org.apache.flex.compiler.internal.tree.as.ExpressionNodeBase;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode.LanguageIdentifierKind;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IParameterDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.definitions.references.IReference;
+import org.apache.royale.compiler.internal.definitions.ClassTraitsDefinition;
+import org.apache.royale.compiler.internal.tree.as.ExpressionNodeBase;
+import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.MemberAccessExpressionNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode.LanguageIdentifierKind;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 /**
  * These tools need to be refactored into utility classes.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java
index dd56d58..6d30bf6 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocDITAEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -29,44 +29,44 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.compiler.asdoc.IASDocTag;
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IAccessorDefinition;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IInterfaceDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.IParameterDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTag;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.ClassDefinition;
-import org.apache.flex.compiler.internal.definitions.EventDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.flex.compiler.internal.definitions.VariableDefinition;
-import org.apache.flex.compiler.internal.projects.RoyaleASDocProject;
-import org.apache.flex.compiler.internal.tree.as.metadata.EventTagNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+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.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IAccessorDefinition;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IInterfaceDefinition;
+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.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
+import org.apache.royale.compiler.internal.definitions.EventDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.definitions.InterfaceDefinition;
+import org.apache.royale.compiler.internal.definitions.VariableDefinition;
+import org.apache.royale.compiler.internal.projects.RoyaleASDocProject;
+import org.apache.royale.compiler.internal.tree.as.metadata.EventTagNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 /**
  * Concrete implementation of the 'Royale' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java
index 04d12e2..a537caf 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSASDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -29,43 +29,43 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.compiler.asdoc.IASDocTag;
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleASDocEmitter;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IAccessorDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.IParameterDefinition;
-import org.apache.flex.compiler.definitions.metadata.IDeprecationInfo;
-import org.apache.flex.compiler.definitions.references.INamespaceReference;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.ClassDefinition;
-import org.apache.flex.compiler.internal.definitions.DefinitionBase;
-import org.apache.flex.compiler.internal.definitions.EventDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.flex.compiler.internal.definitions.VariableDefinition;
-import org.apache.flex.compiler.internal.projects.RoyaleASDocProject;
-import org.apache.flex.compiler.internal.tree.as.metadata.EventTagNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+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.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IAccessorDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+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.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
+import org.apache.royale.compiler.internal.definitions.DefinitionBase;
+import org.apache.royale.compiler.internal.definitions.EventDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.definitions.InterfaceDefinition;
+import org.apache.royale.compiler.internal.definitions.VariableDefinition;
+import org.apache.royale.compiler.internal.projects.RoyaleASDocProject;
+import org.apache.royale.compiler.internal.tree.as.metadata.EventTagNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 /**
  * Concrete implementation of the 'Royale' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index 1f6e7df..46add28 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -17,37 +17,37 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.DependencyType;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.references.IReference;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.scopes.ASScope;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.DependencyType;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.references.IReference;
+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.goog.JSGoogDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogDocEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.jx.BindableEmitter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.scopes.ASScope;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 public class JSRoyaleDocEmitter extends JSGoogDocEmitter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 0b6e49b..78653e1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.io.File;
 import java.io.FilterWriter;
@@ -26,87 +26,87 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.flex.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.constants.INamespaceConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.INamespaceDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.jx.AccessorEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.AsIsEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ClassEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.DefinePropertyFunctionEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.InterfaceEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.LiteralEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.MemberAccessEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.MethodEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.ObjectDefinePropertyEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.PackageHeaderEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.SelfReferenceEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.embedding.EmbedAttribute;
-import org.apache.flex.compiler.internal.embedding.EmbedData;
-import org.apache.flex.compiler.internal.embedding.EmbedMIMEType;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.FlexProject;
-import org.apache.flex.compiler.internal.tree.as.*;
-import org.apache.flex.compiler.problems.EmbedUnableToReadSourceProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceDecorationNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IScopedNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.js.flexjs.IJSRoyaleEmitter;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogDocEmitter;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.constants.INamespaceConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.INamespaceDefinition;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+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.JSSessionModel.ImplicitBindableImplementation;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitter;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.jx.AccessorEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.AsIsEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.BinaryOperatorEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.BindableEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ClassEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.DefinePropertyFunctionEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.FieldEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ForEachEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.FunctionCallEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.IdentifierEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.InterfaceEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.LiteralEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.MemberAccessEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.MethodEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.ObjectDefinePropertyEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.PackageFooterEmitter;
+import org.apache.royale.compiler.internal.codegen.js.jx.PackageHeaderEmitter;
+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.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.embedding.EmbedAttribute;
+import org.apache.royale.compiler.internal.embedding.EmbedData;
+import org.apache.royale.compiler.internal.embedding.EmbedMIMEType;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.tree.as.*;
+import org.apache.royale.compiler.problems.EmbedUnableToReadSourceProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceDecorationNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IScopedNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 import com.google.common.base.Joiner;
-import org.apache.flex.compiler.utils.NativeUtils;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.utils.NativeUtils;
+import org.apache.royale.utils.FilenameNormalization;
 
 /**
  * Concrete implementation of the 'Royale' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java
index cb729de..a684d2f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/flexjs/JSFlexJSEmitterTokens.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 /**
  * @author Erik de Bruin
@@ -35,7 +35,7 @@ public enum JSRoyaleEmitterTokens implements IEmitterTokens
     GOOG_EXPORT_SYMBOL("goog.exportSymbol"),
     INDENT("  "),
     INTERFACES("interfaces"),
-    LANGUAGE_QNAME("org.apache.flex.utils.Language"),
+    LANGUAGE_QNAME("org.apache.royale.utils.Language"),
     NAME("name"),
     NAMES("names"),
     QNAME("qName"),
@@ -54,11 +54,11 @@ public enum JSRoyaleEmitterTokens implements IEmitterTokens
     GETTER_PREFIX("get__"),
     SETTER_PREFIX("set__"),
     BINDABLE_PREFIX("bindable__"),
-    CLOSURE_FUNCTION_NAME("org.apache.flex.utils.Language.closure"),
+    CLOSURE_FUNCTION_NAME("org.apache.royale.utils.Language.closure"),
     SKIP_AS_COERCIONS("skipAsCoercions"),
     SKIP_FUNCTION_COERCIONS("skipFunctionCoercions"),
     JSX("JSX"),
-    VECTOR("org.apache.flex.utils.Language.Vector"),
+    VECTOR("org.apache.royale.utils.Language.Vector"),
     ;
 
     private String token;
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 50b3794..36fa0f8 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
@@ -17,40 +17,40 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
-
-import org.apache.flex.compiler.codegen.IASGlobalFunctionConstants;
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.DependencyType;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.references.IReference;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSDocEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSharedData;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.scopes.ASScope;
-import org.apache.flex.compiler.internal.semantics.SemanticUtils;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IScopedNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
+package org.apache.royale.compiler.internal.codegen.js.goog;
+
+import org.apache.royale.compiler.codegen.IASGlobalFunctionConstants;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogDocEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.DependencyType;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.references.IReference;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+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.scopes.ASScope;
+import org.apache.royale.compiler.internal.semantics.SemanticUtils;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IScopedNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
index 9578726..0a1e334 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogDocEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum JSGoogDocEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index 26045b7..c95d7f7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -17,64 +17,64 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
 import java.io.FilterWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.codegen.IASGlobalFunctionConstants.BuiltinType;
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter;
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.ModifiersSet;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IPackageDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
-import org.apache.flex.compiler.internal.scopes.PackageScope;
-import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.scopes.IASScope;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.IASGlobalFunctionConstants.BuiltinType;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogDocEmitter;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.ModifiersSet;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IPackageDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
+import org.apache.royale.compiler.internal.scopes.PackageScope;
+import org.apache.royale.compiler.internal.tree.as.ChainedVariableNode;
+import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.MemberAccessExpressionNode;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.scopes.IASScope;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 /**
  * Concrete implementation of the 'goog' JavaScript production.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
index 7da2bbf..b1f42a3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum JSGoogEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogPublisher.java
index 0dc9032..18b139c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogPublisher.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,13 +32,13 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.RegexFileFilter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.internal.codegen.js.JSPublisher;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.utils.JSClosureCompilerUtil;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.internal.codegen.js.JSPublisher;
+import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.utils.JSClosureCompilerUtil;
 
 import com.google.javascript.jscomp.CheckLevel;
 import com.google.javascript.jscomp.ErrorManager;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JarSourceFile.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JarSourceFile.java
index ee0a89b..8878f62 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JarSourceFile.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JarSourceFile.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
 import com.google.common.io.CharSource;
 import com.google.javascript.jscomp.Region;
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 d348eed..dd57142 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
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jsc;
+package org.apache.royale.compiler.internal.codegen.js.jsc;
 
 import java.io.FilterWriter;
 
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.js.flexjs.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 146ab79..00d11d3 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
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jsc;
+package org.apache.royale.compiler.internal.codegen.js.jsc;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
+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.projects.RoyaleProject;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
 
 public class JSCPublisher extends MXMLRoyalePublisher
 {
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 cc1bbcb..10691ea 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
@@ -17,42 +17,42 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
 import java.util.HashMap;
 import java.util.Set;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.IMetaInfo;
-import org.apache.flex.compiler.common.ModifiersSet;
-import org.apache.flex.compiler.definitions.IAccessorDefinition;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.INamespaceDefinition;
-import org.apache.flex.compiler.definitions.IParameterDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTag;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.PropertyNodes;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.semantics.SemanticUtils;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.SetterNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.INamespaceDecorationNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.IMetaInfo;
+import org.apache.royale.compiler.common.ModifiersSet;
+import org.apache.royale.compiler.definitions.IAccessorDefinition;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.INamespaceDefinition;
+import org.apache.royale.compiler.definitions.IParameterDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.metadata.IMetaTag;
+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.goog.JSGoogDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.semantics.SemanticUtils;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.SetterNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.INamespaceDecorationNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
 
 public class AccessorEmitter extends JSSubEmitter implements
         ISubEmitter<IAccessorNode>
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 eff12e6..0acb4c4 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
@@ -17,23 +17,23 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.asdoc.flexjs.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.projects.RoyaleProject;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
 
 public class AsIsEmitter extends JSSubEmitter
 {
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 b082f61..94f8dbd 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
@@ -17,34 +17,34 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTag;
-import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.internal.tree.as.UnaryOperatorAtNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IDefinition;
+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.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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.tree.as.DynamicAccessNode;
+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.MemberAccessExpressionNode;
+import org.apache.royale.compiler.internal.tree.as.UnaryOperatorAtNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 public class BinaryOperatorEmitter extends JSSubEmitter implements
         ISubEmitter<IBinaryOperatorNode>
@@ -330,7 +330,7 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements
 		        		JSRoyaleDocEmitter docEmitter = (JSRoyaleDocEmitter)(getEmitter().getDocEmitter());
 		        		if (docEmitter.emitStringConversions)
 		        		{
-		        			coercion = "org.apache.flex.utils.Language.string(";
+		        			coercion = "org.apache.royale.utils.Language.string(";
 		        		}
 		        	}
             	}
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 89824ad..d809f10 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
@@ -17,19 +17,19 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+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.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.goog.JSGoogEmitterTokens;
 
 
 import java.util.ArrayList;
@@ -44,7 +44,7 @@ public class BindableEmitter extends JSSubEmitter implements
 
     public static String BINDABLE_DISPATCHER_NAME = "_bindingEventDispatcher";
     public static String STATIC_DISPATCHER_GETTER = "staticEventDispatcher";
-    public static String EVENTS_PACKAGE ="org.apache.flex.events";
+    public static String EVENTS_PACKAGE ="org.apache.royale.events";
     public static String EVENTDISPATCHER = "EventDispatcher";
     public static String EVENTDISPATCHER_INTERFACE = "IEventDispatcher";
     public static String EVENT = "Event";
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockCloseEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockCloseEmitter.java
index 058d132..1ba4eb3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockCloseEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockCloseEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IContainerNode;
 
 public class BlockCloseEmitter extends JSSubEmitter implements
         ISubEmitter<IContainerNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockOpenEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockOpenEmitter.java
index 5487d9c..0047cde 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockOpenEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BlockOpenEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IContainerNode;
 
 public class BlockOpenEmitter extends JSSubEmitter implements
         ISubEmitter<IContainerNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/CatchEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/CatchEmitter.java
index 876593c..12cb8bc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/CatchEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/CatchEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
 
 public class CatchEmitter extends JSSubEmitter implements
         ISubEmitter<ICatchNode>
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 91ed114..efe1474 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
@@ -17,31 +17,31 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.DocEmitterUtils;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+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.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.utils.DocEmitterUtils;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 public class ClassEmitter extends JSSubEmitter implements
         ISubEmitter<IClassNode>
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 91757e1..7bf3b20 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
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.IMetaInfo;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.tree.as.SetterNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+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.tree.as.SetterNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
 
 public class DefinePropertyFunctionEmitter extends JSSubEmitter implements
         ISubEmitter<IAccessorNode>
@@ -104,7 +104,7 @@ public class DefinePropertyFunctionEmitter extends JSSubEmitter implements
             writeNewline(ASEmitterTokens.SEMICOLON);
 
             // add dispatch of change event
-            writeNewline("    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(");
+            writeNewline("    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(");
             writeNewline("         this, \"" + node.getName()
                     + "\", oldValue, " + params[0].getName() + "));");
             write(ASEmitterTokens.BLOCK_CLOSE);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DoWhileLoopEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DoWhileLoopEmitter.java
index e087bcd..d791bcc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DoWhileLoopEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DoWhileLoopEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
 
 public class DoWhileLoopEmitter extends JSSubEmitter implements
         ISubEmitter<IWhileLoopNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DynamicAccessEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DynamicAccessEmitter.java
index 39321b7..ae977f9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DynamicAccessEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/DynamicAccessEmitter.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
 
 public class DynamicAccessEmitter extends JSSubEmitter implements
         ISubEmitter<IDynamicAccessNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
index 4dc67c0..7bb9d76 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FieldEmitter.java
@@ -17,33 +17,33 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.ModifiersSet;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.goog.IJSGoogDocEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.ModifiersSet;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+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.BindableVarInfo;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+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.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
 
 public class FieldEmitter extends JSSubEmitter implements
         ISubEmitter<IVariableNode>
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 e353c78..5ee933c 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
@@ -17,27 +17,27 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+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.tree.as.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.internal.tree.as.MemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 public class ForEachEmitter extends JSSubEmitter implements
         ISubEmitter<IForLoopNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForLoopEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForLoopEmitter.java
index 6a67dcd..febe699 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForLoopEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ForLoopEmitter.java
@@ -16,17 +16,17 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
 
 public class ForLoopEmitter extends JSSubEmitter implements
         ISubEmitter<IForLoopNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallArgumentsEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallArgumentsEmitter.java
index f875e92..bca4c59 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallArgumentsEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/FunctionCallArgumentsEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
 
 public class FunctionCallArgumentsEmitter extends JSSubEmitter implements
         ISubEmitter<IContainerNode>
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 f99d29b..a07b81c 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
@@ -17,34 +17,34 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.IASGlobalFunctionConstants;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.AppliedVectorDefinition;
-import org.apache.flex.compiler.internal.definitions.ClassDefinition;
-import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.ContainerNode;
-import org.apache.flex.compiler.internal.tree.as.VectorLiteralNode;
-import org.apache.flex.compiler.problems.TooFewFunctionParametersProblem;
-import org.apache.flex.compiler.problems.TooManyFunctionParametersProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.codegen.IASGlobalFunctionConstants;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.AppliedVectorDefinition;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
+import org.apache.royale.compiler.internal.definitions.InterfaceDefinition;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.ContainerNode;
+import org.apache.royale.compiler.internal.tree.as.VectorLiteralNode;
+import org.apache.royale.compiler.problems.TooFewFunctionParametersProblem;
+import org.apache.royale.compiler.problems.TooManyFunctionParametersProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 public class FunctionCallEmitter extends JSSubEmitter implements ISubEmitter<IFunctionCallNode>
 {
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 11db9e9..4d1a97e 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
@@ -17,33 +17,33 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition.FunctionClassification;
-import org.apache.flex.compiler.definitions.INamespaceDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition.VariableClassification;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.definitions.TypeDefinitionBase;
-import org.apache.flex.compiler.internal.tree.as.NonResolvingIdentifierNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition.FunctionClassification;
+import org.apache.royale.compiler.definitions.INamespaceDefinition;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.definitions.TypeDefinitionBase;
+import org.apache.royale.compiler.internal.tree.as.NonResolvingIdentifierNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 public class IdentifierEmitter extends JSSubEmitter implements
         ISubEmitter<IIdentifierNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IfEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IfEmitter.java
index 5370a95..74ca31c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IfEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IfEmitter.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IConditionalNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IConditionalNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
 
 public class IfEmitter extends JSSubEmitter implements
         ISubEmitter<IIfNode>
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 2aa611f..4f6c69c 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
@@ -17,25 +17,25 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSDocEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+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.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
 
 public class InterfaceEmitter extends JSSubEmitter implements
         ISubEmitter<IInterfaceNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IterationFlowEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IterationFlowEmitter.java
index 25c2d10..2ed547f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IterationFlowEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/IterationFlowEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
 
 public class IterationFlowEmitter extends JSSubEmitter implements
         ISubEmitter<IIterationFlowNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LanguageIdentifierEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LanguageIdentifierEmitter.java
index d951b4f..80b50e9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LanguageIdentifierEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LanguageIdentifierEmitter.java
@@ -16,14 +16,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
 
 public class LanguageIdentifierEmitter extends JSSubEmitter implements
         ISubEmitter<ILanguageIdentifierNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralContainerEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralContainerEmitter.java
index 5e0fdce..45fc4e8 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralContainerEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralContainerEmitter.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.ILiteralContainerNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.ILiteralContainerNode;
 
 public class LiteralContainerEmitter extends JSSubEmitter implements
         ISubEmitter<ILiteralContainerNode>
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 b26309c..4e7a3e1 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
@@ -17,27 +17,27 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Stack;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.IMetaInfo;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.tree.as.LiteralNode;
-import org.apache.flex.compiler.internal.tree.as.RegExpLiteralNode;
-import org.apache.flex.compiler.internal.tree.as.XMLLiteralNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode.LiteralType;
-import org.apache.flex.utils.JSXUtil;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+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.tree.as.LiteralNode;
+import org.apache.royale.compiler.internal.tree.as.RegExpLiteralNode;
+import org.apache.royale.compiler.internal.tree.as.XMLLiteralNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode.LiteralType;
+import org.apache.royale.utils.JSXUtil;
 
 public class LiteralEmitter extends JSSubEmitter implements
         ISubEmitter<ILiteralNode>
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 a69b87e..f1a57c7 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
@@ -17,35 +17,35 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter.DatePropertiesGetters;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.GetterNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IOperatorNode.OperatorType;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.jx.BinaryOperatorEmitter.DatePropertiesGetters;
+import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.tree.as.DynamicAccessNode;
+import org.apache.royale.compiler.internal.tree.as.FunctionCallNode;
+import org.apache.royale.compiler.internal.tree.as.GetterNode;
+import org.apache.royale.compiler.internal.tree.as.IdentifierNode;
+import org.apache.royale.compiler.internal.tree.as.MemberAccessExpressionNode;
+import org.apache.royale.compiler.internal.tree.as.NamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IOperatorNode.OperatorType;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 public class MemberAccessEmitter extends JSSubEmitter implements
         ISubEmitter<IMemberAccessExpressionNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberKeywordEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberKeywordEmitter.java
index 3f71c78..02bb788 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberKeywordEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberKeywordEmitter.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 public class MemberKeywordEmitter extends JSSubEmitter implements
         ISubEmitter<IDefinitionNode>
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 70f995e..9c7158d 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
@@ -17,29 +17,29 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
 import java.util.ArrayList;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+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.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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
 
 public class MethodEmitter extends JSSubEmitter implements
         ISubEmitter<IFunctionNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/NumericLiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/NumericLiteralEmitter.java
index 604d1d6..256c76c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/NumericLiteralEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/NumericLiteralEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
 
 public class NumericLiteralEmitter extends JSSubEmitter implements
         ISubEmitter<INumericLiteralNode>
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 39218a4..b9c59db 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
@@ -17,23 +17,23 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.IMetaInfo;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.SetterNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.IMetaInfo;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.SetterNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
 
 public class ObjectDefinePropertyEmitter extends JSSubEmitter implements
         ISubEmitter<IAccessorNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
index ad12b77..4933dfe 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ObjectLiteralValuePairEmitter.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
 
 public class ObjectLiteralValuePairEmitter extends JSSubEmitter implements
         ISubEmitter<IObjectLiteralValuePairNode>
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 45cab90..34bdc71 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
@@ -17,35 +17,35 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
 import java.util.*;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.ModifiersSet;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.definitions.*;
-import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.SetterNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.scopes.IASScope;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.*;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.ModifiersSet;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.definitions.*;
+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.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.utils.EmitterUtils;
+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.SetterNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.scopes.IASScope;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.*;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
 
 public class PackageFooterEmitter extends JSSubEmitter implements
         ISubEmitter<IPackageDefinition>
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 760858e..91a147d 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -26,32 +26,32 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.*;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.ImplicitBindableImplementation;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.node.NodeEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.ClassDefinition;
-import org.apache.flex.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.scopes.ASProjectScope;
-import org.apache.flex.compiler.internal.scopes.PackageScope;
-import org.apache.flex.compiler.internal.tree.as.ClassNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.scopes.IASScope;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.utils.NativeUtils;
-import org.apache.flex.compiler.utils.NodeJSUtils;
+import org.apache.royale.compiler.asdoc.flexjs.ASDocComment;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.node.NodeEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
+import org.apache.royale.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.scopes.ASProjectScope;
+import org.apache.royale.compiler.internal.scopes.PackageScope;
+import org.apache.royale.compiler.internal.tree.as.ClassNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.scopes.IASScope;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.utils.NodeJSUtils;
 
 public class PackageHeaderEmitter extends JSSubEmitter implements
         ISubEmitter<IPackageDefinition>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParameterEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParameterEmitter.java
index 176feef..31ed093 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParameterEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParameterEmitter.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IParameterNode;
 
 public class ParameterEmitter extends JSSubEmitter implements
         ISubEmitter<IParameterNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParametersEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParametersEmitter.java
index 01e1f25..6351f33 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParametersEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ParametersEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
 
 public class ParametersEmitter extends JSSubEmitter implements
         ISubEmitter<IContainerNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ReturnEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ReturnEmitter.java
index 407b80c..a7f5d7e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ReturnEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ReturnEmitter.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
 
 public class ReturnEmitter extends JSSubEmitter implements
         ISubEmitter<IReturnNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SelfReferenceEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SelfReferenceEmitter.java
index 5f7e860..b5855e7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SelfReferenceEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SelfReferenceEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
 
 public class SelfReferenceEmitter extends JSSubEmitter implements
         ISubEmitter<IFunctionNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
index ee4f2b3..7a44225 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SourceMapDirectiveEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 public class SourceMapDirectiveEmitter extends JSSubEmitter implements
         ISubEmitter<ITypeNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/StatementEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/StatementEmitter.java
index 40e933e..e58208c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/StatementEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/StatementEmitter.java
@@ -16,15 +16,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IStatementNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IStatementNode;
 
 public class StatementEmitter extends JSSubEmitter implements
         ISubEmitter<IASNode>
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 81c4a0d..5dab3ab 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
@@ -17,31 +17,31 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.INamespaceDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAssignmentNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+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.definitions.INamespaceDefinition;
+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.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.tree.as.BinaryOperatorAssignmentNode;
+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.MemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
 
 public class SuperCallEmitter extends JSSubEmitter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SwitchEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SwitchEmitter.java
index 7a5fe0d..b647f7a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SwitchEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SwitchEmitter.java
@@ -17,20 +17,20 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IConditionalNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IConditionalNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 public class SwitchEmitter extends JSSubEmitter implements
         ISubEmitter<ISwitchNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TernaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TernaryOperatorEmitter.java
index 8273e1b..3e66b22 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TernaryOperatorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TernaryOperatorEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IOperatorNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IOperatorNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 public class TernaryOperatorEmitter extends JSSubEmitter implements
         ISubEmitter<ITernaryOperatorNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ThrowEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ThrowEmitter.java
index dbd53f7..948d95c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ThrowEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/ThrowEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.IThrowNode;
 
 public class ThrowEmitter extends JSSubEmitter implements
         ISubEmitter<IThrowNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TryEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TryEmitter.java
index 268925b..943ba73 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TryEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/TryEmitter.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
 
 public class TryEmitter extends JSSubEmitter implements
         ISubEmitter<ITryNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/UnaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/UnaryOperatorEmitter.java
index 88bb154..b575d55 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/UnaryOperatorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/UnaryOperatorEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.utils.ASNodeUtils;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.utils.ASNodeUtils;
 
 public class UnaryOperatorEmitter extends JSSubEmitter implements
         ISubEmitter<IUnaryOperatorNode>
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 6b3f343..6cd84d1 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
@@ -17,30 +17,30 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTag;
-import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
-import org.apache.flex.compiler.internal.tree.as.DynamicAccessNode;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IDefinition;
+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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.ChainedVariableNode;
+import org.apache.royale.compiler.internal.tree.as.DynamicAccessNode;
+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.MemberAccessExpressionNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 
 public class VarDeclarationEmitter extends JSSubEmitter implements
         ISubEmitter<IVariableNode>
@@ -171,7 +171,7 @@ public class VarDeclarationEmitter extends JSSubEmitter implements
                 	((IdentifierNode)variableTypeNode).getName().equals(IASLanguageConstants.String) &&
                 	(avdef == null || (!avdef.getQualifiedName().equals(IASLanguageConstants.String) &&
                 			            !avdef.getQualifiedName().equals(IASLanguageConstants.Null))))
-                	coercion = "org.apache.flex.utils.Language.string(";
+                	coercion = "org.apache.royale.utils.Language.string(";
             write(coercion);
             fjs.emitAssignedValue(avnode);
             if (coercion.length() > 0)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WhileLoopEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WhileLoopEmitter.java
index 54f663d..2bd7da3 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WhileLoopEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WhileLoopEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
-
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
+package org.apache.royale.compiler.internal.codegen.js.jx;
+
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
 
 public class WhileLoopEmitter extends JSSubEmitter implements
         ISubEmitter<IWhileLoopNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WithEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WithEmitter.java
index 934bfab..32f9258 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WithEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/WithEmitter.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.jx;
+package org.apache.royale.compiler.internal.codegen.js.jx;
 
-import org.apache.flex.compiler.codegen.ISubEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.codegen.ISubEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.utils.EmitterUtils;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
 
 public class WithEmitter extends JSSubEmitter implements
         ISubEmitter<IWithNode>
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodeEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodeEmitterTokens.java
index 1a745d4..43a2d44 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodeEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodeEmitterTokens.java
@@ -16,9 +16,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.node;
+package org.apache.royale.compiler.internal.codegen.js.node;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 public enum NodeEmitterTokens implements IEmitterTokens
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodePublisher.java
index a72284b..c63d941 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/node/NodePublisher.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.node;
+package org.apache.royale.compiler.internal.codegen.js.node;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.internal.codegen.js.jsc.JSCPublisher;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.internal.codegen.js.jsc.JSCPublisher;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
 
 import java.io.File;
 import java.io.IOException;
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 34fc7d4..c2dc9d8 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
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.utils;
+package org.apache.royale.compiler.internal.codegen.js.utils;
 
 import java.util.ArrayList;
 
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
+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;
 
 public class DocEmitterUtils
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
index fc56f4d..2729cab 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.utils;
+package org.apache.royale.compiler.internal.codegen.js.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,43 +28,43 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition;
-import org.apache.flex.compiler.definitions.IFunctionDefinition.FunctionClassification;
-import org.apache.flex.compiler.definitions.INamespaceDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.IVariableDefinition;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel;
-import org.apache.flex.compiler.internal.definitions.AccessorDefinition;
-import org.apache.flex.compiler.internal.definitions.ClassDefinition;
-import org.apache.flex.compiler.internal.definitions.FunctionDefinition;
-import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.flex.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
-import org.apache.flex.compiler.internal.definitions.ParameterDefinition;
-import org.apache.flex.compiler.internal.definitions.VariableDefinition;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.scopes.TypeScope;
-import org.apache.flex.compiler.internal.tree.as.ContainerNode;
-import org.apache.flex.compiler.internal.tree.as.NodeBase;
-import org.apache.flex.compiler.internal.tree.as.ParameterNode;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IScopedNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition;
+import org.apache.royale.compiler.definitions.IFunctionDefinition.FunctionClassification;
+import org.apache.royale.compiler.definitions.INamespaceDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.IVariableDefinition;
+import org.apache.royale.compiler.internal.codegen.js.JSSessionModel;
+import org.apache.royale.compiler.internal.definitions.AccessorDefinition;
+import org.apache.royale.compiler.internal.definitions.ClassDefinition;
+import org.apache.royale.compiler.internal.definitions.FunctionDefinition;
+import org.apache.royale.compiler.internal.definitions.InterfaceDefinition;
+import org.apache.royale.compiler.internal.definitions.NamespaceDefinition.INamepaceDeclarationDirective;
+import org.apache.royale.compiler.internal.definitions.ParameterDefinition;
+import org.apache.royale.compiler.internal.definitions.VariableDefinition;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.scopes.TypeScope;
+import org.apache.royale.compiler.internal.tree.as.ContainerNode;
+import org.apache.royale.compiler.internal.tree.as.NodeBase;
+import org.apache.royale.compiler.internal.tree.as.ParameterNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IScopedNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.utils.NativeUtils;
 
 /**
  * Various static methods used in shared emitter logic.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
index 76cfd9b..7527811 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLBlockWalker.java
@@ -17,49 +17,49 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.IASProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLImplementsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLMetadataNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLObjectNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStringNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLUintNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockVisitor;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.IASProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLArrayNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDataBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeclarationsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeferredInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEmbedNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFactoryNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLImplementsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLIntNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLLiteralNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLUintNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLVectorNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockVisitor;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
index bba7f23..22c73be 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitter.java
@@ -17,44 +17,44 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
 import java.io.FilterWriter;
 
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.internal.codegen.Emitter;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLImplementsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLMetadataNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLObjectNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStringNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLUintNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.internal.codegen.Emitter;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLArrayNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLClassNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDataBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeclarationsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEmbedNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFactoryNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLImplementsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLIntNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLLiteralNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLUintNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLVectorNode;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * The base implementation for an MXML emitter.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitterTokens.java
index 3d8a4e9..7bb4324 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLEmitterTokens.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLWriter.java
index 20c47d6..e955c5e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/MXMLWriter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -26,18 +26,18 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.ISourceMapEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.driver.js.IJSBackend;
-import org.apache.flex.compiler.internal.codegen.js.JSFilterWriter;
-import org.apache.flex.compiler.internal.codegen.js.JSWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.ISourceMapEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.driver.js.IJSBackend;
+import org.apache.royale.compiler.internal.codegen.js.JSFilterWriter;
+import org.apache.royale.compiler.internal.codegen.js.JSWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 public class MXMLWriter extends JSWriter
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
index 2f1e9cf..a25f90e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLDescriptorSpecifier.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import java.util.ArrayList;
 
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLEventSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLEventSpecifier.java
index d2a390c..b36d8b5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLEventSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLEventSpecifier.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java
index 56b84fb..f89a690 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSASDocEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 
 import java.io.FilterWriter;
@@ -27,27 +27,27 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase;
-import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.flex.compiler.internal.projects.FlexProject;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.*;
-import org.apache.flex.compiler.tree.mxml.*;
-import org.apache.flex.compiler.utils.NativeUtils;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+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.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.utils.EmitterUtils;
+import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
+import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.*;
+import org.apache.royale.compiler.tree.mxml.*;
+import org.apache.royale.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * @author Erik de Bruin
@@ -318,7 +318,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter implements
                 indentPush();
                 writeNewline("if (value != this." + instance.id + "_) {");
                 writeNewline("this." + instance.id + "_ = value;");
-                write("this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, '");
+                write("this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(this, '");
                 indentPop();
                 writeNewline(instance.id + "', null, value));");
                 indentPop();
@@ -1076,7 +1076,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter implements
     public void emitFactory(IMXMLFactoryNode node)
     {
         MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
-        ps.value = "new " + formatQualifiedName("org.apache.flex.core.ClassFactory") + "(";
+        ps.value = "new " + formatQualifiedName("org.apache.royale.core.ClassFactory") + "(";
 
         IASNode cnode = node.getChild(0);
         if (cnode instanceof IMXMLClassNode)
@@ -1092,7 +1092,7 @@ public class MXMLRoyaleASDocEmitter extends MXMLEmitter implements
     public void emitComponent(IMXMLComponentNode node)
     {
         MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
-        ps.value = "new " + formatQualifiedName("org.apache.flex.core.ClassFactory") + "(";
+        ps.value = "new " + formatQualifiedName("org.apache.royale.core.ClassFactory") + "(";
 
         ps.value += formatQualifiedName(documentDefinition.getQualifiedName()) + ".";
         ps.value += formatQualifiedName(node.getName());
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java
index d877c96..b95c27a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSBlockWalker.java
@@ -17,21 +17,21 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.css.codegen.CSSCompilationSession;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.IASProject;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleNode;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+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.internal.codegen.mxml.MXMLBlockWalker;
+import org.apache.royale.compiler.internal.css.codegen.CSSCompilationSession;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.IASProject;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java
index 1852296..79dcda9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSCordovaPublisher.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 6b5b00b..4c76423 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 
 import java.io.File;
@@ -30,59 +30,59 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
-import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.constants.IASKeywordConstants;
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase;
-import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo;
-import org.apache.flex.compiler.internal.codegen.databinding.FunctionWatcherInfo;
-import org.apache.flex.compiler.internal.codegen.databinding.PropertyWatcherInfo;
-import org.apache.flex.compiler.internal.codegen.databinding.StaticPropertyWatcherInfo;
-import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase;
-import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType;
-import org.apache.flex.compiler.internal.codegen.databinding.XMLWatcherInfo;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.PropertyNodes;
-import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter;
-import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.flex.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.FlexProject;
-import org.apache.flex.compiler.internal.scopes.ASProjectScope;
-import org.apache.flex.compiler.internal.targets.ITargetAttributes;
-import org.apache.flex.compiler.internal.tree.as.FunctionCallNode;
-import org.apache.flex.compiler.internal.tree.as.IdentifierNode;
-import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
-import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode;
-import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode;
-import org.apache.flex.compiler.mxml.IMXMLLanguageConstants;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.*;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
-import org.apache.flex.compiler.tree.mxml.*;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.utils.NativeUtils;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
-import org.apache.flex.swc.ISWC;
+import org.apache.royale.abc.semantics.MethodInfo;
+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.js.IMappingEmitter;
+import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.common.ASModifier;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+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.databinding.FunctionWatcherInfo;
+import org.apache.royale.compiler.internal.codegen.databinding.PropertyWatcherInfo;
+import org.apache.royale.compiler.internal.codegen.databinding.StaticPropertyWatcherInfo;
+import org.apache.royale.compiler.internal.codegen.databinding.WatcherInfoBase;
+import org.apache.royale.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType;
+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.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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.scopes.ASProjectScope;
+import org.apache.royale.compiler.internal.targets.ITargetAttributes;
+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.MemberAccessExpressionNode;
+import org.apache.royale.compiler.internal.tree.mxml.MXMLDocumentNode;
+import org.apache.royale.compiler.internal.tree.mxml.MXMLFileNode;
+import org.apache.royale.compiler.mxml.IMXMLLanguageConstants;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.*;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.tree.mxml.*;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.utils.NativeUtils;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.swc.ISWC;
 
 import com.google.common.base.Joiner;
 import com.google.debugging.sourcemap.FilePosition;
@@ -1653,7 +1653,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
                 indentPush();
                 writeNewline("if (value != this." + instance.id + "_) {");
                 writeNewline("this." + instance.id + "_ = value;");
-                write("this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(this, '");
+                write("this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(this, '");
                 indentPop();
                 writeNewline(instance.id + "', null, value));");
                 indentPop();
@@ -2490,7 +2490,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
     public void emitFactory(IMXMLFactoryNode node)
     {
         MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
-        ps.value = "new " + formatQualifiedName("org.apache.flex.core.ClassFactory") + "(";
+        ps.value = "new " + formatQualifiedName("org.apache.royale.core.ClassFactory") + "(";
 
         IASNode cnode = node.getChild(0);
         if (cnode instanceof IMXMLClassNode)
@@ -2506,7 +2506,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
     public void emitComponent(IMXMLComponentNode node)
     {
         MXMLDescriptorSpecifier ps = getCurrentDescriptor("ps");
-        ps.value = "new " + formatQualifiedName("org.apache.flex.core.ClassFactory") + "(";
+        ps.value = "new " + formatQualifiedName("org.apache.royale.core.ClassFactory") + "(";
 
         ps.value += formatQualifiedName(documentDefinition.getQualifiedName()) + ".";
         ps.value += formatQualifiedName(node.getName());
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitterTokens.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitterTokens.java
index 5b24d82..e25fb1c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitterTokens.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitterTokens.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
index 96ec6e4..a5cad9f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import com.google.javascript.jscomp.SourceFile;
 import org.apache.commons.io.FileUtils;
@@ -26,23 +26,23 @@ import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.codegen.js.IJSPublisher;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.css.ICSSPropertyValue;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogPublisher;
-import org.apache.flex.compiler.internal.codegen.js.goog.JarSourceFile;
-import org.apache.flex.compiler.internal.css.CSSArrayPropertyValue;
-import org.apache.flex.compiler.internal.css.CSSFontFace;
-import org.apache.flex.compiler.internal.css.CSSFunctionCallPropertyValue;
-import org.apache.flex.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.graph.GoogDepsWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.ITargetAttributes;
-import org.apache.flex.compiler.utils.JSClosureCompilerWrapper;
-import org.apache.flex.swc.ISWC;
-import org.apache.flex.swc.ISWCFileEntry;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.codegen.js.IJSPublisher;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.css.ICSSPropertyValue;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogPublisher;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.graph.GoogDepsWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.ITargetAttributes;
+import org.apache.royale.compiler.utils.JSClosureCompilerWrapper;
+import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.ISWCFileEntry;
 
 import java.io.*;
 import java.net.URL;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLNodeSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLNodeSpecifier.java
index 12fb7f6..6605587 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLNodeSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLNodeSpecifier.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
-import org.apache.flex.compiler.codegen.IEmitterTokens;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
+import org.apache.royale.compiler.codegen.IEmitterTokens;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLScriptSpecifier.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLScriptSpecifier.java
index c2f3824..8511608 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLScriptSpecifier.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/MXMLScriptSpecifier.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 
 /**
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 2969711..3bff13b 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
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.mxml.jsc;
+package org.apache.royale.compiler.internal.codegen.mxml.jsc;
 
 
 import java.io.FilterWriter;
 
-import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
+import org.apache.royale.compiler.codegen.mxml.flexjs.IMXMLRoyaleEmitter;
+import org.apache.royale.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/as/ASBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/as/ASBackend.java
index d853313..8a5ddc2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/as/ASBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/as/ASBackend.java
@@ -17,40 +17,40 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.as;
+package org.apache.royale.compiler.internal.driver.as;
 
 import java.io.FilterWriter;
 import java.io.StringWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.as.IASWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.IPublisher;
-import org.apache.flex.compiler.internal.codegen.as.ASAfterNodeStrategy;
-import org.apache.flex.compiler.internal.codegen.as.ASBeforeNodeStrategy;
-import org.apache.flex.compiler.internal.codegen.as.ASBlockWalker;
-import org.apache.flex.compiler.internal.codegen.as.ASEmitter;
-import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter;
-import org.apache.flex.compiler.internal.codegen.as.ASWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.as.BeforeAfterStrategy;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.as.IASWriter;
+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.driver.IPublisher;
+import org.apache.royale.compiler.internal.codegen.as.ASAfterNodeStrategy;
+import org.apache.royale.compiler.internal.codegen.as.ASBeforeNodeStrategy;
+import org.apache.royale.compiler.internal.codegen.as.ASBlockWalker;
+import org.apache.royale.compiler.internal.codegen.as.ASEmitter;
+import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter;
+import org.apache.royale.compiler.internal.codegen.as.ASWriter;
+import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.as.BeforeAfterStrategy;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSApplication.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSApplication.java
index edfd686..25d0148 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSApplication.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSApplication.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js;
+package org.apache.royale.compiler.internal.driver.js;
 
-import org.apache.flex.compiler.driver.js.IJSApplication;
+import org.apache.royale.compiler.driver.js.IJSApplication;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSBackend.java
index ea7563c..571e6e7 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSBackend.java
@@ -17,47 +17,47 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js;
+package org.apache.royale.compiler.internal.driver.js;
 
 import java.io.FilterWriter;
 import java.io.StringWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.ISourceMapEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.IPublisher;
-import org.apache.flex.compiler.driver.js.IJSBackend;
-import org.apache.flex.compiler.internal.codegen.as.ASAfterNodeStrategy;
-import org.apache.flex.compiler.internal.codegen.as.ASBeforeNodeStrategy;
-import org.apache.flex.compiler.internal.codegen.as.ASBlockWalker;
-import org.apache.flex.compiler.internal.codegen.js.JSDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSFilterWriter;
-import org.apache.flex.compiler.internal.codegen.js.JSPublisher;
-import org.apache.flex.compiler.internal.codegen.js.JSSourceMapEmitter;
-import org.apache.flex.compiler.internal.codegen.js.JSWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.as.BeforeAfterStrategy;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.ISourceMapEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+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.driver.IPublisher;
+import org.apache.royale.compiler.driver.js.IJSBackend;
+import org.apache.royale.compiler.internal.codegen.as.ASAfterNodeStrategy;
+import org.apache.royale.compiler.internal.codegen.as.ASBeforeNodeStrategy;
+import org.apache.royale.compiler.internal.codegen.as.ASBlockWalker;
+import org.apache.royale.compiler.internal.codegen.js.JSDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSFilterWriter;
+import org.apache.royale.compiler.internal.codegen.js.JSPublisher;
+import org.apache.royale.compiler.internal.codegen.js.JSSourceMapEmitter;
+import org.apache.royale.compiler.internal.codegen.js.JSWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.as.BeforeAfterStrategy;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSCompilationUnit.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSCompilationUnit.java
index 6583f3a..dd49e61 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSCompilationUnit.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSCompilationUnit.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js;
+package org.apache.royale.compiler.internal.driver.js;
 
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.flex.compiler.common.DependencyType;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.units.requests.IOutgoingDependenciesRequestResult;
+import org.apache.royale.compiler.common.DependencyType;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.units.requests.IOutgoingDependenciesRequestResult;
 
 /**
  * JSCompilationUnit is the CompilationUnit for compiling ActionScript source
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
index d2dd3c3..f8afad1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
@@ -17,20 +17,20 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js;
+package org.apache.royale.compiler.internal.driver.js;
 
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
  * Implementation of ISourceFileHandler that constructs
  * {@link ASCompilationUnit}'s. JSSourceFileHandler is the SourceFileHandler
  * that provides JSCompilationUnit for *.as files. JSDriver registers
  * JSSourceFileHandler at FlexApplicationProject. This implementation is part of
- * FalconJS. For more details on FalconJS see org.apache.flex.compiler.JSDriver
+ * FalconJS. For more details on FalconJS see org.apache.royale.compiler.JSDriver
  */
 public final class JSSourceFileHandler implements ISourceFileHandler
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/amd/AMDBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/amd/AMDBackend.java
index e3c68de..ca3174d 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/amd/AMDBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/amd/AMDBackend.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.amd;
+package org.apache.royale.compiler.internal.driver.js.amd;
 
 import java.io.FilterWriter;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.amd.JSAMDDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.amd.JSAMDEmitter;
-import org.apache.flex.compiler.internal.driver.js.JSBackend;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.js.amd.JSAMDDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.amd.JSAMDEmitter;
+import org.apache.royale.compiler.internal.driver.js.JSBackend;
 
 /**
  * A concrete implementation of the {@link IBackend} API for 'AMD' code
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/FlexJSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/FlexJSBackend.java
index 24b2643..8b86675 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/FlexJSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/FlexJSBackend.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.flexjs;
+package org.apache.royale.compiler.internal.driver.js.flexjs;
 
 import java.io.FilterWriter;
 
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.internal.codegen.js.flexjs.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;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
index b96e410..0acebd1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/flexjs/JSCSSCompilationSession.java
@@ -16,23 +16,23 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.driver.js.flexjs;
+package org.apache.royale.compiler.internal.driver.js.flexjs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.flex.compiler.constants.IASLanguageConstants;
-import org.apache.flex.compiler.css.ICSSDocument;
-import org.apache.flex.compiler.css.ICSSMediaQueryCondition;
-import org.apache.flex.compiler.css.ICSSProperty;
-import org.apache.flex.compiler.css.ICSSPropertyValue;
-import org.apache.flex.compiler.css.ICSSRule;
-import org.apache.flex.compiler.css.ICSSSelector;
-import org.apache.flex.compiler.css.ICSSSelectorCondition;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.css.*;
-import org.apache.flex.compiler.internal.css.codegen.CSSCompilationSession;
+import org.apache.royale.compiler.constants.IASLanguageConstants;
+import org.apache.royale.compiler.css.ICSSDocument;
+import org.apache.royale.compiler.css.ICSSMediaQueryCondition;
+import org.apache.royale.compiler.css.ICSSProperty;
+import org.apache.royale.compiler.css.ICSSPropertyValue;
+import org.apache.royale.compiler.css.ICSSRule;
+import org.apache.royale.compiler.css.ICSSSelector;
+import org.apache.royale.compiler.css.ICSSSelectorCondition;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.css.*;
+import org.apache.royale.compiler.internal.css.codegen.CSSCompilationSession;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/ASDocConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/ASDocConfiguration.java
index 7bae8db..65201c5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/ASDocConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/ASDocConfiguration.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.goog;
+package org.apache.royale.compiler.internal.driver.js.goog;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,10 +25,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationInfo;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationInfo;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
 
 /**
  * A Configuration to override some behaviors of the default configuration.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/GoogBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/GoogBackend.java
index 3936f61..d0aac2b 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/GoogBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/GoogBackend.java
@@ -17,23 +17,23 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.goog;
+package org.apache.royale.compiler.internal.driver.js.goog;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogPublisher;
-import org.apache.flex.compiler.internal.driver.js.JSBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.goog.JSGoogDocEmitter;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitter;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogPublisher;
+import org.apache.royale.compiler.internal.driver.js.JSBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 
 /**
  * A concrete implementation of the {@link IBackend} API for the 'goog' code
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
index d53fffe..30d4b85 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogCompcConfiguration.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.goog;
+package org.apache.royale.compiler.internal.driver.js.goog;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,15 +28,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.clients.MXMLJSC;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.config.annotations.Arguments;
-import org.apache.flex.compiler.internal.config.annotations.Config;
-import org.apache.flex.compiler.internal.config.annotations.FlexOnly;
-import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
-import org.apache.flex.compiler.internal.config.annotations.Mapping;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.clients.MXMLJSC;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.internal.config.annotations.Arguments;
+import org.apache.royale.compiler.internal.config.annotations.Config;
+import org.apache.royale.compiler.internal.config.annotations.FlexOnly;
+import org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
+import org.apache.royale.compiler.internal.config.annotations.Mapping;
 
 /**
  * The {@link JSGoogCompcConfiguration} class holds all compiler arguments needed for
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
index d1dc80a..0963110 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/goog/JSGoogConfiguration.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.goog;
+package org.apache.royale.compiler.internal.driver.js.goog;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,15 +28,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.clients.MXMLJSC;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.config.annotations.Arguments;
-import org.apache.flex.compiler.internal.config.annotations.Config;
-import org.apache.flex.compiler.internal.config.annotations.FlexOnly;
-import org.apache.flex.compiler.internal.config.annotations.InfiniteArguments;
-import org.apache.flex.compiler.internal.config.annotations.Mapping;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.clients.MXMLJSC;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.internal.config.annotations.Arguments;
+import org.apache.royale.compiler.internal.config.annotations.Config;
+import org.apache.royale.compiler.internal.config.annotations.FlexOnly;
+import org.apache.royale.compiler.internal.config.annotations.InfiniteArguments;
+import org.apache.royale.compiler.internal.config.annotations.Mapping;
 
 /**
  * The {@link JSGoogConfiguration} class holds all compiler arguments needed for
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 b742a89..3c4518a 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
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.jsc;
+package org.apache.royale.compiler.internal.driver.js.jsc;
 
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.jsc.JSCPublisher;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.driver.mxml.jsc.MXMLJSCJSBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
+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.driver.mxml.jsc.MXMLJSCJSBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 
 /**
  * A concrete implementation of the {@link IBackend} API for the 'jsc' code
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 ced3bae..8098d84 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
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.node;
+package org.apache.royale.compiler.internal.driver.js.node;
 
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.node.NodePublisher;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
+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.driver.js.jsc.JSCBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 
 /**
  * A concrete implementation of the {@link IBackend} API for the 'node' code
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 a174a8e..7b0959d 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
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.js.node;
+package org.apache.royale.compiler.internal.driver.js.node;
 
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.node.NodePublisher;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.driver.js.jsc.JSCBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
+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.driver.js.jsc.JSCBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 
 /**
  * A concrete implementation of the {@link IBackend} API for Node.js modules.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
index 0edac6c..358671c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml;
+package org.apache.royale.compiler.internal.driver.mxml;
 
-import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.internal.driver.js.goog.ASDocConfiguration;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
  * Implementation of ISourceFileHandler that constructs
@@ -33,7 +33,7 @@ import org.apache.flex.compiler.units.ICompilationUnit;
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
  * of FalconJS. For more details on FalconJS see
- * org.apache.flex.compiler.JSDriver
+ * org.apache.royale.compiler.JSDriver
  */
 public final class ASDocASSourceFileHandler implements ISourceFileHandler
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
index c07a73e..181498a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml;
+package org.apache.royale.compiler.internal.driver.mxml;
 
-import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.internal.units.MXMLCompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.internal.driver.js.goog.ASDocConfiguration;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.internal.units.MXMLCompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
  * Implementation of ISourceFileHandler that constructs
@@ -34,7 +34,7 @@ import org.apache.flex.compiler.units.ICompilationUnit;
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
  * of FalconJS. For more details on FalconJS see
- * org.apache.flex.compiler.JSDriver
+ * org.apache.royale.compiler.JSDriver
  */
 public final class ASDocMXMLSourceFileHandler implements ISourceFileHandler
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLBackend.java
index 6cbf5a8..8f80229 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLBackend.java
@@ -17,26 +17,26 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml;
+package org.apache.royale.compiler.internal.driver.mxml;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter;
-import org.apache.flex.compiler.internal.driver.js.JSBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.mxml.MXMLBlockWalker;
+import org.apache.royale.compiler.internal.codegen.mxml.MXMLEmitter;
+import org.apache.royale.compiler.internal.driver.js.JSBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
index ef147b2..3d82648 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml;
+package org.apache.royale.compiler.internal.driver.mxml;
 
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.internal.units.MXMLCompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.internal.units.MXMLCompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
  * Implementation of ISourceFileHandler that constructs
@@ -32,7 +32,7 @@ import org.apache.flex.compiler.units.ICompilationUnit;
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at FlexApplicationProject. This implementation is part
  * of FalconJS. For more details on FalconJS see
- * org.apache.flex.compiler.JSDriver
+ * org.apache.royale.compiler.JSDriver
  */
 public final class MXMLSourceFileHandler implements ISourceFileHandler
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java
index 3e16e74..7e01ede 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocBackend.java
@@ -17,40 +17,40 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.flexjs;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.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.driver.js.goog.ASDocConfiguration;
+import org.apache.royale.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocDITABackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocDITABackend.java
index e7ac944..9656b3f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocDITABackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSASDocDITABackend.java
@@ -17,40 +17,40 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.flexjs;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleASDocDITAEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleASDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.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.driver.js.goog.ASDocConfiguration;
+import org.apache.royale.compiler.internal.driver.mxml.ASDocASSourceFileHandler;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSBackend.java
index 17b952a..21ed750 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSBackend.java
@@ -17,41 +17,41 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.flexjs;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IJSWriter;
+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.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.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java
index 87dbdfa..223ec40 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSCordovaBackend.java
@@ -17,20 +17,20 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.flexjs;
 
 import java.util.List;
 
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleCordovaPublisher;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyalePublisher;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
+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.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSSWCBackend.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSSWCBackend.java
index 4baca2f..4305112 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSSWCBackend.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/flexjs/MXMLFlexJSSWCBackend.java
@@ -17,39 +17,39 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.flexjs;
+package org.apache.royale.compiler.internal.driver.mxml.flexjs;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitter;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.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.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
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 2a92559..c6b1b47 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
@@ -17,39 +17,39 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.jsc;
+package org.apache.royale.compiler.internal.driver.mxml.jsc;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jsc.JSCJSEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.jsc.MXMLJSCJSEmitter;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.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.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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.targets.RoyaleTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
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 8bd861e..91d99ad 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
@@ -17,39 +17,39 @@
  *
  */
 
-package org.apache.flex.compiler.internal.driver.mxml.jsc;
+package org.apache.royale.compiler.internal.driver.mxml.jsc;
 
 import java.io.FilterWriter;
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.IDocEmitter;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IJSWriter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogDocEmitter;
-import org.apache.flex.compiler.internal.codegen.js.jsc.JSCJSEmitter;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.MXMLWriter;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleBlockWalker;
-import org.apache.flex.compiler.internal.codegen.mxml.jsc.MXMLJSCJSEmitter;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.targets.RoyaleSWCTarget;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.visitor.as.ASNodeSwitch;
-import org.apache.flex.compiler.internal.visitor.mxml.MXMLNodeSwitch;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.IBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.compiler.codegen.IDocEmitter;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+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.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.jsc.MXMLJSCJSEmitter;
+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;
+import org.apache.royale.compiler.internal.targets.RoyaleSWCTarget;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.visitor.as.ASNodeSwitch;
+import org.apache.royale.compiler.internal.visitor.mxml.MXMLNodeSwitch;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
 
 /**
  * A concrete implementation of the {@link IBackend} API where the
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 2d6ea6e..0610514 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
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.graph;
+package org.apache.royale.compiler.internal.graph;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -34,20 +34,20 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.common.DependencyType;
-import org.apache.flex.compiler.common.DependencyTypeSet;
-import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
-import org.apache.flex.compiler.internal.driver.js.JSCompilationUnit;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority;
-import org.apache.flex.compiler.internal.projects.DependencyGraph;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.FileNotFoundProblem;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.swc.ISWC;
-import org.apache.flex.swc.ISWCFileEntry;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.common.DependencyType;
+import org.apache.royale.compiler.common.DependencyTypeSet;
+import org.apache.royale.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
+import org.apache.royale.compiler.internal.driver.js.JSCompilationUnit;
+import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority;
+import org.apache.royale.compiler.internal.projects.DependencyGraph;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.FileNotFoundProblem;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.ISWCFileEntry;
 
 import com.google.common.io.Files;
 
@@ -619,7 +619,7 @@ public class GoogDepsWriter {
 					        			c2 = line.indexOf("}", c);
 					        			String impl = line.substring(c + 13, c2);
 					        			fi.impls.add(impl);
-					        			if (impl.equals("org.apache.flex.core.ICSSImpl"))
+					        			if (impl.equals("org.apache.royale.core.ICSSImpl"))
 					        				needCSS = true;
 					        		}
 					        		else
@@ -715,7 +715,7 @@ public class GoogDepsWriter {
     				FileUtils.copyFile(f, destFile);
     				
     				// (erikdebruin) copy class assets files
-    				if (className.contains("org.apache.flex"))
+    				if (className.contains("org.apache.royale"))
     				{
     				    File assetsDir = new File(f.getParentFile(), "assets");
     				    if (assetsDir.exists())
@@ -790,7 +790,7 @@ public class GoogDepsWriter {
     				inStream.close();
 
     				// (erikdebruin) copy class assets files
-    				if (className.contains("org.apache.flex"))
+    				if (className.contains("org.apache.royale"))
     				{
     					Map<String, ISWCFileEntry> includedfiles = swc.getFiles();
     					Set<String> includedList = includedfiles.keySet();
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 8ecbb0c..79d40f4 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
@@ -16,14 +16,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.graph;
+package org.apache.royale.compiler.internal.graph;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.swc.ISWC;
+import org.apache.royale.compiler.internal.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.swc.ISWC;
 
 public class GoogDepsWriterCordova extends GoogDepsWriter {
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/FlexJSASDocDelegate.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/FlexJSASDocDelegate.java
index 32d8f2a..33347ba 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/FlexJSASDocDelegate.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/parsing/as/FlexJSASDocDelegate.java
@@ -16,22 +16,22 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.parsing.as;
+package org.apache.royale.compiler.internal.parsing.as;
 
 
 
 
 import antlr.Token;
 
-import org.apache.flex.compiler.asdoc.IASDocComment;
-import org.apache.flex.compiler.asdoc.IASDocDelegate;
-import org.apache.flex.compiler.asdoc.IASParserASDocDelegate;
-import org.apache.flex.compiler.asdoc.IMetadataParserASDocDelegate;
-import org.apache.flex.compiler.asdoc.IPackageDITAParser;
-import org.apache.flex.compiler.asdoc.flexjs.ASDocComment;
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.definitions.IDocumentableDefinition;
-import org.apache.flex.compiler.tree.as.IDocumentableDefinitionNode;
+import org.apache.royale.compiler.asdoc.IASDocComment;
+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.common.ISourceLocation;
+import org.apache.royale.compiler.definitions.IDocumentableDefinition;
+import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
 
 /**
  * Default implementation of {@link IASDocDelegate} that does not have any code
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSASDocProject.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSASDocProject.java
index 6ef9173..d37d1e9 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSASDocProject.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSASDocProject.java
@@ -16,15 +16,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.projects;
+package org.apache.royale.compiler.internal.projects;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
 
 /**
  * @author aharui
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSProject.java
index 2ca882e..cecfd00 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSProject.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/projects/FlexJSProject.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.projects;
+package org.apache.royale.compiler.internal.projects;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,37 +28,37 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.common.DependencyType;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.css.ICSSMediaQueryCondition;
-import org.apache.flex.compiler.css.ICSSRule;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.ITypeDefinition;
-import org.apache.flex.compiler.definitions.metadata.IMetaTag;
-import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute;
-import org.apache.flex.compiler.definitions.references.IResolvedQualifiersReference;
-import org.apache.flex.compiler.definitions.references.ReferenceFactory;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.mxml.flexjs.MXMLRoyaleEmitterTokens;
-import org.apache.flex.compiler.internal.css.codegen.CSSCompilationSession;
-import org.apache.flex.compiler.internal.definitions.InterfaceDefinition;
-import org.apache.flex.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping;
-import org.apache.flex.compiler.internal.scopes.ASProjectScope.DefinitionPromise;
-import org.apache.flex.compiler.internal.targets.ITargetAttributes;
-import org.apache.flex.compiler.internal.targets.LinkageChecker;
-import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode;
-import org.apache.flex.compiler.internal.tree.mxml.MXMLFileNode;
-import org.apache.flex.compiler.internal.units.SWCCompilationUnit;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.mxml.IMXMLTypeConstants;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.common.DependencyType;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.css.ICSSMediaQueryCondition;
+import org.apache.royale.compiler.css.ICSSRule;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.ITypeDefinition;
+import org.apache.royale.compiler.definitions.metadata.IMetaTag;
+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.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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
+import org.apache.royale.compiler.internal.scopes.ASProjectScope.DefinitionPromise;
+import org.apache.royale.compiler.internal.targets.ITargetAttributes;
+import org.apache.royale.compiler.internal.targets.LinkageChecker;
+import org.apache.royale.compiler.internal.tree.mxml.MXMLDocumentNode;
+import org.apache.royale.compiler.internal.tree.mxml.MXMLFileNode;
+import org.apache.royale.compiler.internal.units.SWCCompilationUnit;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.mxml.IMXMLTypeConstants;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 import com.google.common.collect.ImmutableList;
 
@@ -451,7 +451,7 @@ public class RoyaleProject extends FlexProject
 	public boolean isModule(String mainClass)
 	{
         IResolvedQualifiersReference iModuleRef = ReferenceFactory.packageQualifiedReference(
-                getWorkspace(), "org.apache.flex.core.IModule");
+                getWorkspace(), "org.apache.royale.core.IModule");
         ITypeDefinition moddef = (ITypeDefinition)iModuleRef.resolve(this);
         IResolvedQualifiersReference mainRef = ReferenceFactory.packageQualifiedReference(
                 getWorkspace(), mainClass);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSSWCTarget.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSSWCTarget.java
index 023ba7d..cc910c0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSSWCTarget.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSSWCTarget.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.targets;
+package org.apache.royale.compiler.internal.targets;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,21 +28,21 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.common.XMLName;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.references.IResolvedQualifiersReference;
-import org.apache.flex.compiler.definitions.references.ReferenceFactory;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.SourcePathManager;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.NoCompilationUnitForDefinitionProblem;
-import org.apache.flex.compiler.problems.NoSourceForClassInNamespaceProblem;
-import org.apache.flex.compiler.problems.NoSourceForClassProblem;
-import org.apache.flex.compiler.targets.IJSTarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.compiler.common.XMLName;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.references.IResolvedQualifiersReference;
+import org.apache.royale.compiler.definitions.references.ReferenceFactory;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.SourcePathManager;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.NoCompilationUnitForDefinitionProblem;
+import org.apache.royale.compiler.problems.NoSourceForClassInNamespaceProblem;
+import org.apache.royale.compiler.problems.NoSourceForClassProblem;
+import org.apache.royale.compiler.targets.IJSTarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSTarget.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSTarget.java
index 4d1b988..54951dd 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSTarget.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/FlexJSTarget.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.targets;
+package org.apache.royale.compiler.internal.targets;
 
 import java.io.File;
 import java.util.Collection;
@@ -28,20 +28,20 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.flex.compiler.css.ICSSDocument;
-import org.apache.flex.compiler.css.ICSSManager;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.internal.css.semantics.ActivatedStyleSheets;
-import org.apache.flex.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.units.SWCCompilationUnit;
-import org.apache.flex.compiler.problems.FileNotFoundProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.IJSTarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
+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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.units.SWCCompilationUnit;
+import org.apache.royale.compiler.problems.FileNotFoundProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.IJSTarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/JSTarget.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/JSTarget.java
index 140bf57..242a7e1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/JSTarget.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/targets/JSTarget.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.targets;
+package org.apache.royale.compiler.internal.targets;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -25,16 +25,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.exceptions.BuildCanceledException;
-import org.apache.flex.compiler.internal.driver.js.JSApplication;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.IJSTarget;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetReport;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+import org.apache.royale.compiler.exceptions.BuildCanceledException;
+import org.apache.royale.compiler.internal.driver.js.JSApplication;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.IJSTarget;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetReport;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.units.ICompilationUnit;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeHandler.java
index 168c0dd..2e75dfc 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeHandler.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.visitor.as;
+package org.apache.royale.compiler.internal.visitor.as;
 
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * A concrete implementation of the {@link IASNodeStrategy} that allows a
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeSwitch.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeSwitch.java
index cd64223..cec28cf 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeSwitch.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/ASNodeSwitch.java
@@ -17,64 +17,64 @@
  *
  */
 
-package org.apache.flex.compiler.internal.visitor.as;
-
-import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAsNode;
-import org.apache.flex.compiler.internal.tree.as.BinaryOperatorIsNode;
-import org.apache.flex.compiler.internal.tree.as.ConfigConditionBlockNode;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefaultXMLNamespaceNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IUseNamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.as.IASBlockVisitor;
+package org.apache.royale.compiler.internal.visitor.as;
+
+import org.apache.royale.compiler.internal.tree.as.BinaryOperatorAsNode;
+import org.apache.royale.compiler.internal.tree.as.BinaryOperatorIsNode;
+import org.apache.royale.compiler.internal.tree.as.ConfigConditionBlockNode;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.internal.tree.as.NamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefaultXMLNamespaceNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IUseNamespaceNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.as.IASBlockVisitor;
 
 /**
  * The {@link ASNodeSwitch} class is an {@link IASNodeStrategy} implementation
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/BeforeAfterStrategy.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/BeforeAfterStrategy.java
index 5b5bf95..1ce2c4a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/BeforeAfterStrategy.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/as/BeforeAfterStrategy.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.visitor.as;
+package org.apache.royale.compiler.internal.visitor.as;
 
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
 
 /**
  * The {@link BeforeAfterStrategy} implements a before and after {@link IASNode}
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
index 9576e24..a3ded60 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/visitor/mxml/MXMLNodeSwitch.java
@@ -17,38 +17,38 @@
  *
  */
 
-package org.apache.flex.compiler.internal.visitor.mxml;
+package org.apache.royale.compiler.internal.visitor.mxml;
 
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLImplementsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLMetadataNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLObjectNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStringNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLUintNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockVisitor;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLArrayNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDataBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeclarationsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeferredInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEmbedNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFactoryNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLImplementsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLIntNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLLiteralNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLUintNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLVectorNode;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockVisitor;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/problems/UnsupportedLanguageFeatureProblem.java b/compiler-jx/src/main/java/org/apache/royale/compiler/problems/UnsupportedLanguageFeatureProblem.java
index fbd55cd..b973c61 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/problems/UnsupportedLanguageFeatureProblem.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/problems/UnsupportedLanguageFeatureProblem.java
@@ -15,10 +15,10 @@
  *
  */
 
- package org.apache.flex.compiler.problems;
+ package org.apache.royale.compiler.problems;
 
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.problems.annotations.ProblemClassification;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.problems.annotations.ProblemClassification;
 
 @ProblemClassification(CompilerProblemClassification.SYNTAX_ERROR)
 public class UnsupportedLanguageFeatureProblem extends CodegenProblem
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/targets/IJSTarget.java b/compiler-jx/src/main/java/org/apache/royale/compiler/targets/IJSTarget.java
index 1fb4508..c48a3f0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/targets/IJSTarget.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/targets/IJSTarget.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.targets;
+package org.apache.royale.compiler.targets;
 
 import java.util.Collection;
 
-import org.apache.flex.compiler.clients.JSConfiguration;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.driver.js.IJSApplication;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.IASProject;
+import org.apache.royale.compiler.clients.JSConfiguration;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.driver.js.IJSApplication;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.IASProject;
 
 /**
  * The {@link IJSTarget} interface allows the compiler an abstraction to
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ASNodeUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ASNodeUtils.java
index b7c524e..2d6788c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ASNodeUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/ASNodeUtils.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
 import java.util.ArrayList;
 
-import org.apache.flex.compiler.tree.ASTNodeID;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.IConditionalNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IOperatorNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.ASTNodeID;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.IConditionalNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IOperatorNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/DefinitionUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/DefinitionUtils.java
index f13c427..80b0ae4 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/DefinitionUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/DefinitionUtils.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.definitions.IDefinition;
-import org.apache.flex.compiler.definitions.IInterfaceDefinition;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.definitions.IDefinition;
+import org.apache.royale.compiler.definitions.IInterfaceDefinition;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerUtil.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerUtil.java
index cab0752..c4ee7ab 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerUtil.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerUtil.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
 import java.security.Permission;
 
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 174841c..f7d65a1 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NativeUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NativeUtils.java
index 6a493b2..0653542 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NativeUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NativeUtils.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NodeJSUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NodeJSUtils.java
index 608b3ac..63fd232 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NodeJSUtils.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/NodeJSUtils.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.utils;
+package org.apache.royale.compiler.utils;
 
 public class NodeJSUtils
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IASNodeStrategy.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IASNodeStrategy.java
index 589e00e..a95de17 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IASNodeStrategy.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IASNodeStrategy.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.visitor;
+package org.apache.royale.compiler.visitor;
 
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 /**
  * A simple strategy to allow composition of {@link IASNode} handling when
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockVisitor.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockVisitor.java
index 5681b21..61708af 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockVisitor.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.visitor;
+package org.apache.royale.compiler.visitor;
 
 /**
  * @author Erik de Bruin
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockWalker.java
index 3bba54c..18bb710 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/IBlockWalker.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.visitor;
+package org.apache.royale.compiler.visitor;
 
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockVisitor.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockVisitor.java
index db3cda0..e1f8b8c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockVisitor.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockVisitor.java
@@ -17,60 +17,60 @@
  *
  */
 
-package org.apache.flex.compiler.visitor.as;
-
-import org.apache.flex.compiler.internal.codegen.as.ASBlockWalker;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IBlockNode;
-import org.apache.flex.compiler.tree.as.ICatchNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IContainerNode;
-import org.apache.flex.compiler.tree.as.IDefaultXMLNamespaceNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IEmbedNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IFunctionObjectNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IIdentifierNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IKeywordNode;
-import org.apache.flex.compiler.tree.as.ILanguageIdentifierNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.INumericLiteralNode;
-import org.apache.flex.compiler.tree.as.IObjectLiteralValuePairNode;
-import org.apache.flex.compiler.tree.as.IPackageNode;
-import org.apache.flex.compiler.tree.as.IParameterNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITerminalNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.ITypedExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IUseNamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagNode;
-import org.apache.flex.compiler.tree.metadata.IMetaTagsNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IASNodeStrategy;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
+package org.apache.royale.compiler.visitor.as;
+
+import org.apache.royale.compiler.internal.codegen.as.ASBlockWalker;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IBlockNode;
+import org.apache.royale.compiler.tree.as.ICatchNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IContainerNode;
+import org.apache.royale.compiler.tree.as.IDefaultXMLNamespaceNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IEmbedNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IFunctionObjectNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IIdentifierNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IKeywordNode;
+import org.apache.royale.compiler.tree.as.ILanguageIdentifierNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+import org.apache.royale.compiler.tree.as.INumericLiteralNode;
+import org.apache.royale.compiler.tree.as.IObjectLiteralValuePairNode;
+import org.apache.royale.compiler.tree.as.IPackageNode;
+import org.apache.royale.compiler.tree.as.IParameterNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITerminalNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.ITypedExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IUseNamespaceNode;
+import org.apache.royale.compiler.tree.as.IVariableExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagNode;
+import org.apache.royale.compiler.tree.metadata.IMetaTagsNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IASNodeStrategy;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
 
 /**
  * The {@link IASBlockVisitor} interface allows an {@link IASNodeStrategy} to
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockWalker.java
index f97b9ad..97dd212 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/as/IASBlockWalker.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.visitor.as;
+package org.apache.royale.compiler.visitor.as;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
index d6c45a8..756bc12 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockVisitor.java
@@ -17,37 +17,37 @@
  *
  */
 
-package org.apache.flex.compiler.visitor.mxml;
-
-import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLBooleanNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLComponentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDeferredInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEmbedNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFactoryNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLImplementsNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLIntNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLLiteralNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLMetadataNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLObjectNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStringNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLStyleSpecifierNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLUintNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.IBlockVisitor;
+package org.apache.royale.compiler.visitor.mxml;
+
+import org.apache.royale.compiler.tree.mxml.IMXMLArrayNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLBooleanNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLClassDefinitionNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLComponentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDataBindingNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeclarationsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDeferredInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEmbedNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFactoryNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLImplementsNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLIntNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLLiteralNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLMetadataNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNumberNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLObjectNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStringNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLStyleSpecifierNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLUintNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLVectorNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.IBlockVisitor;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockWalker.java b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockWalker.java
index 1aab260..35a3aa4 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockWalker.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/visitor/mxml/IMXMLBlockWalker.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.visitor.mxml;
+package org.apache.royale.compiler.visitor.mxml;
 
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.visitor.IBlockWalker;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter;
+import org.apache.royale.compiler.visitor.IBlockWalker;
 
 /**
  * @author Michael Schmalle
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestAccessorMembers.java
index 922af9c..81749fc 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestAccessorMembers.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestClass.java
index 7a427c0..5705a71 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestClass.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestComments.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestComments.java
index bb38475..151a749 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestComments.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestComments.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.internal.test.ASTestBase;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestExpressions.java
index bc15e4b..0333265 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestExpressions.java
@@ -17,22 +17,22 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
-
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.internal.tree.as.ArrayLiteralNode;
-import org.apache.flex.compiler.internal.tree.as.ObjectLiteralNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+package org.apache.royale.compiler.internal.codegen.as;
+
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.internal.tree.as.ArrayLiteralNode;
+import org.apache.royale.compiler.internal.tree.as.ObjectLiteralNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+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/as/TestFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestFieldMembers.java
index 0de9f0e..185c861 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestFieldMembers.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.INamespaceNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.INamespaceNode;
+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/as/TestGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalClasses.java
index 6f5797f..2321c44 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalClasses.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+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/as/TestGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalConstants.java
index ada60af..e5cefa5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalConstants.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+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/as/TestGlobalFunctions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalFunctions.java
index 2b7a274..ce7ea88 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalFunctions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestGlobalFunctions.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+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/as/TestInterface.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestInterface.java
index 2b15349..a320fb5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestInterface.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestInterface.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+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/as/TestMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestMethodMembers.java
index ce4316f..f5bb35f 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestMethodMembers.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+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/as/TestPackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestPackage.java
index ad8b4e7..ecd4c0e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestPackage.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestPackage.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestParenthesis.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestParenthesis.java
index 5674dd9..77f93a9 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestParenthesis.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestParenthesis.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
+package org.apache.royale.compiler.internal.codegen.as;
 
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+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/as/TestStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
index 00bfece..41f0c01 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
@@ -17,19 +17,19 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.as;
-
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
+package org.apache.royale.compiler.internal.codegen.as;
+
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/CompilerArguments.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/CompilerArguments.java
index fa7ef1d..5fd586e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/CompilerArguments.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/CompilerArguments.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestBase.java
index 9803a52..fceeefe 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestBase.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -25,12 +25,12 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.EXTERNC;
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.internal.codegen.externals.reference.MethodReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ReferenceModel;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.clients.EXTERNC;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.internal.codegen.externals.reference.MethodReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ReferenceModel;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestUtils.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestUtils.java
index 12c31bf..9849a58 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestUtils.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/ExternalsTestUtils.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.utils.FilenameNormalization;
 
 public class ExternalsTestUtils
 {
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestAnnotationEnum.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestAnnotationEnum.java
index 124e3ff..d47f488 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestAnnotationEnum.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestAnnotationEnum.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 public class TestAnnotationEnum extends ExternalsTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestCollectImports.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestCollectImports.java
index a7ab2b8..a4bae8b 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestCollectImports.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestCollectImports.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.*;
 
@@ -25,9 +25,9 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.FunctionReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.FunctionReference;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestConstructor.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestConstructor.java
index a766576..083f590 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestConstructor.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestConstructor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 public class TestConstructor extends ExternalsTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternChrome.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternChrome.java
index 9aafd07..4e607c0 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternChrome.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternChrome.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.problems.ICompilerProblem;
 import org.junit.Test;
 
 import com.google.javascript.jscomp.Result;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternES3.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternES3.java
index 3112707..bebf292 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternES3.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternES3.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.MethodReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.MethodReference;
 import org.junit.Test;
 
 import com.google.javascript.jscomp.Result;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJQuery.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJQuery.java
index bcd4d3a..e787e44 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJQuery.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJQuery.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 import com.google.javascript.jscomp.Result;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJSMissing.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJSMissing.java
index 9d859ca..f4e9c3a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJSMissing.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJSMissing.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 
 import com.google.javascript.jscomp.Result;
 import org.junit.Test;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJasmine.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJasmine.java
index 2f32f1b..3e3c911 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJasmine.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternJasmine.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import com.google.javascript.jscomp.Result;
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternNode.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternNode.java
index 6b8ad3a..754cc61 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternNode.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestExternNode.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 import com.google.javascript.jscomp.Result;
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 ced25da..5cb36cc 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
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -30,23 +30,23 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.flex.compiler.clients.COMPC;
-import org.apache.flex.compiler.clients.EXTERNC;
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.clients.COMPC;
+import org.apache.royale.compiler.clients.EXTERNC;
+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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.FlexProjectConfigurator;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestPackageNamespace.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestPackageNamespace.java
index c00d00b..6da1913 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestPackageNamespace.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestPackageNamespace.java
@@ -16,7 +16,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 public class TestPackageNamespace extends ExternalsTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestReferenceModel.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestReferenceModel.java
index 075391d..c9a86d9 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestReferenceModel.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestReferenceModel.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeExternals.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeExternals.java
index a317997..e3ecc99 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeExternals.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeExternals.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,10 +25,10 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
-import org.apache.flex.compiler.internal.codegen.externals.reference.MethodReference;
-import org.apache.flex.compiler.internal.codegen.externals.utils.JSTypeUtils;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.internal.codegen.externals.reference.MethodReference;
+import org.apache.royale.compiler.internal.codegen.externals.utils.JSTypeUtils;
 
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeInheritence.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeInheritence.java
index 985f431..d467d1d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeInheritence.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/externals/TestTypeInheritence.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.externals;
+package org.apache.royale.compiler.internal.codegen.externals;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.flex.compiler.clients.ExternCConfiguration;
-import org.apache.flex.compiler.internal.codegen.externals.reference.ClassReference;
+import org.apache.royale.compiler.clients.ExternCConfiguration;
+import org.apache.royale.compiler.internal.codegen.externals.reference.ClassReference;
 import org.junit.Test;
 
 public class TestTypeInheritence extends ExternalsTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassA.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassA.java
index 666e67a..f025b5c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassA.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassA.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.internal.test.AMDTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.AMDTestBase;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassB.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassB.java
index 272aedb..ceeb852 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassB.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDClassB.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.internal.test.AMDTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.internal.test.AMDTestBase;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDEmitter.java
index dd7e5eb..057ec18 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDEmitter.java
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
-import org.apache.flex.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.amd.AMDBackend;
+import org.apache.royale.compiler.internal.test.ASTestBase;
 import org.junit.Test;
 
 /**
@@ -40,7 +40,7 @@ public class TestAMDEmitter extends ASTestBase
     public void testSimple()
     {
 //        String code = "package com.example.components {"
-//                + "import org.apache.flex.html.staticControls.TextButton;"
+//                + "import org.apache.royale.html.staticControls.TextButton;"
 //                + "public class MyTextButton extends TextButton {"
 //                + "public function MyTextButton() {if (foo() != 42) { bar(); } }"
 //                + "private var _privateVar:String = \"do \";"
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceI.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceI.java
index 1be8965..2be1ba3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceI.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceI.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.internal.test.AMDTestBase;
+import org.apache.royale.compiler.internal.test.AMDTestBase;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceIOther.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceIOther.java
index b1e78f0..2eeda45 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceIOther.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceIOther.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.internal.test.AMDTestBase;
+import org.apache.royale.compiler.internal.test.AMDTestBase;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceISub.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceISub.java
index fea3b4a..f607bf2 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceISub.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDInterfaceISub.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
-import org.apache.flex.compiler.internal.test.AMDTestBase;
+import org.apache.royale.compiler.internal.test.AMDTestBase;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDPackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDPackage.java
index ca8a4c0..9e3c4ab 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDPackage.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/amd/TestAMDPackage.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.amd;
+package org.apache.royale.compiler.internal.codegen.js.amd;
 
 import java.io.IOException;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestPackage;
-import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestPackage;
+import org.apache.royale.compiler.internal.driver.js.amd.AMDBackend;
+import org.apache.royale.compiler.tree.as.IFileNode;
+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/flexjs/TestFlexJSAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
index 9b718d2..a6329bf 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessorMembers.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogAccessorMembers;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
+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.tree.as.IClassNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
index 3e823ef..a1d0ce5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSAccessors.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IClassNode;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IClassNode;
 import org.junit.Test;
 
 /**
@@ -124,7 +124,7 @@ public class TestRoyaleAccessors extends ASTestBase
         		"FalconTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
 				"FalconTest_A.prototype.bindable__set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
         		"FalconTest_A.prototype.set__label = function(value) {\nvar oldValue = this.get__label();\nif (oldValue != value) {\nthis.bindable__set__label(value);\n" +
-        		"    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+        		"    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
         		"         this, \"label\", oldValue, value));\n}\n};\n\n\n" +
         		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
         		"label: {\nget: FalconTest_A.prototype.get__label,\nset: FalconTest_A.prototype.set__label}}\n);";
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
index 30707e5..c4b29e0 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogClass;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.FileNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
+
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.FileNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
 import org.junit.Test;
 
 /**
@@ -48,7 +48,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A {public function A() { super(); }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n  ;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n  ;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -57,7 +57,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Test
@@ -65,7 +65,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg:String) { super(arg);}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor', arg);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.royale.A = function(arg) {\n  org.apache.royale.A.base(this, 'constructor', arg);\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Test
@@ -73,7 +73,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg:String) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.flex.A = function(arg) {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg\n */\norg.apache.royale.A = function(arg) {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -82,7 +82,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -91,7 +91,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -100,7 +100,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public final class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -109,7 +109,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher implements flash.events.IEventDispatcher, flash.display.IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -118,7 +118,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher { public function A() { super('foo', 42);}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n  org.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.royale.A = function() {\n  org.apache.royale.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Test
@@ -126,7 +126,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B(arg1:String) {this.arg1 = arg1}; public var arg1:String;}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n * @param {string} arg1\n */\norg.apache.flex.B = function(arg1) {\n  this.arg1 = arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.flex.B.prototype.arg1;";
+        String expected = "/**\n * @constructor\n * @param {string} arg1\n */\norg.apache.royale.B = function(arg1) {\n  this.arg1 = arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.royale.B.prototype.arg1;";
         assertOut(expected);
     }
 
@@ -135,7 +135,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; public var event:Event = new Event(); public function foo():String {return event.type;};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n\nthis.event = new flash.events.Event();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @type {flash.events.Event}\n */\norg.apache.flex.B.prototype.event;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.flex.B.prototype.foo = function() {\n  return this.event.type;\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n\nthis.event = new flash.events.Event();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @type {flash.events.Event}\n */\norg.apache.royale.B.prototype.event;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.royale.B.prototype.foo = function() {\n  return this.event.type;\n};";
         assertOut(expected);
     }
 
@@ -144,7 +144,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; public function foo():void {};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n */\norg.apache.flex.B.prototype.foo = function() {\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n */\norg.apache.royale.B.prototype.foo = function() {\n};";
         assertOut(expected);
     }
 
@@ -153,7 +153,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; override public function foo():void {};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.flex.B.prototype.foo = function() {\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.royale.B.prototype.foo = function() {\n};";
         assertOut(expected);
     }
 
@@ -162,7 +162,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; override public function foo(value:Object):void {baz = ''};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.flex.B.prototype.foo = function(value) {\n  baz = '';\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.royale.B.prototype.foo = function(value) {\n  baz = '';\n};";
         assertOut(expected);
     }
 
@@ -171,7 +171,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; override public function foo():void {super.foo();};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.flex.B.prototype.foo = function() {\n  org.apache.flex.B.superClass_.foo.apply(this);\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @override\n */\norg.apache.royale.B.prototype.foo = function() {\n  org.apache.royale.B.superClass_.foo.apply(this);\n};";
         assertOut(expected);
     }
 
@@ -180,7 +180,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B {public function B() {}; public function set baz(value:Object):void {}; public function set foo(value:Object):void {baz = value;};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\norg.apache.flex.B.prototype.set__baz = function(value) {\n};\n\n\norg.apache.flex.B.prototype.set__foo = function(value) {\n  this.baz = value;\n};\n\n\nObject.defineProperties(org.apache.flex.B.prototype, /** @lends {org.apache.flex.B.prototype} */ {\n/**\n  * @expor [...]
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\norg.apache.royale.B.prototype.set__baz = function(value) {\n};\n\n\norg.apache.royale.B.prototype.set__foo = function(value) {\n  this.baz = value;\n};\n\n\nObject.defineProperties(org.apache.royale.B.prototype, /** @lends {org.apache.royale.B.prototype} */ {\n/ [...]
         assertOut(expected);
     }
 
@@ -189,7 +189,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class B extends A {public function B() {}; override public function set foo(value:Object):void {super.foo = value;};} class A {public function set foo(value:Object):void {}}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n * @extends {org.apache.flex.A}\n */\norg.apache.flex.B = function() {\n  org.apache.flex.B.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.B, org.apache.flex.A);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\norg.apache.flex.B.prototype.set__foo = function(value) {\n  org.apache.flex.B.superClass_.set__foo.apply(this, [ value] );\n};\n\n\nO [...]
+        String expected = "/**\n * @constructor\n * @extends {org.apache.royale.A}\n */\norg.apache.royale.B = function() {\n  org.apache.royale.B.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.B, org.apache.royale.A);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\norg.apache.royale.B.prototype.set__foo = function(value) {\n  org.apache.royale.B.superClass_.set__foo.apply(this, [ va [...]
         assertOut(expected);
     }
 
@@ -198,7 +198,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("import flash.utils.flash_proxy; use namespace flash_proxy; public class B {public function B() {}; flash_proxy function foo():void {};}");
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n */\norg.apache.flex.B.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n};";
+        String expected = "/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n */\norg.apache.royale.B.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n};";
         assertOut(expected);
     }
 
@@ -208,7 +208,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n  org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n  org.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -218,7 +218,7 @@ public class TestRoyaleClass extends TestGoogClass
         IClassNode node = getClassNode("public class A {public var a:Object;protected var b:String; "
                 + "private var c:int; internal var d:uint; var e:Number}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @type {Object}\n */\norg.apache.flex.A.prototype.a;\n\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.flex.A.prototype.b;\n\n\n/**\n * @private\n * @type {number}\n */\norg.apache.flex.A.prototype.c = 0;\n\n\n/**\n * @export\n * @type {number}\n  [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @type {Object}\n */\norg.apache.royale.A.prototype.a;\n\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b;\n\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c = 0;\n\n\n/**\n * @export\n * @type [...]
     }
 
     @Test
@@ -228,47 +228,47 @@ public class TestRoyaleClass extends TestGoogClass
                 + "[Bindable] private var c:int; internal var d:uint; var e:Number}");
         asBlockWalker.visitClass(node);
         assertOut("/**\n * @constructor\n" +
-        		  " */\norg.apache.flex.A = function() {\n" +
-        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n" +
+        		  " */\norg.apache.royale.A = function() {\n" +
+        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {Object}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.a_;\n\n\n" +
+        		  "org.apache.royale.A.prototype.a_;\n\n\n" +
         		  "/**\n" +
         		  " * @protected\n" +
         		  " * @type {string}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.b_;\n\n\n" +
+        		  "org.apache.royale.A.prototype.b_;\n\n\n" +
         		  "/**\n" +
         		  " * @private\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.c_ = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.c_ = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.d = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.d = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.e;Object.defineProperties(org.apache.flex.A.prototype, /** @lends {org.apache.flex.A.prototype} */ {\n" +
+        		  "org.apache.royale.A.prototype.e;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
         		  "/** @export\n" +
     			  "  * @type {Object} */\n" +
     			  "a: {\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "  get: function() {\n" +
     			  "  return this.a_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.a_) {\n" +
     			  "    var oldValue = this.a_;\n" +
     			  "    this.a_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"a\", oldValue, value));\n" +
     			  "}\n" +
     			  "}}," +
@@ -276,34 +276,34 @@ public class TestRoyaleClass extends TestGoogClass
         		  "  * @private\n" +
         		  "  * @type {string} */\n" +
         		  "b: {\n" +
-        		  "/** @this {org.apache.flex.A} */\n" +
+        		  "/** @this {org.apache.royale.A} */\n" +
         		  "  get: function() {\n" +
         		  "  return this.b_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.b_) {\n" +
     			  "    var oldValue = this.b_;\n" +
     			  "    this.b_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"b\", oldValue, value));\n" +
     			  "}\n" +
     			  "}},/** @export\n" +
     			  "  * @private\n" +
     			  "  * @type {number} */\n" +
     			  "c: {\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "  get: function() {\n" +
     			  "  return this.c_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.c_) {\n" +
     			  "    var oldValue = this.c_;\n" +
     			  "    this.c_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"c\", oldValue, value));\n" +
     			  "}\n" +
     			  "}}}\n" +
@@ -317,48 +317,48 @@ public class TestRoyaleClass extends TestGoogClass
                 + "[Bindable] private var c:int; internal var d:uint; var e:Number}");
         asBlockWalker.visitClass(node);
         assertOut("/**\n * @constructor\n" +
-        		  " */\norg.apache.flex.A = function() {\n\n" +
+        		  " */\norg.apache.royale.A = function() {\n\n" +
         		  "this.a_ = {foo:1};\n" +
-        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n" +
+        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {Object}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.a_;\n\n\n" +
+        		  "org.apache.royale.A.prototype.a_;\n\n\n" +
         		  "/**\n" +
         		  " * @protected\n" +
         		  " * @type {string}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.b_;\n\n\n" +
+        		  "org.apache.royale.A.prototype.b_;\n\n\n" +
         		  "/**\n" +
         		  " * @private\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.c_ = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.c_ = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.d = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.d = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.e;Object.defineProperties(org.apache.flex.A.prototype, /** @lends {org.apache.flex.A.prototype} */ {\n" +
+        		  "org.apache.royale.A.prototype.e;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
         		  "/** @export\n" +
     			  "  * @type {Object} */\n" +
     			  "a: {\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "  get: function() {\n" +
     			  "  return this.a_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.a_) {\n" +
     			  "    var oldValue = this.a_;\n" +
     			  "    this.a_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"a\", oldValue, value));\n" +
     			  "}\n" +
     			  "}}," +
@@ -366,34 +366,34 @@ public class TestRoyaleClass extends TestGoogClass
         		  "  * @private\n" +
         		  "  * @type {string} */\n" +
         		  "b: {\n" +
-        		  "/** @this {org.apache.flex.A} */\n" +
+        		  "/** @this {org.apache.royale.A} */\n" +
         		  "  get: function() {\n" +
         		  "  return this.b_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.b_) {\n" +
     			  "    var oldValue = this.b_;\n" +
     			  "    this.b_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"b\", oldValue, value));\n" +
     			  "}\n" +
     			  "}},/** @export\n" +
     			  "  * @private\n" +
     			  "  * @type {number} */\n" +
     			  "c: {\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "  get: function() {\n" +
     			  "  return this.c_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.c_) {\n" +
     			  "    var oldValue = this.c_;\n" +
     			  "    this.c_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"c\", oldValue, value));\n" +
     			  "}\n" +
     			  "}}}\n" +
@@ -407,47 +407,47 @@ public class TestRoyaleClass extends TestGoogClass
                 + "private var c:int; internal var d:uint; var e:Number}");
         asBlockWalker.visitClass(node);
         assertOut("/**\n * @constructor\n" +
-        		  " */\norg.apache.flex.A = function() {\n" +
-        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n" +
+        		  " */\norg.apache.royale.A = function() {\n" +
+        		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {Object}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.a_;\n\n\n" +
+        		  "org.apache.royale.A.prototype.a_;\n\n\n" +
         		  "/**\n" +
         		  " * @protected\n" +
         		  " * @type {string}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.b;\n\n\n" +
+        		  "org.apache.royale.A.prototype.b;\n\n\n" +
         		  "/**\n" +
         		  " * @private\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.c = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.c = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.d = 0;\n\n\n" +
+        		  "org.apache.royale.A.prototype.d = 0;\n\n\n" +
         		  "/**\n" +
         		  " * @export\n" +
         		  " * @type {number}\n" +
         		  " */\n" +
-        		  "org.apache.flex.A.prototype.e;Object.defineProperties(org.apache.flex.A.prototype, /** @lends {org.apache.flex.A.prototype} */ {\n" +
+        		  "org.apache.royale.A.prototype.e;Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n" +
         		  "/** @export\n" +
         		  "  * @type {Object} */\n" +
     			  "a: {\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "  get: function() {\n" +
     			  "  return this.a_;\n" +
     			  "  },\n" +
     			  "\n" +
-    			  "/** @this {org.apache.flex.A} */\n" +
+    			  "/** @this {org.apache.royale.A} */\n" +
     			  "set: function(value) {\n" +
     			  "if (value != this.a_) {\n" +
     			  "    var oldValue = this.a_;\n" +
     			  "    this.a_ = value;\n" +
-    			  "    this.dispatchEvent(org.apache.flex.events.ValueChangeEvent.createUpdateEvent(\n" +
+    			  "    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
     			  "         this, \"a\", oldValue, value));\n" +
     			  "}\n" +
     			  "}}}\n" +
@@ -460,15 +460,15 @@ public class TestRoyaleClass extends TestGoogClass
         IClassNode node = getClassNode("public class A {public static var a:int = 10;public static var b:String = initStatic(); "
                 + "private static function initStatic():String { return \"foo\"; }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @type {number}\n */\norg.apache.flex.A.a = 10;\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.flex.A.b;\n\n\n/**\n * @private\n * @return {string}\n */\norg.apache.flex.A.initStatic = function() {\n  return \"foo\";\n};\n\norg.apache.flex.A.b = o [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @type {number}\n */\norg.apache.royale.A.a = 10;\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.royale.A.b;\n\n\n/**\n * @private\n * @return {string}\n */\norg.apache.royale.A.initStatic = function() {\n  return \"foo\";\n};\n\norg.apache. [...]
     }
     
     @Test
     public void testImportForceLinkingAsStaticInitializers()
     {
-        FileNode node = (FileNode)getNode("package org.apache.flex {\npublic class A {\nimport flash.display.Sprite; Sprite;\n}}", FileNode.class, 0);
+        FileNode node = (FileNode)getNode("package org.apache.royale {\npublic class A {\nimport flash.display.Sprite; Sprite;\n}}", FileNode.class, 0);
         asBlockWalker.visitFile(node);
-        assertOut("/**\n * org.apache.flex.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes|accessControls}\n */\n\ngoog.provide('org.apache.flex.A');\n\ngoog.require('flash.display.Sprite');\n\n\n\n/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * org.apache.royale.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes|accessControls}\n */\n\ngoog.provide('org.apache.royale.A');\n\ngoog.require('flash.display.Sprite');\n\n\n\n/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
     
     @Override
@@ -481,7 +481,7 @@ public class TestRoyaleClass extends TestGoogClass
                 + "private static const C:Number = 42;"
                 + "foo_bar static const C:String = 'me' + 'you';}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @const\n * @type {number}\n */\norg.apache.flex.A.A = 42;\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg.apache.flex.A.B = 42;\n\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg.apache.flex.A.C = 42;\n\n\n/**\n * @export\n * @co [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @const\n * @type {number}\n */\norg.apache.royale.A.A = 42;\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg.apache.royale.A.B = 42;\n\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg.apache.royale.A.C = 42;\n\n\n/**\n * @ex [...]
     }
 
     @Override
@@ -500,24 +500,24 @@ public class TestRoyaleClass extends TestGoogClass
                 + "flash_proxy function get foo6():Object{return null;}"
                 + "flash_proxy function set foo6(value:Object):void{}" + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n" +
-        		"org.apache.flex.A.prototype.get__foo1 = function() {\n  return null;\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.set__foo1 = function(value) {\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.get__foo2 = function() {\n  return null;\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.set__foo2 = function(value) {\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.get__foo3 = function() {\n  return null;\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.set__foo3 = function(value) {\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.get__foo5 = function() {\n  return null;\n};\n\n\n" +
-        		"org.apache.flex.A.prototype.set__foo5 = function(value) {\n};\n\n\n" +
-        		"org.apache.flex.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::get__foo6\"] = function() {\n  return null;\n};\n\n\n" +
-        		"org.apache.flex.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::set__foo6\"] = function(value) {\n};\n\n\n" +
-        		"Object.defineProperties(org.apache.flex.A.prototype, /** @lends {org.apache.flex.A.prototype} */ {\n/**\n  * @export\n  * @type {Object} */\n" +
-        		    "foo1: {\nget: org.apache.flex.A.prototype.get__foo1,\nset: org.apache.flex.A.prototype.set__foo1},\n/**\n  * @export\n  * @type {Object} */\n" +
-        		    "foo2: {\nget: org.apache.flex.A.prototype.get__foo2,\nset: org.apache.flex.A.prototype.set__foo2},\n/**\n  * @export\n  * @type {Object} */\n" +
-        		    "foo3: {\nget: org.apache.flex.A.prototype.get__foo3,\nset: org.apache.flex.A.prototype.set__foo3},\n/**\n  * @export\n  * @type {Object} */\n" +
-        		    "foo5: {\nget: org.apache.flex.A.prototype.get__foo5,\nset: org.apache.flex.A.prototype.set__foo5},\n/**\n  * @export\n  * @type {Object} */\n" +
-        		    "\"http://www.adobe.com/2006/actionscript/flash/proxy::foo6\": {\nget: org.apache.flex.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::get__foo6\"],\n" +
-        		    																"set: org.apache.flex.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::set__foo6\"]}}\n);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n" +
+        		"org.apache.royale.A.prototype.get__foo1 = function() {\n  return null;\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.set__foo1 = function(value) {\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.get__foo2 = function() {\n  return null;\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.set__foo2 = function(value) {\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.get__foo3 = function() {\n  return null;\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.set__foo3 = function(value) {\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.get__foo5 = function() {\n  return null;\n};\n\n\n" +
+        		"org.apache.royale.A.prototype.set__foo5 = function(value) {\n};\n\n\n" +
+        		"org.apache.royale.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::get__foo6\"] = function() {\n  return null;\n};\n\n\n" +
+        		"org.apache.royale.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::set__foo6\"] = function(value) {\n};\n\n\n" +
+        		"Object.defineProperties(org.apache.royale.A.prototype, /** @lends {org.apache.royale.A.prototype} */ {\n/**\n  * @export\n  * @type {Object} */\n" +
+        		    "foo1: {\nget: org.apache.royale.A.prototype.get__foo1,\nset: org.apache.royale.A.prototype.set__foo1},\n/**\n  * @export\n  * @type {Object} */\n" +
+        		    "foo2: {\nget: org.apache.royale.A.prototype.get__foo2,\nset: org.apache.royale.A.prototype.set__foo2},\n/**\n  * @export\n  * @type {Object} */\n" +
+        		    "foo3: {\nget: org.apache.royale.A.prototype.get__foo3,\nset: org.apache.royale.A.prototype.set__foo3},\n/**\n  * @export\n  * @type {Object} */\n" +
+        		    "foo5: {\nget: org.apache.royale.A.prototype.get__foo5,\nset: org.apache.royale.A.prototype.set__foo5},\n/**\n  * @export\n  * @type {Object} */\n" +
+        		    "\"http://www.adobe.com/2006/actionscript/flash/proxy::foo6\": {\nget: org.apache.royale.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::get__foo6\"],\n" +
+        		    																"set: org.apache.royale.A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::set__foo6\"]}}\n);");
     }
 
     @Override
@@ -535,7 +535,7 @@ public class TestRoyaleClass extends TestGoogClass
                 + "public static function foo7(value:Object):void{}"
                 + "flash_proxy static function foo7(value:Object):void{}" + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1 = function() {\n  return null;\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1a = function() {\n  return null;\n};\n\n\n/**\n * @export\n * @override\n */\norg.apa [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1 = function() {\n  return null;\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1a = function() {\n  return null;\n};\n\n\n/**\n * @export\n * @override\n * [...]
     }
 
     @Test
@@ -546,7 +546,7 @@ public class TestRoyaleClass extends TestGoogClass
                 + "public function foo2():Object{function bar2(param1:Object):Object {return null;}; return bar2('foo');}"
                 + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.flex.B.prototype.foo1 = function() {\n  var self = this;\n  function bar1() {\n    return null;\n  };\n  return bar1();\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.flex.B.prototype.foo2 = function() {\n  [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.B.prototype.foo1 = function() {\n  var self = this;\n  function bar1() {\n    return null;\n  };\n  return bar1();\n};\n\n\n/**\n * @export\n * @return {Object}\n */\norg.apache.royale.B.prototype.foo2 = funct [...]
     }
 
     @Test
@@ -558,7 +558,7 @@ public class TestRoyaleClass extends TestGoogClass
                 + "public function foo2():String{function bar2(param1:String):String {return param1 + baz1;}; return bar2('foo');}"
                 + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.flex.B.prototype.baz1;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.flex.B.prototype.foo1 = function() {\n  var self = this;\n  function bar1() {\n    return self.baz1;\n  };\n  return bar1();\n};\n\n\n/**\n *  [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @type {string}\n */\norg.apache.royale.B.prototype.baz1;\n\n\n/**\n * @export\n * @return {string}\n */\norg.apache.royale.B.prototype.foo1 = function() {\n  var self = this;\n  function bar1() {\n    return self.baz1;\n  };\n  return bar1();\n};\n\n [...]
     }
 
     @Test
@@ -578,7 +578,7 @@ public class TestRoyaleClass extends TestGoogClass
                 + "public function clone():B { return new B() }"
                 + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.B', org.apache.flex.B);\n\n\n/**\n * @export\n * @return {org.apache.flex.B}\n */\norg.apache.flex.B.prototype.clone = function() {\n  return new org.apache.flex.B();\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.B = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.B', org.apache.royale.B);\n\n\n/**\n * @export\n * @return {org.apache.royale.B}\n */\norg.apache.royale.B.prototype.clone = function() {\n  return new org.apache.royale.B();\n};");
     }
 
     @Override
@@ -587,7 +587,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -598,7 +598,7 @@ public class TestRoyaleClass extends TestGoogClass
         //               in JS we ignore it
         IClassNode node = getClassNode("internal class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -609,7 +609,7 @@ public class TestRoyaleClass extends TestGoogClass
         //               in JS we ignore it
         IClassNode node = getClassNode("public final class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -619,7 +619,7 @@ public class TestRoyaleClass extends TestGoogClass
         // (erikdebruin) all JS objects are 'dynamic' by design
         IClassNode node = getClassNode("public dynamic class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -628,7 +628,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Override
@@ -637,7 +637,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
 
@@ -647,7 +647,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A {public function A() { }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
 
@@ -657,7 +657,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);");
+        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);");
     }
 
     @Test
@@ -665,7 +665,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n  \n  this.foo = [];\n  arg2 = arg2 + 2;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @type {Array}\n */\norg.apache.flex.A.prototype.foo;");
+        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n  \n  this.foo = [];\n  arg2 = arg2 + 2;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @type {Array}\n */\norg.apache.royale.A.prototype.foo;");
     }
 
     @Test
@@ -673,7 +673,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher {public function A(arg1:String, arg2:int) {arg2 = arg2 + 2;} public var foo:Array = [];}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n  org.apache.flex.A.base(this, 'constructor');\n  \n  this.foo = [];\n  arg2 = arg2 + 2;\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n [...]
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n  org.apache.royale.A.base(this, 'constructor');\n  \n  this.foo = [];\n  arg2 = arg2 + 2;\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * [...]
     }
 
     @Test
@@ -681,7 +681,7 @@ public class TestRoyaleClass extends TestGoogClass
     {
         IClassNode node = getClassNode("public class A {public static const NAME:String = 'Dummy'; public function A(arg1:String = NAME) {_name = arg1;} private var _name:String;}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @param {string=} arg1\n */\norg.apache.flex.A = function(arg1) {\n  arg1 = typeof arg1 !== 'undefined' ? arg1 : org.apache.flex.A.NAME;\n  this._name = arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.flex.A', org.apache.flex.A);\n\n\n/**\n * @export\n * @const\n * @type {string}\n */\norg.apache.flex.A.NAME = 'Dummy';\n\n\n/**\n * @private\n * @type {string}\n */\norg.apache.flex.A.pr [...]
+        assertOut("/**\n * @constructor\n * @param {string=} arg1\n */\norg.apache.royale.A = function(arg1) {\n  arg1 = typeof arg1 !== 'undefined' ? arg1 : org.apache.royale.A.NAME;\n  this._name = arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n * @export\n * @const\n * @type {string}\n */\norg.apache.royale.A.NAME = 'Dummy';\n\n\n/**\n * @private\n * @type {string}\n */\norg.apache [...]
     }
     
     protected IBackend createBackend()
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
index 206a809..b65b423 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogEmitter;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.tree.as.IFileNode;
+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/flexjs/TestFlexJSExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 830de64..10aa892 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -17,27 +17,27 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
-
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogExpressions;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.parsing.as.RoyaleASDocDelegate;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.ClassNode;
-import org.apache.flex.compiler.internal.tree.as.LiteralNode;
-import org.apache.flex.compiler.internal.tree.as.NodeBase;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
+
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.parsing.as.RoyaleASDocDelegate;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.ClassNode;
+import org.apache.royale.compiler.internal.tree.as.LiteralNode;
+import org.apache.royale.compiler.internal.tree.as.NodeBase;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -145,7 +145,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         IClassDefinition def = classnode.getDefinition();
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitFunction(fnode);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f = org.apache.flex.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
+        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f = org.apache.royale.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
     }
     
     @Test
@@ -160,7 +160,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         IClassDefinition def = classnode.getDefinition();
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitFunction(fnode);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f;\n  f = org.apache.flex.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
+        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f;\n  f = org.apache.royale.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
     }
     
     @Test
@@ -689,7 +689,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
 
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitBinaryOperator(bnode);
-        assertOut("org.apache.flex.utils.Language.as(this.model, foo.bar.E, true).labelText = null");
+        assertOut("org.apache.royale.utils.Language.as(this.model, foo.bar.E, true).labelText = null");
     }
 
     @Test
@@ -709,7 +709,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public var b:String; public var c:Object; public function d() { b = c; }}",
                 IBinaryOperatorNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("this.b = org.apache.flex.utils.Language.string(this.c)");
+        assertOut("this.b = org.apache.royale.utils.Language.string(this.c)");
     }
 
     @Test
@@ -865,7 +865,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {}; c(b); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  c(org.apache.flex.utils.Language.closure(this.b, this, 'b'));\n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  c(org.apache.royale.utils.Language.closure(this.b, this, 'b'));\n}");
     }
 
     @Test
@@ -885,7 +885,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {}; var f:Function = b; c(f); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f = org.apache.flex.utils.Language.closure(this.b, this, 'b');\n  c(f);\n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f = org.apache.royale.utils.Language.closure(this.b, this, 'b');\n  c(f);\n}");
     }
     
     @Test
@@ -895,7 +895,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "import flash.utils.flash_proxy; use namespace flash_proxy;public class B {flash_proxy function b() { function c(f:Function):void {}; var f:Function = b; c(f); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f = org.apache.flex.utils.Language.closure(this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"], this, 'http://www.adobe.com/2006/actionscript/flash/proxy::b');\n  c(f);\n}");
+        assertOut("/**\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f = org.apache.royale.utils.Language.closure(this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"], this, 'http://www.adobe.com/2006/actionscript/flash/proxy::b');\n  c(f);\n}");
     }
     
     @Test
@@ -935,7 +935,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {}; var f:Function; f = b; c(f); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f;\n  f = org.apache.flex.utils.Language.closure(this.b, this, 'b');\n  c(f);\n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Function} */ f;\n  f = org.apache.royale.utils.Language.closure(this.b, this, 'b');\n  c(f);\n}");
     }
     
     @Test
@@ -955,7 +955,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {}; var f:Array = [b]; c(f[0]); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Array} */ f = [org.apache.flex.utils.Language.closure(this.b, this, 'b')];\n  c(f[0]);\n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  var /** @type {Array} */ f = [org.apache.royale.utils.Language.closure(this.b, this, 'b')];\n  c(f[0]);\n}");
     }
     
     @Test
@@ -975,7 +975,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {}; c(this.b); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  c(org.apache.flex.utils.Language.closure(this.b, this, 'b'));\n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n  };\n  c(org.apache.royale.utils.Language.closure(this.b, this, 'b'));\n}");
     }
     
     @Test
@@ -985,7 +985,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b() { function c(f:Function):void {c(d); }; } public function d() {}}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n    c(org.apache.flex.utils.Language.closure(self.d, self, 'd'));\n  };\n  \n}");
+        assertOut("/**\n * @export\n */\nB.prototype.b = function() {\n  var self = this;\n  function c(f) {\n    c(org.apache.royale.utils.Language.closure(self.d, self, 'd'));\n  };\n  \n}");
     }
     
     @Test
@@ -1019,7 +1019,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IClassNode node = (IClassNode) getNode("import flash.display.IBitmapDrawable; public class B implements IBitmapDrawable { public function B() { IBitmapDrawable(b).type = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.display.IBitmapDrawable}\n */\nB = function() {\n  org.apache.flex.utils.Language.as(b, flash.display.IBitmapDrawable, true).type = '';\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);");
+        assertOut("/**\n * @constructor\n * @implements {flash.display.IBitmapDrawable}\n */\nB = function() {\n  org.apache.royale.utils.Language.as(b, flash.display.IBitmapDrawable, true).type = '';\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('B', B);");
     }
 
     @Test
@@ -1027,7 +1027,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IFunctionNode node = getMethod("function foo(){var foo:Object = FalconTest_A(bar).bar = '';}; public function get bar():Object { return this; };");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  var /** @type {Object} */ foo = org.apache.flex.utils.Language.as(this.bar, FalconTest_A, true).bar = '';\n}");
+        assertOut("FalconTest_A.prototype.foo = function() {\n  var /** @type {Object} */ foo = org.apache.royale.utils.Language.as(this.bar, FalconTest_A, true).bar = '';\n}");
     }
 
     @Test
@@ -1045,7 +1045,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "import goog.bind; public class B {public function b() { goog.bind(b, this); }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n */\nfoo.bar.B.prototype.b = function() {\n  goog.bind(org.apache.flex.utils.Language.closure(this.b, this, 'b'), this);\n}");
+        assertOut("/**\n * @export\n */\nfoo.bar.B.prototype.b = function() {\n  goog.bind(org.apache.royale.utils.Language.closure(this.b, this, 'b'), this);\n}");
     }
 
     @Test
@@ -1155,7 +1155,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         assertOut("/**\n * @export\n */\n" + 
         		  "FalconTest_A.prototype.foo = function() {\n" +
         		  "  var self = this;\n" +
-        		  "  function localFunction() {\n    org.apache.flex.utils.Language.trace(self.bar);\n  };\n" +
+        		  "  function localFunction() {\n    org.apache.royale.utils.Language.trace(self.bar);\n  };\n" +
         		  "  localFunction();\n}");
     }
     
@@ -1168,7 +1168,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @export\n */\n" + 
         		  "FalconTest_A.prototype.foo = function() {\n" +
-        		  "  org.apache.flex.utils.Language.trace(this.bar);\n}");
+        		  "  org.apache.royale.utils.Language.trace(this.bar);\n}");
     }
     
     @Override
@@ -1177,7 +1177,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IBinaryOperatorNode node = getBinaryNode("a as b");
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.as(a, b)");
+        assertOut("org.apache.royale.utils.Language.as(a, b)");
     }
 
     @Test
@@ -1187,7 +1187,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {public function b(o:Object):int { var a:B; a = o as B; }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n  var /** @type {foo.bar.B} */ a;\n  a = org.apache.flex.utils.Language.as(o, foo.bar.B);\n}");
+        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n  var /** @type {foo.bar.B} */ a;\n  a = org.apache.royale.utils.Language.as(o, foo.bar.B);\n}");
     }
 
     @Test
@@ -1195,7 +1195,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IBinaryOperatorNode node = getBinaryNode("a as int");
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.as(a, Number)");
+        assertOut("org.apache.royale.utils.Language.as(a, Number)");
     }
 
     @Test
@@ -1203,7 +1203,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IBinaryOperatorNode node = getBinaryNode("a as uint");
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.as(a, Number)");
+        assertOut("org.apache.royale.utils.Language.as(a, Number)");
     }
 
     @Test
@@ -1213,7 +1213,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class B {private var memberVar:Class; public function b(o:Object):int { var a:B; a = o as memberVar; }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n  var /** @type {foo.bar.B} */ a;\n  a = org.apache.flex.utils.Language.as(o, this.memberVar);\n}");
+        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n  var /** @type {foo.bar.B} */ a;\n  a = org.apache.royale.utils.Language.as(o, this.memberVar);\n}");
     }
 
     @Test
@@ -1223,7 +1223,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "public class LinkableString {public function b(o:Object):int { var a:LinkableString; a = o as LinkableString; }}",
                 IFunctionNode.class, WRAP_LEVEL_PACKAGE, true);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.LinkableString.prototype.b = function(o) {\n  var /** @type {foo.bar.LinkableString} */ a;\n  a = org.apache.flex.utils.Language.as(o, foo.bar.LinkableString);\n}");
+        assertOut("/**\n * @export\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.LinkableString.prototype.b = function(o) {\n  var /** @type {foo.bar.LinkableString} */ a;\n  a = org.apache.royale.utils.Language.as(o, foo.bar.LinkableString);\n}");
     }
 
     @Override
@@ -1232,7 +1232,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IBinaryOperatorNode node = getBinaryNode("a is b");
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.is(a, b)");
+        assertOut("org.apache.royale.utils.Language.is(a, b)");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
index 9267882..6ef9594 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogFieldMembers;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+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.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/flexjs/TestFlexJSFile.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFile.java
index f2eda2e..f99bc12 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFile.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSFile.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.io.File;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.test.RoyaleTestBase;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.utils.TestAdapterFactory;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.test.RoyaleTestBase;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
index a022a81..ed3e1ca 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
@@ -17,22 +17,22 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogGlobalClasses;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.BinaryOperatorAssignmentNode;
-import org.apache.flex.compiler.internal.tree.as.VariableNode;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.BinaryOperatorAssignmentNode;
+import org.apache.royale.compiler.internal.tree.as.VariableNode;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Test;
 import org.junit.Ignore;
 
@@ -63,7 +63,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IFunctionNode node = getMethod("function a():void {  trace(arguments);}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.a = function() {\n  org.apache.flex.utils.Language.trace(arguments);\n}");
+        assertOut("FalconTest_A.prototype.a = function() {\n  org.apache.royale.utils.Language.trace(arguments);\n}");
     }
 
     @Test
@@ -148,7 +148,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IBinaryOperatorNode node = getBinaryNode("var a:Array = new Array(); a.sortOn('foo')");
         IFunctionCallNode parentNode = (IFunctionCallNode)(node.getParent());
         asBlockWalker.visitFunctionCall(parentNode);
-        assertOut("org.apache.flex.utils.Language.sortOn(a, 'foo')");
+        assertOut("org.apache.royale.utils.Language.sortOn(a, 'foo')");
     }
 
     @Test
@@ -157,7 +157,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IBinaryOperatorNode node = getBinaryNode("var a:Array = new Array(); a.sortOn('foo', 10)");
         IFunctionCallNode parentNode = (IFunctionCallNode)(node.getParent());
         asBlockWalker.visitFunctionCall(parentNode);
-        assertOut("org.apache.flex.utils.Language.sortOn(a, 'foo', 10)");
+        assertOut("org.apache.royale.utils.Language.sortOn(a, 'foo', 10)");
     }
 
     @Test
@@ -165,7 +165,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IVariableNode node = getVariable("var a:int = new int(\"123\");");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language._int(\"123\")");
+        assertOut("var /** @type {number} */ a = org.apache.royale.utils.Language._int(\"123\")");
     }
 
     @Override
@@ -174,7 +174,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IVariableNode node = getVariable("var a:uint = new uint(-100);");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language.uint(-100)");
+        assertOut("var /** @type {number} */ a = org.apache.royale.utils.Language.uint(-100)");
     }
 
     @Test
@@ -300,7 +300,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>(['Hello', 'World']);");
         asBlockWalker.visitVariable(node);
         //MXMLC does not report an error.  Should we?
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector(['Hello', 'World'], 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector(['Hello', 'World'], 'String')");
     }
 
     @Test
@@ -332,7 +332,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>();");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector()");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector()");
     }
 
     @Test
@@ -341,7 +341,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>('Hello', 'World');");
         asBlockWalker.visitVariable(node);
         //MXMLC does not report an error.  Should we?
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector('Hello', 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector('Hello', 'String')");
     }
 
     @Test
@@ -350,7 +350,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>('Hello', 'World', 'Three');");
         asBlockWalker.visitVariable(node);
         //MXMLC does not report an error.  Should we?
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector('Hello', 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector('Hello', 'String')");
     }
 
     @Test
@@ -358,7 +358,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>(30);");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector(30, 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector(30, 'String')");
     }
 
     @Test
@@ -367,7 +367,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>(30, 40);");
         asBlockWalker.visitVariable(node);
         //MXMLC does not report an error.  Should we?
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector(30, 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector(30, 'String')");
     }
 
     @Test
@@ -376,7 +376,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>(['Hello', 'World']);");
         asBlockWalker.visitVariable(node);
         //MXMLC does not report an error.  Should we?
-        assertOut("var /** @type {Array} */ a = org.apache.flex.utils.Language.Vector(['Hello', 'World'], 'String')");
+        assertOut("var /** @type {Array} */ a = org.apache.royale.utils.Language.Vector(['Hello', 'World'], 'String')");
     }
 
     @Test
@@ -531,7 +531,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IUnaryOperatorNode node = getUnaryNode("var a:XML = new XML(\"<top attr1='cat'><child attr2='dog'><grandchild attr3='fish'>text</grandchild></child></top>\");var b:Object = { xml: a};delete (b.xml as XML).child.grandchild;");
         asBlockWalker.visitUnaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.as(b.xml, XML).child('child').removeChild('grandchild')");
+        assertOut("org.apache.royale.utils.Language.as(b.xml, XML).child('child').removeChild('grandchild')");
     }    
 
     @Test
@@ -572,7 +572,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IUnaryOperatorNode node = getUnaryNode("var a:XML = new XML(\"<top attr1='cat'><child attr2='dog'><grandchild attr3='fish'>text</grandchild></child></top>\");var b:Object = { xml: a};delete (b.xml as XML).child.grandchild[0];");
         asBlockWalker.visitUnaryOperator(node);
-        assertOut("org.apache.flex.utils.Language.as(b.xml, XML).child('child').child('grandchild').removeChildAt(0)");
+        assertOut("org.apache.royale.utils.Language.as(b.xml, XML).child('child').child('grandchild').removeChildAt(0)");
     }
     
     @Test
@@ -582,7 +582,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IASNode parentNode = node.getParent();
         node = (IVariableNode) parentNode.getChild(1);
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {string} */ b = org.apache.flex.utils.Language.string(a.name())");
+        assertOut("var /** @type {string} */ b = org.apache.royale.utils.Language.string(a.name())");
     }
     
     @Test
@@ -642,7 +642,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         IASNode parentNode = node.getParent();
         node = (IVariableNode) parentNode.getChild(1);
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {string} */ b = org.apache.flex.utils.Language.string(a.attribute('attr1'))");
+        assertOut("var /** @type {string} */ b = org.apache.royale.utils.Language.string(a.attribute('attr1'))");
     }
     
     @Test
@@ -650,7 +650,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
     	IBinaryOperatorNode node = (IBinaryOperatorNode)getNode("var a:XML = new XML(\"<top attr1='cat'><child attr2='dog'><grandchild attr3='fish'>text</grandchild></child></top>\");var b:String; b = a.@attr1;", IBinaryOperatorNode.class);
         asBlockWalker.visitBinaryOperator(node);
-        assertOut("b = org.apache.flex.utils.Language.string(a.attribute('attr1'))");
+        assertOut("b = org.apache.royale.utils.Language.string(a.attribute('attr1'))");
     }
     
     @Test
@@ -796,7 +796,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
     	IForLoopNode node = getForLoopNode("var a:*;for each (var p:XML in (a as XMLList)) var i:int = p.length();");
         asBlockWalker.visitForLoop(node);
-        assertOut("var foreachiter0_target = org.apache.flex.utils.Language.as(a, XMLList);\nfor (var foreachiter0 in foreachiter0_target.elementNames()) \n{\nvar p = foreachiter0_target[foreachiter0];\n\n  var /** @type {number} */ i = p.length();}\n");
+        assertOut("var foreachiter0_target = org.apache.royale.utils.Language.as(a, XMLList);\nfor (var foreachiter0 in foreachiter0_target.elementNames()) \n{\nvar p = foreachiter0_target[foreachiter0];\n\n  var /** @type {number} */ i = p.length();}\n");
     }
     
     @Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalConstants.java
index 9036fe8..d75f528 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalConstants.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogGlobalConstants;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+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.tree.as.IVariableNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
index f028806..0b4b460 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogGlobalFunctions;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
 import org.junit.Test;
 
 /**
@@ -123,7 +123,7 @@ public class TestRoyaleGlobalFunctions extends TestGoogGlobalFunctions
     {
         IVariableNode node = getVariable("var a:int = int(1.8);");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language._int(1.8)");
+        assertOut("var /** @type {number} */ a = org.apache.royale.utils.Language._int(1.8)");
     }
 
     @Test
@@ -131,7 +131,7 @@ public class TestRoyaleGlobalFunctions extends TestGoogGlobalFunctions
     {
         IVariableNode node = getVariable("var a:int = int(\"123\");");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language._int(\"123\")");
+        assertOut("var /** @type {number} */ a = org.apache.royale.utils.Language._int(\"123\")");
     }
 
     @Override
@@ -141,7 +141,7 @@ public class TestRoyaleGlobalFunctions extends TestGoogGlobalFunctions
         IFunctionCallNode node = (IFunctionCallNode) getNode(
                 "trace('Hello World');", IFunctionCallNode.class);
         asBlockWalker.visitFunctionCall(node);
-        assertOut("org.apache.flex.utils.Language.trace('Hello World')");
+        assertOut("org.apache.royale.utils.Language.trace('Hello World')");
     }
 
     @Override
@@ -150,7 +150,7 @@ public class TestRoyaleGlobalFunctions extends TestGoogGlobalFunctions
     {
         IVariableNode node = getVariable("var a:uint = uint(-100);");
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language.uint(-100)");
+        assertOut("var /** @type {number} */ a = org.apache.royale.utils.Language.uint(-100)");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
index be2db71..aece6a5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogInterface;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
+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.tree.as.IInterfaceNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSJSX.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSJSX.java
index a85e5a1..866f6e6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSJSX.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSJSX.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+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/flexjs/TestFlexJSMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
index 10fd1b6..17da2e8 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogMethodMembers;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+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.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/flexjs/TestFlexJSPackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
index 57e94cf..d0e3fc6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import java.util.ArrayList;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogPackage;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.tree.as.IFileNode;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
@@ -925,7 +925,7 @@ public class TestRoyalePackage extends TestGoogPackage
         		  " * @constructor\n" +
         		  " */\n" +
         		  "foo.bar.baz.A = function() {\n" +
-        		  "  var /** @type {foo.bar.baz.A.ITestInterface} */ internalClass = org.apache.flex.utils.Language.as(new foo.bar.baz.A.InternalClass(), foo.bar.baz.A.ITestInterface);\n" +
+        		  "  var /** @type {foo.bar.baz.A.ITestInterface} */ internalClass = org.apache.royale.utils.Language.as(new foo.bar.baz.A.InternalClass(), foo.bar.baz.A.ITestInterface);\n" +
         		  "  internalClass.test();\n" +
         		  "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('foo.bar.baz.A', foo.bar.baz.A);\n" +
         		  "\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
index a2e6b3f..596c935 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -28,16 +28,16 @@ import java.util.Collection;
 import java.util.List;
 
 import junit.framework.Assert;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogProject;
-import org.apache.flex.compiler.internal.config.TargetSettings;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+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.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
index bf556b9..b207030 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java
@@ -17,23 +17,23 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.flexjs;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.js.goog.TestGoogStatements;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.IImportNode;
-import org.apache.flex.compiler.tree.as.ILiteralNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWhileLoopNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
+package org.apache.royale.compiler.internal.codegen.js.flexjs;
+
+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.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.IImportNode;
+import org.apache.royale.compiler.tree.as.ILiteralNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWhileLoopNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
index 02965c0..11fc511 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestAccessorMembers;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestAccessorMembers;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
index cd260f4..6746c2f 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogClass.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestClass;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestClass;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
@@ -40,7 +40,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -51,7 +51,7 @@ public class TestGoogClass extends TestClass
         //               in JS we ignore it
         IClassNode node = getClassNode("internal class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -62,7 +62,7 @@ public class TestGoogClass extends TestClass
         //               in JS we ignore it
         IClassNode node = getClassNode("public final class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -72,7 +72,7 @@ public class TestGoogClass extends TestClass
         // (erikdebruin) all JS objects are 'dynamic' by design
         IClassNode node = getClassNode("public dynamic class A{}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -81,7 +81,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.royale.A = function() {\n\torg.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -90,7 +90,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -99,7 +99,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Override
@@ -108,7 +108,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.royale.A = function() {\n\torg.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -117,7 +117,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n\torg.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -126,7 +126,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public final class A extends EventDispatcher implements IEventDispatcher, IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n\torg.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -135,7 +135,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher implements flash.events.IEventDispatcher, flash.display.IBitmapDrawable {public function A() {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.flex.A = function() {\n\torg.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @implements {flash.events.IEventDispatcher}\n * @implements {flash.display.IBitmapDrawable}\n */\norg.apache.royale.A = function() {\n\torg.apache.royale.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -144,7 +144,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A {public function A() { }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};");
     }
 
     @Test
@@ -152,7 +152,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A {public function A() { super(); }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\t;\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n\tvar self = this;\n\t;\n};");
     }
 
     @Test
@@ -160,7 +160,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher { public function A() { super('foo', 42);}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\torg.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n */\norg.apache.royale.A = function() {\n\tvar self = this;\n\torg.apache.royale.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -169,7 +169,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n};");
+        assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n};");
     }
 
     @Override
@@ -178,7 +178,7 @@ public class TestGoogClass extends TestClass
     {
         IClassNode node = getClassNode("public class A extends flash.events.EventDispatcher {public function A(arg1:String, arg2:int) {}}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n\torg.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, flash.events.EventDispatcher);");
+        assertOut("/**\n * @constructor\n * @extends {flash.events.EventDispatcher}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.royale.A = function(arg1, arg2) {\n\torg.apache.royale.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.royale.A, flash.events.EventDispatcher);");
     }
 
     @Override
@@ -188,7 +188,7 @@ public class TestGoogClass extends TestClass
         IClassNode node = getClassNode("public class A {public var a:Object;protected var b:String; "
                 + "private var c:int; internal var d:uint; var e:Number}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.flex.A.prototype.a;\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.flex.A.prototype.b;\n\n/**\n * @private\n * @type {number}\n */\norg.apache.flex.A.prototype.c;\n\n/**\n * @type {number}\n */\norg.apache.flex.A.prototype.d;\n\n/**\n * @type {number}\n */\norg.apache.flex.A.prototype.e;");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.a;\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.royale.A.prototype.b;\n\n/**\n * @private\n * @type {number}\n */\norg.apache.royale.A.prototype.c;\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.d;\n\n/**\n * @type {number}\n */\norg.apache.royale.A.prototype.e;");
     }
 
     @Override
@@ -201,7 +201,7 @@ public class TestGoogClass extends TestClass
                 + "private static const C:Number = 42;"
                 + "foo_bar static const C:String = 'me' + 'you';}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n/**\n * @const\n * @type {number}\n */\norg.apache.flex.A.A = 42;\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg.apache.flex.A.B = 42;\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg.apache.flex.A.C = 42;\n\n/**\n * @const\n * @type {string}\n */\norg.apache.flex.A.C = 'me' + 'you';");
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @const\n * @type {number}\n */\norg.apache.royale.A.A = 42;\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg.apache.royale.A.B = 42;\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg.apache.royale.A.C = 42;\n\n/**\n * @const\n * @type {string}\n */\norg.apache.royale.A.C = 'me' + 'you';");
     }
 
     @Override
@@ -220,7 +220,7 @@ public class TestGoogClass extends TestClass
                 + "foo_bar function get foo6():Object{return null;}"
                 + "foo_bar function set foo6(value:Object):void{}" + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.flex.A.prototype.foo1;\n\nObject.defineProperty(\n\torg.apache.flex.A.prototype, \n\t'foo1', \n\t{get:function() {\n\t\tvar self = this;\n\t\treturn null;\n\t}, configurable:true}\n);\n\nObject.defineProperty(\n\torg.apache.flex.A.prototype, \n\t'foo1', \n\t{set:function(value) {\n\t}, configurable:true}\n);\n\n/**\n * @protected\n * @type {Object}\n */\norg.apach [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @type {Object}\n */\norg.apache.royale.A.prototype.foo1;\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{get:function() {\n\t\tvar self = this;\n\t\treturn null;\n\t}, configurable:true}\n);\n\nObject.defineProperty(\n\torg.apache.royale.A.prototype, \n\t'foo1', \n\t{set:function(value) {\n\t}, configurable:true}\n);\n\n/**\n * @protected\n * @type {Object}\n */\no [...]
     }
 
     @Override
@@ -238,13 +238,13 @@ public class TestGoogClass extends TestClass
                 + "public static function foo7(value:Object):void{}"
                 + "foo_bar static function foo7(value:Object):void{}" + "}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n/**\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1 = function() {\n\tvar self = this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1a = function() {\n\tvar self = this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n * @override\n */\norg.apache.flex.A.prototype.foo1b = function() {\n\tvar self = this;\n\treturn org.apache.flex.A.base(this, 'foo1b') [...]
+        assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function() {\n};\n\n/**\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1 = function() {\n\tvar self = this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n */\norg.apache.royale.A.prototype.foo1a = function() {\n\tvar self = this;\n\treturn null;\n};\n\n/**\n * @return {Object}\n * @override\n */\norg.apache.royale.A.prototype.foo1b = function() {\n\tvar self = this;\n\treturn org.apache.royale.A.base(this [...]
     }
 
     @Override
     protected IClassNode getClassNode(String code)
     {
-        String source = "package org.apache.flex {import flash.events.IEventDispatcher;import flash.events.EventDispatcher;import flash.events.Event;import flash.display.IBitmapDrawable;"
+        String source = "package org.apache.royale {import flash.events.IEventDispatcher;import flash.events.EventDispatcher;import flash.events.Event;import flash.display.IBitmapDrawable;"
                 + code + "}";
         IFileNode node = compileAS(source);
         IClassNode child = (IClassNode) findFirstDescendantOfType(node,
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
index 28d4a8a..57548d7 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFileNode;
+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/goog/TestGoogExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index df0c1cc..02d164a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestExpressions;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+package org.apache.royale.compiler.internal.codegen.js.goog;
+
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestExpressions;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+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/goog/TestGoogFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
index e4ead99..21836c1 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestFieldMembers;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestFieldMembers;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+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/goog/TestGoogFile.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFile.java
index dcfacb2..5cb6e5b 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFile.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFile.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
 import java.io.File;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
index fc9e523..4ddfb55 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestGlobalClasses;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestGlobalClasses;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+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/goog/TestGoogGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
index 4bb2186..baa7b66 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestGlobalConstants;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestGlobalConstants;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+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/goog/TestGoogGlobalFunctions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalFunctions.java
index 614edd5..5b54916 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalFunctions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalFunctions.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestGlobalFunctions;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestGlobalFunctions;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+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/goog/TestGoogInterface.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogInterface.java
index 460515a..e4b64c3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogInterface.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogInterface.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestInterface;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestInterface;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+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/goog/TestGoogMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
index 95234ea..b733ce3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestMethodMembers;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestMethodMembers;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+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/goog/TestGoogPackage.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogPackage.java
index 51c4ef2..4e3d982 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogPackage.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogPackage.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestPackage;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestPackage;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.tree.as.IFileNode;
 import org.junit.Test;
 
 /**
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogProject.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogProject.java
index 6d70fa0..94c8ee2 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogProject.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogProject.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
+package org.apache.royale.compiler.internal.codegen.js.goog;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.test.ASTestBase;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.internal.test.ASTestBase;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
index cf550da..7b795db 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.goog;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.TestStatements;
-import org.apache.flex.compiler.internal.driver.js.goog.GoogBackend;
-import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+package org.apache.royale.compiler.internal.codegen.js.goog;
+
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.codegen.as.TestStatements;
+import org.apache.royale.compiler.internal.driver.js.goog.GoogBackend;
+import org.apache.royale.compiler.internal.tree.as.LabeledStatementNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+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/sourcemaps/TestSourceMapExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapExpressions.java
index 8d24744..f9dff81 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
@@ -16,22 +16,22 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.sourcemaps;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.test.SourceMapTestBase;
-import org.apache.flex.compiler.internal.tree.as.ArrayLiteralNode;
-import org.apache.flex.compiler.internal.tree.as.ObjectLiteralNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IFunctionCallNode;
-import org.apache.flex.compiler.tree.as.IIterationFlowNode;
-import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IReturnNode;
-import org.apache.flex.compiler.tree.as.ITernaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IThrowNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
+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.test.SourceMapTestBase;
+import org.apache.royale.compiler.internal.tree.as.ArrayLiteralNode;
+import org.apache.royale.compiler.internal.tree.as.ObjectLiteralNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IFunctionCallNode;
+import org.apache.royale.compiler.tree.as.IIterationFlowNode;
+import org.apache.royale.compiler.tree.as.IMemberAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IReturnNode;
+import org.apache.royale.compiler.tree.as.ITernaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IThrowNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
 
 import org.junit.Test;
 
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 dbade19..11a251c 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
@@ -16,12 +16,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.sourcemaps;
+package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.test.SourceMapTestBase;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.test.SourceMapTestBase;
+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/sourcemaps/TestSourceMapGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapGlobalClasses.java
index 1904fb4..58ff31c 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
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.internal.codegen.js.sourcemaps;
+package org.apache.royale.compiler.internal.codegen.js.sourcemaps;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.test.SourceMapTestBase;
-import org.apache.flex.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.flexjs.RoyaleBackend;
+import org.apache.royale.compiler.internal.test.SourceMapTestBase;
+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/sourcemaps/TestSourceMapStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapStatements.java
index ba1b70f..3bcdba1 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
@@ -16,17 +16,17 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.js.sourcemaps;
-
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.flexjs.RoyaleBackend;
-import org.apache.flex.compiler.internal.test.SourceMapTestBase;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IIfNode;
-import org.apache.flex.compiler.tree.as.ISwitchNode;
-import org.apache.flex.compiler.tree.as.ITryNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.as.IWithNode;
+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.test.SourceMapTestBase;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IIfNode;
+import org.apache.royale.compiler.tree.as.ISwitchNode;
+import org.apache.royale.compiler.tree.as.ITryNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.compiler.tree.as.IWithNode;
 
 import org.junit.Test;
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLApplication.java
index fbfe6b8..69c32d8 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLApplication.java
@@ -16,10 +16,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
-import org.apache.flex.compiler.internal.test.MXMLTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.internal.test.MXMLTestBase;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
 import org.junit.Test;
 
 public class TestMXMLApplication extends MXMLTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLAttributes.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLAttributes.java
index 5292df3..a5c3a53 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLAttributes.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLAttributes.java
@@ -16,14 +16,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.flex.compiler.internal.test.MXMLTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.internal.test.MXMLTestBase;
+import org.apache.royale.compiler.tree.mxml.IMXMLInstanceNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
 import org.junit.Test;
 
 public class TestMXMLAttributes extends MXMLTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLNodes.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLNodes.java
index ba39c2b..8c46637 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLNodes.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLNodes.java
@@ -16,10 +16,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
-import org.apache.flex.compiler.internal.test.MXMLTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLPropertySpecifierNode;
+import org.apache.royale.compiler.internal.test.MXMLTestBase;
+import org.apache.royale.compiler.tree.mxml.IMXMLPropertySpecifierNode;
 import org.junit.Test;
 
 public class TestMXMLNodes extends MXMLTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLScript.java
index 912ff45..b12d948 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/TestMXMLScript.java
@@ -16,10 +16,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml;
+package org.apache.royale.compiler.internal.codegen.mxml;
 
-import org.apache.flex.compiler.internal.test.MXMLTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.internal.test.MXMLTestBase;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
 import org.junit.Test;
 
 public class TestMXMLScript extends MXMLTestBase
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
index efe69e2..5358b05 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
@@ -16,23 +16,23 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.flex.compiler.clients.MXMLJSC;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.driver.js.flexjs.JSCSSCompilationSession;
-import org.apache.flex.compiler.internal.driver.js.goog.JSGoogConfiguration;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.test.RoyaleTestBase;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+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.driver.js.goog.JSGoogConfiguration;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.test.RoyaleTestBase;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Test;
 
 import java.io.File;
@@ -121,9 +121,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     @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.flex.core.IChrome\">"
+        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\">"
         		+ "<fx:Script><![CDATA["
-                + "    import org.apache.flex.core.IChrome;"
+                + "    import org.apache.royale.core.IChrome;"
                 + "]]></fx:Script></basic:Application>";
 
         IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code,
@@ -142,15 +142,15 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.IChrome');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.IChrome');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
-        		" * @implements {org.apache.flex.core.IChrome}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
+        		" * @implements {org.apache.royale.core.IChrome}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
@@ -167,7 +167,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"   */\n" +
         		"  this.mxmldp;\n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -182,7 +182,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		" *\n" +
         		" * @type {Object.<string, Array.<Object>>}\n" +
         		" */\n" +
-        		"AppName.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'AppName', qName: 'AppName', kind: 'class'  }], interfaces: [org.apache.flex.core.IChrome] };\n" +
+        		"AppName.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'AppName', qName: 'AppName', kind: 'class'  }], interfaces: [org.apache.royale.core.IChrome] };\n" +
           		"\n" +
         		"\n" +
         		"\n" +
@@ -211,10 +211,10 @@ 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.flex.core.IChrome, org.apache.flex.core.IPopUp\">"
+        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\">"
         		+ "<fx:Script><![CDATA["
-                + "    import org.apache.flex.core.IPopUp;"
-                + "    import org.apache.flex.core.IChrome;"
+                + "    import org.apache.royale.core.IPopUp;"
+                + "    import org.apache.royale.core.IChrome;"
                 + "]]></fx:Script></basic:Application>";
 
         IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code,
@@ -233,17 +233,17 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.IChrome');\n" +
-        		"goog.require('org.apache.flex.core.IPopUp');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.IChrome');\n" +
+        		"goog.require('org.apache.royale.core.IPopUp');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
-        		" * @implements {org.apache.flex.core.IChrome}\n" +
-        		" * @implements {org.apache.flex.core.IPopUp}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
+        		" * @implements {org.apache.royale.core.IChrome}\n" +
+        		" * @implements {org.apache.royale.core.IPopUp}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
@@ -260,7 +260,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"   */\n" +
         		"  this.mxmldp;\n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -275,7 +275,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		" *\n" +
         		" * @type {Object.<string, Array.<Object>>}\n" +
         		" */\n" +
-        		"AppName.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'AppName', qName: 'AppName', kind: 'class'  }], interfaces: [org.apache.flex.core.IChrome, org.apache.flex.core.IPopUp] };\n" +
+        		"AppName.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'AppName', qName: 'AppName', kind: 'class'  }], interfaces: [org.apache.royale.core.IChrome, org.apache.royale.core.IPopUp] };\n" +
           		"\n" +
         		"\n" +
         		"\n" +
@@ -306,7 +306,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     {
         String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
         		+ "<fx:Script><![CDATA["
-                + "    import org.apache.flex.net.HTTPConstants;"
+                + "    import org.apache.royale.net.HTTPConstants;"
                 + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>";
 
         IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code,
@@ -325,29 +325,29 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.View');\n" +
-        		"goog.require('org.apache.flex.html.Label');\n" +
-        		"goog.require('org.apache.flex.net.HTTPConstants');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.View');\n" +
+        		"goog.require('org.apache.royale.html.Label');\n" +
+        		"goog.require('org.apache.royale.net.HTTPConstants');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.core.View}\n" +
+        		"   * @type {org.apache.royale.core.View}\n" +
         		"   */\n" +
         		"  this.$ID1_;\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.html.Label}\n" +
+        		"   * @type {org.apache.royale.html.Label}\n" +
         		"   */\n" +
         		"  this.$ID0_;\n" +
         		"  \n" +
@@ -367,13 +367,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"  ([1,\n" +
         		"'initialView',\n" +
         		"false,\n" +
-        		"[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
+        		"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
         		"0,\n" +
         		"0\n" +
         		"  ]);\n" +
         		"  \n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -388,7 +388,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		" */\n" +
         		"AppName.prototype._bindings = [\n" +
         		"1,\n" +
-        		"[\"org.apache.flex.net.HTTPConstants\", \"GET\"],\n" +
+        		"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
         		"null,\n" +
         		"[\"$ID0\", \"text\"],\n" +
         		"];\n" +
@@ -428,8 +428,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
     {
         String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:basic=\"library://ns.apache.org/flexjs/basic\">"
         		+ "<fx:Script><![CDATA["
-                + "    import org.apache.flex.net.HTTPConstants;"
-                + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{org.apache.flex.net.HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>";
+                + "    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>";
 
         IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code,
         		IMXMLDocumentNode.class, RoyaleTestBase.WRAP_LEVEL_NONE);
@@ -447,29 +447,29 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.View');\n" +
-        		"goog.require('org.apache.flex.html.Label');\n" +
-        		"goog.require('org.apache.flex.net.HTTPConstants');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.View');\n" +
+        		"goog.require('org.apache.royale.html.Label');\n" +
+        		"goog.require('org.apache.royale.net.HTTPConstants');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.core.View}\n" +
+        		"   * @type {org.apache.royale.core.View}\n" +
         		"   */\n" +
         		"  this.$ID1_;\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.html.Label}\n" +
+        		"   * @type {org.apache.royale.html.Label}\n" +
         		"   */\n" +
         		"  this.$ID0_;\n" +
         		"  \n" +
@@ -489,13 +489,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"  ([1,\n" +
         		"'initialView',\n" +
         		"false,\n" +
-        		"[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
+        		"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
         		"0,\n" +
         		"0\n" +
         		"  ]);\n" +
         		"  \n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -510,7 +510,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		" */\n" +
         		"AppName.prototype._bindings = [\n" +
         		"1,\n" +
-        		"[\"org.apache.flex.net.HTTPConstants\", \"GET\"],\n" +
+        		"[\"org.apache.royale.net.HTTPConstants\", \"GET\"],\n" +
         		"null,\n" +
         		"[\"$ID0\", \"text\"],\n" +
         		"];\n" +
@@ -570,29 +570,29 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.View');\n" +
-        		"goog.require('org.apache.flex.html.Label');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.View');\n" +
+        		"goog.require('org.apache.royale.html.Label');\n" +
         		"goog.require('binding.ComplexValueObject');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.core.View}\n" +
+        		"   * @type {org.apache.royale.core.View}\n" +
         		"   */\n" +
         		"  this.$ID1_;\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.html.Label}\n" +
+        		"   * @type {org.apache.royale.html.Label}\n" +
         		"   */\n" +
         		"  this.$ID0_;\n" +
         		"  \n" +
@@ -612,13 +612,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"  ([1,\n" +
         		"'initialView',\n" +
         		"false,\n" +
-        		"[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
+        		"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
         		"0,\n" +
         		"0\n" +
         		"  ]);\n" +
         		"  \n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -725,9 +725,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
-        		"goog.require('org.apache.flex.core.View');\n" +
-        		"goog.require('org.apache.flex.html.Label');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.View');\n" +
+        		"goog.require('org.apache.royale.html.Label');\n" +
         		"goog.require('XML');\n" +
         		"goog.require('XML');\n" +
         		"\n" +
@@ -735,7 +735,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
@@ -743,13 +743,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"  this.xml = new XML();\n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.core.View}\n" +
+        		"   * @type {org.apache.royale.core.View}\n" +
         		"   */\n" +
         		"  this.$ID1_;\n" +
         		"  \n" +
         		"  /**\n" +
         		"   * @private\n" +
-        		"   * @type {org.apache.flex.html.Label}\n" +
+        		"   * @type {org.apache.royale.html.Label}\n" +
         		"   */\n" +
         		"  this.$ID0_;\n" +
         		"  \n" +
@@ -769,13 +769,13 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
         		"  ([1,\n" +
         		"'initialView',\n" +
         		"false,\n" +
-        		"[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 2, '_id', true, '$ID0', 'text', true, 'Hello World', 0, 0, null]],\n" +
+        		"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 2, '_id', true, '$ID0', 'text', true, 'Hello World', 0, 0, null]],\n" +
         		"0,\n" +
         		"0\n" +
         		"  ]);\n" +
         		"  \n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
index d2e447a..661292c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java
@@ -16,12 +16,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml.flexjs;
+package org.apache.royale.compiler.internal.codegen.mxml.flexjs;
 
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.test.RoyaleTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.compiler.internal.codegen.js.flexjs.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;
 import org.junit.Test;
 
 public class TestRoyaleMXMLScript extends RoyaleTestBase
@@ -53,13 +53,13 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
@@ -76,7 +76,7 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"   */\n" +
         		"  this.mxmldp;\n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -154,18 +154,18 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
         		"  \n" +
-        		"  this.foo = org.apache.flex.utils.Language.closure(this.bar, this, 'bar');\n" +
+        		"  this.foo = org.apache.royale.utils.Language.closure(this.bar, this, 'bar');\n" +
         		"  /**\n" +
         		"   * @private\n" +
         		"   * @type {Array}\n" +
@@ -178,7 +178,7 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"   */\n" +
         		"  this.mxmldp;\n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
@@ -260,13 +260,13 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"\n" +
         		"goog.provide('AppName');\n" +
         		"\n" +
-        		"goog.require('org.apache.flex.core.Application');\n" +
+        		"goog.require('org.apache.royale.core.Application');\n" +
         		"\n" +
         		"\n" +
         		"\n" +
         		"/**\n" +
         		" * @constructor\n" +
-        		" * @extends {org.apache.flex.core.Application}\n" +
+        		" * @extends {org.apache.royale.core.Application}\n" +
         		" */\n" +
         		"AppName = function() {\n" +
         		"  AppName.base(this, 'constructor');\n" +
@@ -284,7 +284,7 @@ public class TestRoyaleMXMLScript extends RoyaleTestBase
         		"   */\n" +
         		"  this.mxmldp;\n" +
         		"};\n" +
-        		"goog.inherits(AppName, org.apache.flex.core.Application);\n" +
+        		"goog.inherits(AppName, org.apache.royale.core.Application);\n" +
           		"\n" +
         		"\n" +
         		"/**\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java
index a40e3d9..c5067fe 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLEvents.java
@@ -16,12 +16,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml.sourcemaps;
+package org.apache.royale.compiler.internal.codegen.mxml.sourcemaps;
 
-import org.apache.flex.compiler.internal.test.RoyaleSourceMapTestBase;
-import org.apache.flex.compiler.internal.test.RoyaleTestBase;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode;
+import org.apache.royale.compiler.internal.test.RoyaleSourceMapTestBase;
+import org.apache.royale.compiler.internal.test.RoyaleTestBase;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLEventSpecifierNode;
 
 import org.junit.Test;
 
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 fdf1c9b..05a6b1f 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
@@ -16,14 +16,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.codegen.mxml.sourcemaps;
+package org.apache.royale.compiler.internal.codegen.mxml.sourcemaps;
 
-import org.apache.flex.compiler.definitions.IClassDefinition;
-import org.apache.flex.compiler.internal.codegen.js.flexjs.JSRoyaleEmitter;
-import org.apache.flex.compiler.internal.test.RoyaleSourceMapTestBase;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode;
+import org.apache.royale.compiler.definitions.IClassDefinition;
+import org.apache.royale.compiler.internal.codegen.js.flexjs.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;
+import org.apache.royale.compiler.tree.mxml.IMXMLDocumentNode;
 
 import org.junit.Test;
 import static org.junit.Assert.assertTrue;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/AMDTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/AMDTestBase.java
index faa7ea0..0e64896 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/AMDTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/AMDTestBase.java
@@ -17,24 +17,24 @@
  *
  */
 
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.io.File;
 import java.util.List;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend;
-import org.apache.flex.compiler.tree.as.IClassNode;
-import org.apache.flex.compiler.tree.as.IDefinitionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IGetterNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.ISetterNode;
-import org.apache.flex.compiler.tree.as.ITypeNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.js.amd.AMDBackend;
+import org.apache.royale.compiler.tree.as.IClassNode;
+import org.apache.royale.compiler.tree.as.IDefinitionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IGetterNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.ISetterNode;
+import org.apache.royale.compiler.tree.as.ITypeNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.TestAdapterFactory;
 
 /**
  * This class tests the production of AMD JavaScript for AS package.
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
index 4559089..aa66c6d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
@@ -16,28 +16,28 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.io.File;
 import java.util.List;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.as.ASBackend;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IAccessorNode;
-import org.apache.flex.compiler.tree.as.IBinaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IDynamicAccessNode;
-import org.apache.flex.compiler.tree.as.IExpressionNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.as.IForLoopNode;
-import org.apache.flex.compiler.tree.as.IFunctionNode;
-import org.apache.flex.compiler.tree.as.IInterfaceNode;
-import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
-import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
-import org.apache.flex.compiler.tree.as.IVariableNode;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.as.ASBackend;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IAccessorNode;
+import org.apache.royale.compiler.tree.as.IBinaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IDynamicAccessNode;
+import org.apache.royale.compiler.tree.as.IExpressionNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.as.IForLoopNode;
+import org.apache.royale.compiler.tree.as.IFunctionNode;
+import org.apache.royale.compiler.tree.as.IInterfaceNode;
+import org.apache.royale.compiler.tree.as.INamespaceAccessExpressionNode;
+import org.apache.royale.compiler.tree.as.IUnaryOperatorNode;
+import org.apache.royale.compiler.tree.as.IVariableNode;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Ignore;
 
 @Ignore
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSSourceMapTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSSourceMapTestBase.java
index e621121..749df0e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSSourceMapTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSSourceMapTestBase.java
@@ -16,12 +16,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 import com.google.debugging.sourcemap.FilePosition;
 import static org.junit.Assert.assertTrue;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSTestBase.java
index a61b1c2..c593bd8 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/FlexJSTestBase.java
@@ -16,23 +16,23 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.io.File;
 import java.util.List;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
-import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.mxml.IMXMLNamespaceMapping;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLScriptNode;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.mxml.flexjs.MXMLRoyaleBackend;
+import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.mxml.IMXMLNamespaceMapping;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLScriptNode;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Ignore;
 
 @Ignore
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ITestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ITestBase.java
index 9096022..d7f5ed9 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ITestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ITestBase.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 public interface ITestBase
 {
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java
index eee073c..18fc565 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/MXMLTestBase.java
@@ -16,19 +16,19 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.io.File;
 import java.util.List;
 
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.driver.mxml.MXMLBackend;
-import org.apache.flex.compiler.internal.mxml.MXMLNamespaceMapping;
-import org.apache.flex.compiler.mxml.IMXMLNamespaceMapping;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLNode;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.driver.IBackend;
+import org.apache.royale.compiler.internal.driver.mxml.MXMLBackend;
+import org.apache.royale.compiler.internal.mxml.MXMLNamespaceMapping;
+import org.apache.royale.compiler.mxml.IMXMLNamespaceMapping;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLNode;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.Ignore;
 
 @Ignore
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/SourceMapTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/SourceMapTestBase.java
index c8a6cb7..df0f30a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/SourceMapTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/SourceMapTestBase.java
@@ -16,13 +16,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import java.util.List;
 
-import org.apache.flex.compiler.codegen.js.IJSEmitter;
-import org.apache.flex.compiler.codegen.js.IMappingEmitter;
-import org.apache.flex.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.codegen.js.IJSEmitter;
+import org.apache.royale.compiler.codegen.js.IMappingEmitter;
+import org.apache.royale.compiler.tree.as.IASNode;
 
 import com.google.debugging.sourcemap.FilePosition;
 import static org.junit.Assert.assertTrue;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
index d9a43e9..3ef6ea4 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.internal.test;
+package org.apache.royale.compiler.internal.test;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertNotNull;
@@ -41,33 +41,33 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFileFilter;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.flex.compiler.clients.MXMLJSC;
-import org.apache.flex.compiler.codegen.as.IASEmitter;
-import org.apache.flex.compiler.codegen.mxml.IMXMLEmitter;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.driver.IBackend;
-import org.apache.flex.compiler.internal.codegen.as.ASFilterWriter;
-import org.apache.flex.compiler.internal.projects.RoyaleProject;
-import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator;
-import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
-import org.apache.flex.compiler.internal.targets.JSTarget;
-import org.apache.flex.compiler.internal.tree.as.FunctionNode;
-import org.apache.flex.compiler.internal.tree.as.ImportNode;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.mxml.IMXMLNamespaceMapping;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.requests.ISyntaxTreeRequestResult;
-import org.apache.flex.utils.EnvProperties;
-import org.apache.flex.compiler.visitor.as.IASBlockWalker;
-import org.apache.flex.compiler.visitor.mxml.IMXMLBlockWalker;
-import org.apache.flex.utils.FilenameNormalization;
-import org.apache.flex.utils.ITestAdapter;
-import org.apache.flex.utils.TestAdapterFactory;
+import org.apache.royale.compiler.clients.MXMLJSC;
+import org.apache.royale.compiler.codegen.as.IASEmitter;
+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.as.ASFilterWriter;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
+import org.apache.royale.compiler.internal.projects.FlexProjectConfigurator;
+import org.apache.royale.compiler.internal.projects.ISourceFileHandler;
+import org.apache.royale.compiler.internal.targets.JSTarget;
+import org.apache.royale.compiler.internal.tree.as.FunctionNode;
+import org.apache.royale.compiler.internal.tree.as.ImportNode;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.mxml.IMXMLNamespaceMapping;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.tree.mxml.IMXMLFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.requests.ISyntaxTreeRequestResult;
+import org.apache.royale.utils.EnvProperties;
+import org.apache.royale.compiler.visitor.as.IASBlockWalker;
+import org.apache.royale.compiler.visitor.mxml.IMXMLBlockWalker;
+import org.apache.royale.utils.FilenameNormalization;
+import org.apache.royale.utils.ITestAdapter;
+import org.apache.royale.utils.TestAdapterFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java b/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
index 210468a..6cc7771 100644
--- a/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
+++ b/compiler-jx/src/test/java/org/apache/royale/utils/EnvProperties.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 82c6aaf..5dfdbe1 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs.compiler</groupId>
+    <groupId>org.apache.royale.flexjs.compiler</groupId>
     <artifactId>flexjs-compiler-parent</artifactId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
index 7be0873..40f2367 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import org.junit.Assert;
 
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
index 4bd14c4..6f38ddf 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/EnvProperties.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/FilenameNormalization.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/FilenameNormalization.java
index 2d83e76..7f75af0 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/FilenameNormalization.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/FilenameNormalization.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import java.io.File;
 
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
index f57a58c..fec9858 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/ITestAdapter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import java.io.File;
 import java.util.List;
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
index 41d1f80..6f79900 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/MavenTestAdapter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -56,9 +56,9 @@ public class MavenTestAdapter implements ITestAdapter {
         libs.add(getPlayerglobal());
         if(withFlex) {
             String flexVersion = System.getProperty("flexVersion");
-            libs.add(getDependency("org.apache.flex.framework", "framework", flexVersion, "swc", null));
-            libs.add(getDependency("org.apache.flex.framework", "rpc", flexVersion, "swc", null));
-            libs.add(getDependency("org.apache.flex.framework", "spark", flexVersion, "swc", null));
+            libs.add(getDependency("org.apache.royale.framework", "framework", flexVersion, "swc", null));
+            libs.add(getDependency("org.apache.royale.framework", "rpc", flexVersion, "swc", null));
+            libs.add(getDependency("org.apache.royale.framework", "spark", flexVersion, "swc", null));
         }
         return libs;
     }
@@ -87,7 +87,7 @@ public class MavenTestAdapter implements ITestAdapter {
 
     @Override
     public String getFlexManifestPath(String type) {
-        File configsZip = getDependency("org.apache.flex.framework", "framework",
+        File configsZip = getDependency("org.apache.royale.framework", "framework",
                 System.getProperty("flexVersion"), "zip", "configs");
         File frameworkDir = configsZip.getParentFile();
         File unpackedConfigsDir = new File(frameworkDir, "configs_zip");
@@ -102,18 +102,18 @@ public class MavenTestAdapter implements ITestAdapter {
     @Override
     public File getFlexArtifact(String artifactName) {
         String flexVersion = System.getProperty("flexVersion");
-        return getDependency("org.apache.flex.framework", artifactName, flexVersion, "swc", null);
+        return getDependency("org.apache.royale.framework", artifactName, flexVersion, "swc", null);
     }
 
     @Override
     public File getFlexArtifactResourceBundle(String artifactName) {
         String flexVersion = System.getProperty("flexVersion");
-        return getDependency("org.apache.flex.framework", artifactName, flexVersion, "rb.swc", "en_US");
+        return getDependency("org.apache.royale.framework", artifactName, flexVersion, "rb.swc", "en_US");
     }
 
     @Override
     public String getFlexJsManifestPath(String type) {
-        File configsZip = getDependency("org.apache.flex.framework.flexjs", "framework",
+        File configsZip = getDependency("org.apache.royale.framework.flexjs", "framework",
                 System.getProperty("flexJsVersion"), "zip", "configs");
         File frameworkDir = configsZip.getParentFile();
         File unpackedConfigsDir = new File(frameworkDir, "configs_zip");
@@ -128,7 +128,7 @@ public class MavenTestAdapter implements ITestAdapter {
     @Override
     public File getRoyaleArtifact(String artifactName) {
         String flexJsVersion = System.getProperty("flexJsVersion");
-        return getDependency("org.apache.flex.framework.flexjs", artifactName, flexJsVersion, "swc", null);
+        return getDependency("org.apache.royale.framework.flexjs", artifactName, flexJsVersion, "swc", null);
     }
 
     @Override
diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/TestAdapterFactory.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/TestAdapterFactory.java
index ccdb0c2..f9db558 100644
--- a/compiler-test-utils/src/main/java/org/apache/royale/utils/TestAdapterFactory.java
+++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/TestAdapterFactory.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.utils;
+package org.apache.royale.utils;
 
 /**
  * Created by christoferdutz on 10.03.16.
diff --git a/compiler/build.xml b/compiler/build.xml
index 6ee5110..7b84534 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -185,7 +185,7 @@
         <attribute name="file"/>
         <attribute name="annotation"/>
         <sequential>
-            <java classname="org.apache.flex.compiler.tools.annotate.AnnotateClass" fork="false">
+            <java classname="org.apache.royale.compiler.tools.annotate.AnnotateClass" fork="false">
                 <classpath>
                     <path refid="classpath"/>
                     <pathelement location="${compiler}/../compiler-build-tools/target/classes"/>
@@ -361,7 +361,7 @@
     
     <target name="unknown.tree.handler.patterns" depends="set.unknown.tree.handler.patterns.uptodate" unless="unknown.tree.handler.patterns.uptodate">
         <mkdir dir="${compiler}/target/generated-sources/unknowntreehandler/org/apache/flex/compiler/internal/as/codegen"/>
-        <java classname="org.apache.flex.compiler.tools.unknowntreehandler.UnknownTreePatternInputOutput" fork="true" failonerror="true">
+        <java classname="org.apache.royale.compiler.tools.unknowntreehandler.UnknownTreePatternInputOutput" fork="true" failonerror="true">
             <arg value="${compiler}/src/main/unknowntreehandler/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.xml"/>
             <arg value="${compiler}/target/generated-sources/unknowntreehandler/org/apache/flex/compiler/internal/as/codegen/UnknownTreeHandlerPatterns.java"/>
             <classpath>
@@ -497,7 +497,7 @@
         </copy>
         <!-- Copy the config file for the flex-tool-api. -->
         <copy todir="${compiler}/target/classes/META-INF/services"
-              file="src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup"/>
+              file="src/main/resources/META-INF/services/org.apache.royale.tools.FlexToolGroup"/>
     </target>
 	
 	<target name="set.messages.en.uptodate">
@@ -512,7 +512,7 @@
     <target name="localization" depends="compile, set.messages.en.uptodate" unless="messages.en.uptodate"
     	    description="Creates message_en.properties file">
         <echo message="Creating messages_en.properties file for compiler problem localization"/>
-        <java classname="org.apache.flex.compiler.tools.ProblemLocalizer" fork="true">
+        <java classname="org.apache.royale.compiler.tools.ProblemLocalizer" fork="true">
             <classpath>
                 <pathelement location="${compiler}/target/classes"/>
                 <fileset dir="${compiler}/lib" includes="**/*.jar"/>
@@ -579,7 +579,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title} - ASC Command Line Compiler"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.ASC"/>
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.ASC"/>
                 <attribute name="Class-Path" value="compiler.jar"/>
             </manifest>
         </jar>
@@ -605,7 +605,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title} - MXMLC Command Line Compiler"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.MXMLC"/>
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.MXMLC"/>
                 <attribute name="Class-Path" value="compiler.jar"/>
             </manifest>
         </jar>
@@ -631,7 +631,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title} - COMPC Command Line Compiler"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.COMPC"/>
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.COMPC"/>
                 <attribute name="Class-Path" value="compiler.jar"/>
             </manifest>
         </jar>
@@ -657,7 +657,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title} - Apache SWF Optimizer"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.compiler.clients.Optimizer"/>
+                <attribute name="Main-Class" value="org.apache.royale.compiler.clients.Optimizer"/>
                 <attribute name="Class-Path" value="compiler.jar"/>
             </manifest>
         </jar>
@@ -683,7 +683,7 @@
                 <attribute name="Implementation-Title" value="${manifest.Implementation-Title} - SWF Dump Command Line utility"/>
                 <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
                 <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
-                <attribute name="Main-Class" value="org.apache.flex.swf.io.SWFDump"/>
+                <attribute name="Main-Class" value="org.apache.royale.swf.io.SWFDump"/>
                 <attribute name="Class-Path" value="compiler.jar commons-io.jar"/>
             </manifest>
         </jar>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index ea74039..889f51e 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.flex.flexjs.compiler</groupId>
+    <groupId>org.apache.royale.flexjs.compiler</groupId>
     <artifactId>flexjs-compiler-parent</artifactId>
     <version>0.9.0-SNAPSHOT</version>
   </parent>
@@ -191,7 +191,7 @@
             <version>1.10.3</version>
           </dependency>
           <dependency>
-            <groupId>org.apache.flex.flexjs.compiler</groupId>
+            <groupId>org.apache.royale.flexjs.compiler</groupId>
             <artifactId>compiler-jburg-types</artifactId>
             <version>${compiler-jburg-types.version}</version>
           </dependency>
@@ -239,7 +239,7 @@
               Do all the custom processing with the falcon build tools.
       -->
       <plugin>
-        <groupId>org.apache.flex.flexjs.compiler</groupId>
+        <groupId>org.apache.royale.flexjs.compiler</groupId>
         <artifactId>compiler-build-tools</artifactId>
         <version>${compiler-build-tools.version}</version>
         <executions>
@@ -360,12 +360,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.flex.flexjs.compiler</groupId>
+      <groupId>org.apache.royale.flexjs.compiler</groupId>
       <artifactId>compiler-jburg-types</artifactId>
       <version>${compiler-jburg-types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.flex</groupId>
+      <groupId>org.apache.royale</groupId>
       <artifactId>flex-tool-api</artifactId>
       <version>1.0.0</version>
     </dependency>
@@ -412,7 +412,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.flex.flexjs.compiler</groupId>
+      <groupId>org.apache.royale.flexjs.compiler</groupId>
       <artifactId>compiler-test-utils</artifactId>
       <version>0.9.0-SNAPSHOT</version>
       <scope>test</scope>
@@ -450,21 +450,21 @@
     </dependency>
     <!-- Import a part of the Flex sdk -->
     <dependency>
-      <groupId>org.apache.flex.framework</groupId>
+      <groupId>org.apache.royale.framework</groupId>
       <artifactId>framework</artifactId>
       <version>${flex.version}</version>
       <type>swc</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.flex.framework</groupId>
+      <groupId>org.apache.royale.framework</groupId>
       <artifactId>rpc</artifactId>
       <version>${flex.version}</version>
       <type>swc</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.flex.framework</groupId>
+      <groupId>org.apache.royale.framework</groupId>
       <artifactId>spark</artifactId>
       <version>${flex.version}</version>
       <type>swc</type>
@@ -472,7 +472,7 @@
     </dependency>
     <!-- Make sure the framework config-zip is available -->
     <dependency>
-      <groupId>org.apache.flex.framework</groupId>
+      <groupId>org.apache.royale.framework</groupId>
       <artifactId>framework</artifactId>
       <version>${flex.version}</version>
       <type>zip</type>
diff --git a/compiler/src/main/java/org/apache/royale/abc/ABCConstants.java b/compiler/src/main/java/org/apache/royale/abc/ABCConstants.java
index 83bd233..709a4ec 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ABCConstants.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ABCConstants.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 /**
  *  ABCConstants contains manifest constants for the various codes and flags in an ABC file.
diff --git a/compiler/src/main/java/org/apache/royale/abc/ABCEmitter.java b/compiler/src/main/java/org/apache/royale/abc/ABCEmitter.java
index 8cdddf1..b86e9ee 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ABCEmitter.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ABCEmitter.java
@@ -17,85 +17,85 @@
  *
  */
 
-package org.apache.flex.abc;
-
-import static org.apache.flex.abc.ABCConstants.CONSTANT_Multiname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_MultinameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_MultinameL;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_MultinameLA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_Qname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_QnameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQnameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQnameL;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQnameLA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_TypeName;
-import static org.apache.flex.abc.ABCConstants.OP_applytype;
-import static org.apache.flex.abc.ABCConstants.OP_astype;
-import static org.apache.flex.abc.ABCConstants.OP_bkptline;
-import static org.apache.flex.abc.ABCConstants.OP_call;
-import static org.apache.flex.abc.ABCConstants.OP_callproperty;
-import static org.apache.flex.abc.ABCConstants.OP_callproplex;
-import static org.apache.flex.abc.ABCConstants.OP_callpropvoid;
-import static org.apache.flex.abc.ABCConstants.OP_callstatic;
-import static org.apache.flex.abc.ABCConstants.OP_callsuper;
-import static org.apache.flex.abc.ABCConstants.OP_callsupervoid;
-import static org.apache.flex.abc.ABCConstants.OP_coerce;
-import static org.apache.flex.abc.ABCConstants.OP_construct;
-import static org.apache.flex.abc.ABCConstants.OP_constructprop;
-import static org.apache.flex.abc.ABCConstants.OP_constructsuper;
-import static org.apache.flex.abc.ABCConstants.OP_debug;
-import static org.apache.flex.abc.ABCConstants.OP_debugfile;
-import static org.apache.flex.abc.ABCConstants.OP_debugline;
-import static org.apache.flex.abc.ABCConstants.OP_declocal;
-import static org.apache.flex.abc.ABCConstants.OP_declocal_i;
-import static org.apache.flex.abc.ABCConstants.OP_deleteproperty;
-import static org.apache.flex.abc.ABCConstants.OP_dxns;
-import static org.apache.flex.abc.ABCConstants.OP_finddef;
-import static org.apache.flex.abc.ABCConstants.OP_findproperty;
-import static org.apache.flex.abc.ABCConstants.OP_findpropstrict;
-import static org.apache.flex.abc.ABCConstants.OP_getdescendants;
-import static org.apache.flex.abc.ABCConstants.OP_getglobalslot;
-import static org.apache.flex.abc.ABCConstants.OP_getlex;
-import static org.apache.flex.abc.ABCConstants.OP_getlocal;
-import static org.apache.flex.abc.ABCConstants.OP_getlocal0;
-import static org.apache.flex.abc.ABCConstants.OP_getproperty;
-import static org.apache.flex.abc.ABCConstants.OP_getscopeobject;
-import static org.apache.flex.abc.ABCConstants.OP_getslot;
-import static org.apache.flex.abc.ABCConstants.OP_getsuper;
-import static org.apache.flex.abc.ABCConstants.OP_hasnext2;
-import static org.apache.flex.abc.ABCConstants.OP_inclocal;
-import static org.apache.flex.abc.ABCConstants.OP_inclocal_i;
-import static org.apache.flex.abc.ABCConstants.OP_initproperty;
-import static org.apache.flex.abc.ABCConstants.OP_istype;
-import static org.apache.flex.abc.ABCConstants.OP_kill;
-import static org.apache.flex.abc.ABCConstants.OP_lookupswitch;
-import static org.apache.flex.abc.ABCConstants.OP_newarray;
-import static org.apache.flex.abc.ABCConstants.OP_newcatch;
-import static org.apache.flex.abc.ABCConstants.OP_newclass;
-import static org.apache.flex.abc.ABCConstants.OP_newfunction;
-import static org.apache.flex.abc.ABCConstants.OP_newobject;
-import static org.apache.flex.abc.ABCConstants.OP_pushbyte;
-import static org.apache.flex.abc.ABCConstants.OP_pushdouble;
-import static org.apache.flex.abc.ABCConstants.OP_pushint;
-import static org.apache.flex.abc.ABCConstants.OP_pushnamespace;
-import static org.apache.flex.abc.ABCConstants.OP_pushscope;
-import static org.apache.flex.abc.ABCConstants.OP_pushshort;
-import static org.apache.flex.abc.ABCConstants.OP_pushstring;
-import static org.apache.flex.abc.ABCConstants.OP_pushuint;
-import static org.apache.flex.abc.ABCConstants.OP_returnvoid;
-import static org.apache.flex.abc.ABCConstants.OP_setglobalslot;
-import static org.apache.flex.abc.ABCConstants.OP_setlocal;
-import static org.apache.flex.abc.ABCConstants.OP_setproperty;
-import static org.apache.flex.abc.ABCConstants.OP_setslot;
-import static org.apache.flex.abc.ABCConstants.OP_setsuper;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Class;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Const;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Function;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Getter;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Method;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Setter;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Var;
+package org.apache.royale.abc;
+
+import static org.apache.royale.abc.ABCConstants.CONSTANT_Multiname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_MultinameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_MultinameL;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_MultinameLA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_Qname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_QnameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQnameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQnameL;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQnameLA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_TypeName;
+import static org.apache.royale.abc.ABCConstants.OP_applytype;
+import static org.apache.royale.abc.ABCConstants.OP_astype;
+import static org.apache.royale.abc.ABCConstants.OP_bkptline;
+import static org.apache.royale.abc.ABCConstants.OP_call;
+import static org.apache.royale.abc.ABCConstants.OP_callproperty;
+import static org.apache.royale.abc.ABCConstants.OP_callproplex;
+import static org.apache.royale.abc.ABCConstants.OP_callpropvoid;
+import static org.apache.royale.abc.ABCConstants.OP_callstatic;
+import static org.apache.royale.abc.ABCConstants.OP_callsuper;
+import static org.apache.royale.abc.ABCConstants.OP_callsupervoid;
+import static org.apache.royale.abc.ABCConstants.OP_coerce;
+import static org.apache.royale.abc.ABCConstants.OP_construct;
+import static org.apache.royale.abc.ABCConstants.OP_constructprop;
+import static org.apache.royale.abc.ABCConstants.OP_constructsuper;
+import static org.apache.royale.abc.ABCConstants.OP_debug;
+import static org.apache.royale.abc.ABCConstants.OP_debugfile;
+import static org.apache.royale.abc.ABCConstants.OP_debugline;
+import static org.apache.royale.abc.ABCConstants.OP_declocal;
+import static org.apache.royale.abc.ABCConstants.OP_declocal_i;
+import static org.apache.royale.abc.ABCConstants.OP_deleteproperty;
+import static org.apache.royale.abc.ABCConstants.OP_dxns;
+import static org.apache.royale.abc.ABCConstants.OP_finddef;
+import static org.apache.royale.abc.ABCConstants.OP_findproperty;
+import static org.apache.royale.abc.ABCConstants.OP_findpropstrict;
+import static org.apache.royale.abc.ABCConstants.OP_getdescendants;
+import static org.apache.royale.abc.ABCConstants.OP_getglobalslot;
+import static org.apache.royale.abc.ABCConstants.OP_getlex;
+import static org.apache.royale.abc.ABCConstants.OP_getlocal;
+import static org.apache.royale.abc.ABCConstants.OP_getlocal0;
+import static org.apache.royale.abc.ABCConstants.OP_getproperty;
+import static org.apache.royale.abc.ABCConstants.OP_getscopeobject;
+import static org.apache.royale.abc.ABCConstants.OP_getslot;
+import static org.apache.royale.abc.ABCConstants.OP_getsuper;
+import static org.apache.royale.abc.ABCConstants.OP_hasnext2;
+import static org.apache.royale.abc.ABCConstants.OP_inclocal;
+import static org.apache.royale.abc.ABCConstants.OP_inclocal_i;
+import static org.apache.royale.abc.ABCConstants.OP_initproperty;
+import static org.apache.royale.abc.ABCConstants.OP_istype;
+import static org.apache.royale.abc.ABCConstants.OP_kill;
+import static org.apache.royale.abc.ABCConstants.OP_lookupswitch;
+import static org.apache.royale.abc.ABCConstants.OP_newarray;
+import static org.apache.royale.abc.ABCConstants.OP_newcatch;
+import static org.apache.royale.abc.ABCConstants.OP_newclass;
+import static org.apache.royale.abc.ABCConstants.OP_newfunction;
+import static org.apache.royale.abc.ABCConstants.OP_newobject;
+import static org.apache.royale.abc.ABCConstants.OP_pushbyte;
+import static org.apache.royale.abc.ABCConstants.OP_pushdouble;
+import static org.apache.royale.abc.ABCConstants.OP_pushint;
+import static org.apache.royale.abc.ABCConstants.OP_pushnamespace;
+import static org.apache.royale.abc.ABCConstants.OP_pushscope;
+import static org.apache.royale.abc.ABCConstants.OP_pushshort;
+import static org.apache.royale.abc.ABCConstants.OP_pushstring;
+import static org.apache.royale.abc.ABCConstants.OP_pushuint;
+import static org.apache.royale.abc.ABCConstants.OP_returnvoid;
+import static org.apache.royale.abc.ABCConstants.OP_setglobalslot;
+import static org.apache.royale.abc.ABCConstants.OP_setlocal;
+import static org.apache.royale.abc.ABCConstants.OP_setproperty;
+import static org.apache.royale.abc.ABCConstants.OP_setslot;
+import static org.apache.royale.abc.ABCConstants.OP_setsuper;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Class;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Const;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Function;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Getter;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Method;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Setter;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Var;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
@@ -109,33 +109,33 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.ExceptionInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
-import org.apache.flex.abc.semantics.PooledValue;
-import org.apache.flex.abc.semantics.ScriptInfo;
-import org.apache.flex.abc.semantics.Trait;
-import org.apache.flex.abc.semantics.Traits;
-import org.apache.flex.abc.visitors.IABCVisitor;
-import org.apache.flex.abc.visitors.IClassVisitor;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.IMetadataVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IMethodVisitor;
-import org.apache.flex.abc.visitors.IScriptVisitor;
-import org.apache.flex.abc.visitors.ITraitVisitor;
-import org.apache.flex.abc.visitors.ITraitsVisitor;
-import org.apache.flex.abc.visitors.NilVisitors;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.ExceptionInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.PooledValue;
+import org.apache.royale.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.semantics.Trait;
+import org.apache.royale.abc.semantics.Traits;
+import org.apache.royale.abc.visitors.IABCVisitor;
+import org.apache.royale.abc.visitors.IClassVisitor;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.IMetadataVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IMethodVisitor;
+import org.apache.royale.abc.visitors.IScriptVisitor;
+import org.apache.royale.abc.visitors.ITraitVisitor;
+import org.apache.royale.abc.visitors.ITraitsVisitor;
+import org.apache.royale.abc.visitors.NilVisitors;
 
 /**
  * The ABCEmitter is an IABCVisitor that collects information about
diff --git a/compiler/src/main/java/org/apache/royale/abc/ABCLinker.java b/compiler/src/main/java/org/apache/royale/abc/ABCLinker.java
index 69dbe47..4663e66 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ABCLinker.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ABCLinker.java
@@ -17,42 +17,42 @@
  *
  */
 
-package org.apache.flex.abc;
-
-import org.apache.flex.abc.diagnostics.AbstractDiagnosticVisitor;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.optimize.DeadCodeFilter;
-import org.apache.flex.abc.optimize.PeepholeOptimizerMethodBodyVisitor;
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
-import org.apache.flex.abc.visitors.DelegatingClassVisitor;
-import org.apache.flex.abc.visitors.DelegatingMetadataVisitor;
-import org.apache.flex.abc.visitors.DelegatingMethodBodyVisitor;
-import org.apache.flex.abc.visitors.DelegatingMethodVisitor;
-import org.apache.flex.abc.visitors.DelegatingScriptVisitor;
-import org.apache.flex.abc.visitors.DelegatingTraitVisitor;
-import org.apache.flex.abc.visitors.DelegatingTraitsVisitor;
-import org.apache.flex.abc.visitors.IABCVisitor;
-import org.apache.flex.abc.visitors.IClassVisitor;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.IMetadataVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IMethodVisitor;
-import org.apache.flex.abc.visitors.IScriptVisitor;
-import org.apache.flex.abc.visitors.ITraitVisitor;
-import org.apache.flex.abc.visitors.ITraitsVisitor;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.UnreachableBlockProblem;
+package org.apache.royale.abc;
+
+import org.apache.royale.abc.diagnostics.AbstractDiagnosticVisitor;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.optimize.DeadCodeFilter;
+import org.apache.royale.abc.optimize.PeepholeOptimizerMethodBodyVisitor;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
+import org.apache.royale.abc.visitors.DelegatingClassVisitor;
+import org.apache.royale.abc.visitors.DelegatingMetadataVisitor;
+import org.apache.royale.abc.visitors.DelegatingMethodBodyVisitor;
+import org.apache.royale.abc.visitors.DelegatingMethodVisitor;
+import org.apache.royale.abc.visitors.DelegatingScriptVisitor;
+import org.apache.royale.abc.visitors.DelegatingTraitVisitor;
+import org.apache.royale.abc.visitors.DelegatingTraitsVisitor;
+import org.apache.royale.abc.visitors.IABCVisitor;
+import org.apache.royale.abc.visitors.IClassVisitor;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.IMetadataVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IMethodVisitor;
+import org.apache.royale.abc.visitors.IScriptVisitor;
+import org.apache.royale.abc.visitors.ITraitVisitor;
+import org.apache.royale.abc.visitors.ITraitsVisitor;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.UnreachableBlockProblem;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/compiler/src/main/java/org/apache/royale/abc/ABCParser.java b/compiler/src/main/java/org/apache/royale/abc/ABCParser.java
index f056676..71713b4 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ABCParser.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ABCParser.java
@@ -17,23 +17,23 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 import java.io.*;
 import java.util.*;
 
-import org.apache.flex.abc.semantics.*;
-import org.apache.flex.abc.visitors.IABCVisitor;
-import org.apache.flex.abc.visitors.IClassVisitor;
-import org.apache.flex.abc.visitors.IMetadataVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IMethodVisitor;
-import org.apache.flex.abc.visitors.IScriptVisitor;
-import org.apache.flex.abc.visitors.ITraitVisitor;
-import org.apache.flex.abc.visitors.ITraitsVisitor;
-import org.apache.flex.abc.visitors.NilVisitors;
-
-import static org.apache.flex.abc.ABCConstants.*;
+import org.apache.royale.abc.semantics.*;
+import org.apache.royale.abc.visitors.IABCVisitor;
+import org.apache.royale.abc.visitors.IClassVisitor;
+import org.apache.royale.abc.visitors.IMetadataVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IMethodVisitor;
+import org.apache.royale.abc.visitors.IScriptVisitor;
+import org.apache.royale.abc.visitors.ITraitVisitor;
+import org.apache.royale.abc.visitors.ITraitsVisitor;
+import org.apache.royale.abc.visitors.NilVisitors;
+
+import static org.apache.royale.abc.ABCConstants.*;
 
 /**
  * ABCParser reads an ABC from a byte array or an input stream
diff --git a/compiler/src/main/java/org/apache/royale/abc/ABCReader.java b/compiler/src/main/java/org/apache/royale/abc/ABCReader.java
index 762b4d5..f482949 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ABCReader.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ABCReader.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 /**
  * ABCReader contains the byte-level methods that read ABC bytecode.
diff --git a/compiler/src/main/java/org/apache/royale/abc/ClassDependencySort.java b/compiler/src/main/java/org/apache/royale/abc/ClassDependencySort.java
index 03bd9cc..1b87dd4 100644
--- a/compiler/src/main/java/org/apache/royale/abc/ClassDependencySort.java
+++ b/compiler/src/main/java/org/apache/royale/abc/ClassDependencySort.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * ClassDependencySort contains data structures and algorithms to sort a list of
diff --git a/compiler/src/main/java/org/apache/royale/abc/EntryOrderedStore.java b/compiler/src/main/java/org/apache/royale/abc/EntryOrderedStore.java
index 4eb602f..6607a19 100644
--- a/compiler/src/main/java/org/apache/royale/abc/EntryOrderedStore.java
+++ b/compiler/src/main/java/org/apache/royale/abc/EntryOrderedStore.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/compiler/src/main/java/org/apache/royale/abc/Pool.java b/compiler/src/main/java/org/apache/royale/abc/Pool.java
index 59f48ea..9f3eb2f 100644
--- a/compiler/src/main/java/org/apache/royale/abc/Pool.java
+++ b/compiler/src/main/java/org/apache/royale/abc/Pool.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc;
+package org.apache.royale.abc;
 
 import java.util.ArrayList;
 import java.util.Map;
diff --git a/compiler/src/main/java/org/apache/royale/abc/PoolingABCVisitor.java b/compiler/src/main/java/org/apache/royale/abc/PoolingABCVisitor.java
index 3e90cc5..4f26f6e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/PoolingABCVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/PoolingABCVisitor.java
@@ -17,31 +17,31 @@
  *
  */
 
-package org.apache.flex.abc;
-
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.ExceptionInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
-import org.apache.flex.abc.semantics.ScriptInfo;
-import org.apache.flex.abc.semantics.Trait;
-import org.apache.flex.abc.semantics.Traits;
-import org.apache.flex.abc.visitors.IABCVisitor;
-import org.apache.flex.abc.visitors.IClassVisitor;
-import org.apache.flex.abc.visitors.IMetadataVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IMethodVisitor;
-import org.apache.flex.abc.visitors.IScriptVisitor;
-import org.apache.flex.abc.visitors.ITraitVisitor;
-import org.apache.flex.abc.visitors.ITraitsVisitor;
+package org.apache.royale.abc;
+
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.ExceptionInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.semantics.Trait;
+import org.apache.royale.abc.semantics.Traits;
+import org.apache.royale.abc.visitors.IABCVisitor;
+import org.apache.royale.abc.visitors.IClassVisitor;
+import org.apache.royale.abc.visitors.IMetadataVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IMethodVisitor;
+import org.apache.royale.abc.visitors.IScriptVisitor;
+import org.apache.royale.abc.visitors.ITraitVisitor;
+import org.apache.royale.abc.visitors.ITraitsVisitor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -489,7 +489,7 @@ public class PoolingABCVisitor implements IABCVisitor
      */
     private class MethodBodyVisitor implements IMethodBodyVisitor
     {
-        MethodBodyVisitor (org.apache.flex.abc.semantics.MethodBodyInfo mbinfo)
+        MethodBodyVisitor (org.apache.royale.abc.semantics.MethodBodyInfo mbinfo)
         {
             this.mbi = mbinfo;
         }
diff --git a/compiler/src/main/java/org/apache/royale/abc/diagnostics/AbstractDiagnosticVisitor.java b/compiler/src/main/java/org/apache/royale/abc/diagnostics/AbstractDiagnosticVisitor.java
index 15a010d..55fd28e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/diagnostics/AbstractDiagnosticVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/diagnostics/AbstractDiagnosticVisitor.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.abc.diagnostics;
+package org.apache.royale.abc.diagnostics;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.ScriptInfo;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
 
 /**
  * An abstract base class implementation of {@link IDiagnosticsVisitor}. Rather
diff --git a/compiler/src/main/java/org/apache/royale/abc/diagnostics/DiagnosticsAggregator.java b/compiler/src/main/java/org/apache/royale/abc/diagnostics/DiagnosticsAggregator.java
index 1672073..00a1950 100644
--- a/compiler/src/main/java/org/apache/royale/abc/diagnostics/DiagnosticsAggregator.java
+++ b/compiler/src/main/java/org/apache/royale/abc/diagnostics/DiagnosticsAggregator.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.abc.diagnostics;
+package org.apache.royale.abc.diagnostics;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.ScriptInfo;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
 
 /**
  *  A DiagnosticsAggregator collects AET diagnostics for analysis.
diff --git a/compiler/src/main/java/org/apache/royale/abc/graph/IBasicBlock.java b/compiler/src/main/java/org/apache/royale/abc/graph/IBasicBlock.java
index e8f1545..bbc4a33 100644
--- a/compiler/src/main/java/org/apache/royale/abc/graph/IBasicBlock.java
+++ b/compiler/src/main/java/org/apache/royale/abc/graph/IBasicBlock.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.graph;
+package org.apache.royale.abc.graph;
 
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.flex.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Instruction;
 
 /**
  *  IBasicBlock defines the minimum necessary semantics
diff --git a/compiler/src/main/java/org/apache/royale/abc/graph/IFlowgraph.java b/compiler/src/main/java/org/apache/royale/abc/graph/IFlowgraph.java
index ec254f9..b105907 100644
--- a/compiler/src/main/java/org/apache/royale/abc/graph/IFlowgraph.java
+++ b/compiler/src/main/java/org/apache/royale/abc/graph/IFlowgraph.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.abc.graph;
+package org.apache.royale.abc.graph;
 
 import java.util.List;
 
-import org.apache.flex.abc.graph.algorithms.DominatorTree;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.visitors.IFlowGraphVisitor;
+import org.apache.royale.abc.graph.algorithms.DominatorTree;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.visitors.IFlowGraphVisitor;
 
 /**
  * IFlowgraph defines the operations required of an object
diff --git a/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DepthFirstPreorderIterator.java b/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DepthFirstPreorderIterator.java
index 8e24ac3..6fd5c52 100644
--- a/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DepthFirstPreorderIterator.java
+++ b/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DepthFirstPreorderIterator.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.graph.algorithms;
+package org.apache.royale.abc.graph.algorithms;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,8 +26,8 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
 
 /**
  * DepthFirstPreorderIterator yields a depth-first preorder traversal of a {@link IFlowgraph}.
diff --git a/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DominatorTree.java b/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DominatorTree.java
index 0a5e657..5131787 100644
--- a/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DominatorTree.java
+++ b/compiler/src/main/java/org/apache/royale/abc/graph/algorithms/DominatorTree.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.graph.algorithms;
+package org.apache.royale.abc.graph.algorithms;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,12 +31,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
 
-import org.apache.flex.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IBasicBlock;
 
 /**
  * An implementation of the O(n log n) Lengauer-Tarjan algorithm for building the
  * <a href="http://en.wikipedia.org/wiki/Dominator_%28graph_theory%29">dominator tree</a>
- * of a {@link org.apache.flex.abc.graph.IFlowgraph flowgraph}.
+ * of a {@link org.apache.royale.abc.graph.IFlowgraph flowgraph}.
  */
 public class DominatorTree
 {
diff --git a/compiler/src/main/java/org/apache/royale/abc/instructionlist/InstructionList.java b/compiler/src/main/java/org/apache/royale/abc/instructionlist/InstructionList.java
index ce8da16..674dbeb 100644
--- a/compiler/src/main/java/org/apache/royale/abc/instructionlist/InstructionList.java
+++ b/compiler/src/main/java/org/apache/royale/abc/instructionlist/InstructionList.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.abc.instructionlist;
+package org.apache.royale.abc.instructionlist;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.NoSuchElementException;
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.InstructionFactory;
-import org.apache.flex.abc.semantics.Label;
-import static org.apache.flex.abc.ABCConstants.*;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.InstructionFactory;
+import org.apache.royale.abc.semantics.Label;
+import static org.apache.royale.abc.ABCConstants.*;
 
 /**
  * An InstructionList is a structure that holds a sequence of Instructions, and
diff --git a/compiler/src/main/java/org/apache/royale/abc/models/FrameModelEncoder.java b/compiler/src/main/java/org/apache/royale/abc/models/FrameModelEncoder.java
index ddbc626..c7df72e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/models/FrameModelEncoder.java
+++ b/compiler/src/main/java/org/apache/royale/abc/models/FrameModelEncoder.java
@@ -17,22 +17,22 @@
  *
  */
 
-package org.apache.flex.abc.models;
+package org.apache.royale.abc.models;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.IFlowGraphVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.IFlowGraphVisitor;
 
 /**
  *  The FrameModelEncoder abstracts ABC instructions into
diff --git a/compiler/src/main/java/org/apache/royale/abc/models/FrameModelVisitor.java b/compiler/src/main/java/org/apache/royale/abc/models/FrameModelVisitor.java
index f7c2ca0..cc85590 100644
--- a/compiler/src/main/java/org/apache/royale/abc/models/FrameModelVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/models/FrameModelVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.models;
+package org.apache.royale.abc.models;
 
 import java.util.Collection;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.semantics.Instruction;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.semantics.Instruction;
 
 /**
  *  The FrameModelVisitor interface presents an abstract view
diff --git a/compiler/src/main/java/org/apache/royale/abc/models/TreeModelEncoder.java b/compiler/src/main/java/org/apache/royale/abc/models/TreeModelEncoder.java
index 7146c22..e94280d 100644
--- a/compiler/src/main/java/org/apache/royale/abc/models/TreeModelEncoder.java
+++ b/compiler/src/main/java/org/apache/royale/abc/models/TreeModelEncoder.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.models;
+package org.apache.royale.abc.models;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,14 +28,14 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.flex.abc.semantics.ExceptionInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.NilDiagnosticsVisitor;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.algorithms.DominatorTree.Multimap;
+import org.apache.royale.abc.semantics.ExceptionInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.NilDiagnosticsVisitor;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.algorithms.DominatorTree.Multimap;
 
 /**
  *  The TreeModelEncoder translates the stack-oriented semantics
diff --git a/compiler/src/main/java/org/apache/royale/abc/models/TreeModelVisitor.java b/compiler/src/main/java/org/apache/royale/abc/models/TreeModelVisitor.java
index a11b0e6..26d0295 100644
--- a/compiler/src/main/java/org/apache/royale/abc/models/TreeModelVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/models/TreeModelVisitor.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.abc.models;
+package org.apache.royale.abc.models;
 
 import java.util.Collection;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  *  A TreeModelVisitor translates stack-oriented
diff --git a/compiler/src/main/java/org/apache/royale/abc/optimize/DeadCodeFilter.java b/compiler/src/main/java/org/apache/royale/abc/optimize/DeadCodeFilter.java
index 0c2e74c..894ec1d 100644
--- a/compiler/src/main/java/org/apache/royale/abc/optimize/DeadCodeFilter.java
+++ b/compiler/src/main/java/org/apache/royale/abc/optimize/DeadCodeFilter.java
@@ -17,21 +17,21 @@
  *
  */
 
-package org.apache.flex.abc.optimize;
+package org.apache.royale.abc.optimize;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.ExceptionInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.InstructionFactory;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.visitors.DelegatingMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.ExceptionInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.InstructionFactory;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.visitors.DelegatingMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
 
 /**
  * DeadCodeFilter rebuilds the method's result InstructionList by walking the
diff --git a/compiler/src/main/java/org/apache/royale/abc/optimize/PeepholeOptimizerMethodBodyVisitor.java b/compiler/src/main/java/org/apache/royale/abc/optimize/PeepholeOptimizerMethodBodyVisitor.java
index 1b03a94..4044974 100644
--- a/compiler/src/main/java/org/apache/royale/abc/optimize/PeepholeOptimizerMethodBodyVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/optimize/PeepholeOptimizerMethodBodyVisitor.java
@@ -17,17 +17,17 @@
  *
  */
 
-package org.apache.flex.abc.optimize;
+package org.apache.royale.abc.optimize;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.ECMASupport;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.InstructionFactory;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.visitors.DelegatingMethodBodyVisitor;
-import org.apache.flex.abc.visitors.IMethodBodyVisitor;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.ECMASupport;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.InstructionFactory;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.visitors.DelegatingMethodBodyVisitor;
+import org.apache.royale.abc.visitors.IMethodBodyVisitor;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/compiler/src/main/java/org/apache/royale/abc/print/ABCDumpVisitor.java b/compiler/src/main/java/org/apache/royale/abc/print/ABCDumpVisitor.java
index c58148f..4c86060 100644
--- a/compiler/src/main/java/org/apache/royale/abc/print/ABCDumpVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/print/ABCDumpVisitor.java
@@ -17,27 +17,27 @@
  *
  */
 
-package org.apache.flex.abc.print;
-
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.ABCParser;
-import org.apache.flex.abc.PoolingABCVisitor;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.ExceptionInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
-import org.apache.flex.abc.semantics.ScriptInfo;
-import org.apache.flex.abc.semantics.Trait;
-import org.apache.flex.abc.semantics.Traits;
+package org.apache.royale.abc.print;
+
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.ABCParser;
+import org.apache.royale.abc.PoolingABCVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.ExceptionInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.semantics.Trait;
+import org.apache.royale.abc.semantics.Traits;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -54,30 +54,30 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-import static org.apache.flex.abc.ABCConstants.CONSTANT_Multiname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_MultinameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_MultinameL;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_Namespace;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_PackageInternalNs;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_PackageNs;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_PrivateNs;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_ProtectedNs;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_Qname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_QnameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQname;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_RTQnameA;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_StaticProtectedNs;
-import static org.apache.flex.abc.ABCConstants.CONSTANT_TypeName;
-import static org.apache.flex.abc.ABCConstants.OP_debugfile;
-import static org.apache.flex.abc.ABCConstants.OP_lookupswitch;
-import static org.apache.flex.abc.ABCConstants.OP_pushstring;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Class;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Const;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Function;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Getter;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Method;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Setter;
-import static org.apache.flex.abc.ABCConstants.TRAIT_Var;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_Multiname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_MultinameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_MultinameL;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_Namespace;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_PackageInternalNs;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_PackageNs;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_PrivateNs;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_ProtectedNs;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_Qname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_QnameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQname;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_RTQnameA;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_StaticProtectedNs;
+import static org.apache.royale.abc.ABCConstants.CONSTANT_TypeName;
+import static org.apache.royale.abc.ABCConstants.OP_debugfile;
+import static org.apache.royale.abc.ABCConstants.OP_lookupswitch;
+import static org.apache.royale.abc.ABCConstants.OP_pushstring;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Class;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Const;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Function;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Getter;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Method;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Setter;
+import static org.apache.royale.abc.ABCConstants.TRAIT_Var;
 
 /**
  * ABC Visitor implementation that can take an ABC and
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ArbitraryOperandsInstruction.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ArbitraryOperandsInstruction.java
index 394e093..37abc49 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ArbitraryOperandsInstruction.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ArbitraryOperandsInstruction.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 /**
  * An ArbitraryOperandsInstruction holds an array of operands as specified by
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Block.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Block.java
index d6281a0..930cf90 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Block.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Block.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,8 +26,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.graph.IBasicBlock;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.graph.IBasicBlock;
 
 /**
  * Block implements {@link IBasicBlock} and is
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ClassInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ClassInfo.java
index 989a802..6a400aa 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ClassInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ClassInfo.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * ClassInfo represents a class' <a href="http://learn.adobe.com/wiki/display/AVM2/4.9+Class">class info</a> structure.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ControlFlowGraph.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ControlFlowGraph.java
index 579f2f2..de0c42b 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ControlFlowGraph.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ControlFlowGraph.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,12 +28,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.graph.algorithms.DepthFirstPreorderIterator;
-import org.apache.flex.abc.graph.algorithms.DominatorTree;
-import org.apache.flex.abc.visitors.IFlowGraphVisitor;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.graph.algorithms.DepthFirstPreorderIterator;
+import org.apache.royale.abc.graph.algorithms.DominatorTree;
+import org.apache.royale.abc.visitors.IFlowGraphVisitor;
 
 /**
  * A ControlFlowGraph represents the flow of control through a sequence of
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ECMASupport.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ECMASupport.java
index a16db02..2c55b44 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ECMASupport.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ECMASupport.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ExceptionInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ExceptionInfo.java
index ae3f15a..f8d0c8b 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ExceptionInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ExceptionInfo.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * ExceptionInfo represents an exception-handling annotation in a MethodBodyInfo
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/FrameCountVisitor.java b/compiler/src/main/java/org/apache/royale/abc/semantics/FrameCountVisitor.java
index f8c63bd..039bb98 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/FrameCountVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/FrameCountVisitor.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.apache.flex.abc.ABCConstants.*;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
-import org.apache.flex.abc.visitors.IFlowGraphVisitor;
+import static org.apache.royale.abc.ABCConstants.*;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.visitors.IFlowGraphVisitor;
 
 /**
  * A FrameCountVisitor tracks the stack, scope, local, and slot numbers
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ImmediateOperandInstruction.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ImmediateOperandInstruction.java
index bb90baf..32340a7 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ImmediateOperandInstruction.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ImmediateOperandInstruction.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 /**
  * An Instruction implementation with one immediate operand.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/InstanceInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/InstanceInfo.java
index db3fdd8..8f99ce9 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/InstanceInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/InstanceInfo.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * A class' <a href="http://learn.adobe.com/wiki/display/AVM2/4.7+Instance">instance information</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Instruction.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Instruction.java
index b167987..4641fbf 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Instruction.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Instruction.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.HashMap;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 /**
  * A representation of an ABC instruction.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/InstructionFactory.java b/compiler/src/main/java/org/apache/royale/abc/semantics/InstructionFactory.java
index 46a847e..4ef4765 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/InstructionFactory.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/InstructionFactory.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
 /**
  * The InstructionFactory creates implementation Instruction subclasses for
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Label.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Label.java
index 6c258ea..843a435 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Label.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Label.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 /**
  * A Label represents the target of a branch instruction; it is not the ABC
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Metadata.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Metadata.java
index 3eb9805..bf2f904 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Metadata.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Metadata.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCEmitter;
-import org.apache.flex.abc.ABCParser;
+import org.apache.royale.abc.ABCEmitter;
+import org.apache.royale.abc.ABCParser;
 
 /**
  * The {@code Metadata} entry provides a mean of embedding arbitrary key/value
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/MethodBodyInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/MethodBodyInfo.java
index b44605c..fcf53d4 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/MethodBodyInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/MethodBodyInfo.java
@@ -17,18 +17,18 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.visitors.IDiagnosticsVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.visitors.IDiagnosticsVisitor;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
 /**
  * A representation of a method's <a href="http://learn.adobe.com/wiki/display/AVM2/4.11+Method+body">method body information</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/MethodInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/MethodInfo.java
index 01bd107..2740302 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/MethodInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/MethodInfo.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * A representation of a method's <a href="http://learn.adobe.com/wiki/display/AVM2/4.5+Method+signature">method signature</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Name.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Name.java
index c54e6b2..a62853f 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Name.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Name.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
 
 /**
  * A representation of a <a href="http://learn.adobe.com/wiki/display/AVM2/4.3+Constant+pool">name</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Namespace.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Namespace.java
index 53c1b87..90874a6 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Namespace.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Namespace.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 /**
  * A representation of a <a href="http://learn.adobe.com/wiki/display/AVM2/4.3+Constant+pool">namespace</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/NoOperandsInstruction.java b/compiler/src/main/java/org/apache/royale/abc/semantics/NoOperandsInstruction.java
index 3eba063..b531986 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/NoOperandsInstruction.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/NoOperandsInstruction.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 
 /**
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Nsset.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Nsset.java
index 04e7513..d453083 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Nsset.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Nsset.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Collection;
 
-import org.apache.flex.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Namespace;
 
 /**
  * Nsset represents an ABC NamespaceSet, i.e., a set of Namespaces.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/OneOperandInstruction.java b/compiler/src/main/java/org/apache/royale/abc/semantics/OneOperandInstruction.java
index 1a17311..f783213 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/OneOperandInstruction.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/OneOperandInstruction.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 
 /**
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/PooledValue.java b/compiler/src/main/java/org/apache/royale/abc/semantics/PooledValue.java
index f9dcb23..8c2ec14 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/PooledValue.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/PooledValue.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.ABCConstants;
+import org.apache.royale.abc.ABCConstants;
 
 /**
  * A representation of a value in a <a href="http://learn.adobe.com/wiki/display/AVM2/4.3+Constant+pool">constant pool</a>
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/ScriptInfo.java b/compiler/src/main/java/org/apache/royale/abc/semantics/ScriptInfo.java
index 4afba96..fdec5cd 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/ScriptInfo.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/ScriptInfo.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
-import org.apache.flex.abc.semantics.Trait;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.Trait;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * A representation of a <a href="http://learn.adobe.com/wiki/display/AVM2/4.10+Script">script info</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Trait.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Trait.java
index a5f0a2f..a3ce607 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Trait.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Trait.java
@@ -17,16 +17,16 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.HashMap;
 import java.util.Vector;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.Name;
 
-import static org.apache.flex.abc.ABCConstants.*;
+import static org.apache.royale.abc.ABCConstants.*;
 
 /**
  * A representation of an individual <a href="http://learn.adobe.com/wiki/display/AVM2/4.8+Trait">trait</a>.
diff --git a/compiler/src/main/java/org/apache/royale/abc/semantics/Traits.java b/compiler/src/main/java/org/apache/royale/abc/semantics/Traits.java
index eea354d..7edad7b 100644
--- a/compiler/src/main/java/org/apache/royale/abc/semantics/Traits.java
+++ b/compiler/src/main/java/org/apache/royale/abc/semantics/Traits.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.semantics;
+package org.apache.royale.abc.semantics;
 
 import java.util.Iterator;
 import java.util.Vector;
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingABCVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingABCVisitor.java
index f82f1d1..461ee2e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingABCVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingABCVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.*;
+import org.apache.royale.abc.semantics.*;
 
 /**
  * A DelegatingABCVisitor wraps another IABCVisitor and delegates actions to it.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingClassVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingClassVisitor.java
index 2d95ef8..daa3602 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingClassVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingClassVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 
 /**
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMetadataVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMetadataVisitor.java
index 3527914..c241570 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMetadataVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMetadataVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.Metadata;
 
 /**
  * this class just passes all calls through to the delegate - used as a base
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodBodyVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodBodyVisitor.java
index b67817e..9b80aa5 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodBodyVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodBodyVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * Base class for various method body visitors that wish to modify the method
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodVisitor.java
index b134ae9..e6135bf 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingMethodVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
 
 /**
  * this class just passes all calls through to the delegate - used as a base
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingScriptVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingScriptVisitor.java
index 01ea99c..0a41c01 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingScriptVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingScriptVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
 
 /**
  * this class just passes all calls through to the delegate - used as a base
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitVisitor.java
index fc685cf..b413d7e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 
 /**
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitsVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitsVisitor.java
index c033291..3fc4fce 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/DelegatingTraitsVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * this class just passes all calls through to the delegate - used as a base
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IABCVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IABCVisitor.java
index d83730b..29914ac 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IABCVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IABCVisitor.java
@@ -17,21 +17,21 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
 
 /**
  * The IABCVisitor is the ABC program-level data sink and visitor generator. A
  * program using the AET to construct an ABC program first instantiates an
  * IABCVisitor implementation instance, usually
- * org.apache.flex.abc.util.ABCEmitter, and get visitors for the classes,
+ * org.apache.royale.abc.util.ABCEmitter, and get visitors for the classes,
  * scripts, and other data elements in the ABC by calling the factory methods
  * declared here.
  */
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IClassVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IClassVisitor.java
index e71db93..aea4172 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IClassVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IClassVisitor.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 /**
  * The IClassVisitor generates traits visitors for an ABC class' static and
  * instance traits.
  * 
- * @see org.apache.flex.abc.semantics.ClassInfo which holds the rest of the
+ * @see org.apache.royale.abc.semantics.ClassInfo which holds the rest of the
  * class' information.
  */
 public interface IClassVisitor extends IVisitor
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IDiagnosticsVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IDiagnosticsVisitor.java
index b35f536..b1bfdd8 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IDiagnosticsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IDiagnosticsVisitor.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.ABCEmitter;
-import org.apache.flex.abc.diagnostics.AbstractDiagnosticVisitor;
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.graph.IFlowgraph;
-import org.apache.flex.abc.semantics.MethodBodyInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.ScriptInfo;
+import org.apache.royale.abc.ABCEmitter;
+import org.apache.royale.abc.diagnostics.AbstractDiagnosticVisitor;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.graph.IFlowgraph;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.ScriptInfo;
 
 /**
  * IVisitor that is called by the {@link ABCEmitter} to notify clients of issues
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IFlowGraphVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IFlowGraphVisitor.java
index 3adca67..9f11060 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IFlowGraphVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IFlowGraphVisitor.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.graph.IBasicBlock;
-import org.apache.flex.abc.semantics.Instruction;
+import org.apache.royale.abc.graph.IBasicBlock;
+import org.apache.royale.abc.semantics.Instruction;
 
 /**
  * A IFlowGraphVisitor defines the behavior of a visitor over a control flow
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IMetadataVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IMetadataVisitor.java
index 9e13e98..d3bbf11 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IMetadataVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IMetadataVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.Metadata;
 
 /**
  * An IMetdataVisitor defines a trait's metadata.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodBodyVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodBodyVisitor.java
index f3dcdf4..80087a8 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodBodyVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodBodyVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * An IMethodBodyVisitor defines a method's local variables and ABC instructions.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodVisitor.java
index 1e8d9be..d7fceb1 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IMethodVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
 
 /**
  * An IMethodVisitor begins definition of a method, and generates the
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IScriptVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IScriptVisitor.java
index 5fe14cd..0f49eb2 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IScriptVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IScriptVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
 
 /**
  * An IScriptVisitor generates a visitor for the script's traits, and records the
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitVisitor.java
index 1a2e80f..138378e 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 /**
  * An ITraitVisitor generates a IMetadataVisitor to define a trait's metadata, and
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitsVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitsVisitor.java
index 02bf6ae..ca7691c 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/ITraitsVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * An ITraitsVisitor defines the individual trait entries of a traits collection.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/IVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/IVisitor.java
index cebb1f0..7877ea1 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/IVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/IVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 /**
  * Base interface for all visitors reachable from an {@link IABCVisitor}.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilABCVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilABCVisitor.java
index 70499d6..3e34077 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilABCVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilABCVisitor.java
@@ -17,15 +17,15 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.InstanceInfo;
-import org.apache.flex.abc.semantics.Metadata;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Namespace;
-import org.apache.flex.abc.semantics.Nsset;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.InstanceInfo;
+import org.apache.royale.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Namespace;
+import org.apache.royale.abc.semantics.Nsset;
 
 /**
  * An IABCVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilClassVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilClassVisitor.java
index 26ab3b1..dbd4ecd 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilClassVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilClassVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 /**
  * An IClassVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilDiagnosticsVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilDiagnosticsVisitor.java
index e9ac1fa..d046c02 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilDiagnosticsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilDiagnosticsVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.diagnostics.AbstractDiagnosticVisitor;
+import org.apache.royale.abc.diagnostics.AbstractDiagnosticVisitor;
 
 /**
  * Nil implementation of {@link IDiagnosticsVisitor}.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMetadataVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMetadataVisitor.java
index 3b4f881..dbe67ee 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMetadataVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMetadataVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.Metadata;
+import org.apache.royale.abc.semantics.Metadata;
 
 /**
  * An IMetadataVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodBodyVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodBodyVisitor.java
index 57572b0..cc758c7 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodBodyVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodBodyVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.instructionlist.InstructionList;
-import org.apache.flex.abc.semantics.Instruction;
-import org.apache.flex.abc.semantics.Label;
-import org.apache.flex.abc.semantics.Name;
+import org.apache.royale.abc.instructionlist.InstructionList;
+import org.apache.royale.abc.semantics.Instruction;
+import org.apache.royale.abc.semantics.Label;
+import org.apache.royale.abc.semantics.Name;
 
 /**
  * An IMethodBodyVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodVisitor.java
index 8adea94..dd8a228 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilMethodVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodBodyInfo;
+import org.apache.royale.abc.semantics.MethodBodyInfo;
 
 /**
  * An IMethodVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilScriptVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilScriptVisitor.java
index 838144b..bbfb106 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilScriptVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilScriptVisitor.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
 
 /**
  * An IScriptVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitVisitor.java
index 2501343..602d170 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitVisitor.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 /**
  * An ITraitVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitsVisitor.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitsVisitor.java
index 02b431b..f8e016a 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilTraitsVisitor.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
-import org.apache.flex.abc.semantics.ClassInfo;
-import org.apache.flex.abc.semantics.MethodInfo;
-import org.apache.flex.abc.semantics.Name;
-import org.apache.flex.abc.semantics.Traits;
+import org.apache.royale.abc.semantics.ClassInfo;
+import org.apache.royale.abc.semantics.MethodInfo;
+import org.apache.royale.abc.semantics.Name;
+import org.apache.royale.abc.semantics.Traits;
 
 /**
  * An ITraitsVisitor that ignores its input as far as possible.
diff --git a/compiler/src/main/java/org/apache/royale/abc/visitors/NilVisitors.java b/compiler/src/main/java/org/apache/royale/abc/visitors/NilVisitors.java
index 0f0fd88..46a1009 100644
--- a/compiler/src/main/java/org/apache/royale/abc/visitors/NilVisitors.java
+++ b/compiler/src/main/java/org/apache/royale/abc/visitors/NilVisitors.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.abc.visitors;
+package org.apache.royale.abc.visitors;
 
 
 /**
diff --git a/compiler/src/main/java/org/apache/royale/compiler/Messages.java b/compiler/src/main/java/org/apache/royale/compiler/Messages.java
index 4479871..0cb800b 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/Messages.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/Messages.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler;
+package org.apache.royale.compiler;
 
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.apache.flex.compiler.clients.problems.ProblemFormatter;
+import org.apache.royale.compiler.clients.problems.ProblemFormatter;
 
 /**
  * Class to look up messages for the compiler client classes. This class looks
@@ -33,7 +33,7 @@ import org.apache.flex.compiler.clients.problems.ProblemFormatter;
  */
 public final class Messages
 {
-    private static final String BUNDLE_NAME = "org.apache.flex.compiler.messages";
+    private static final String BUNDLE_NAME = "org.apache.royale.compiler.messages";
     
     private static ResourceBundle resourceBundle;
     private static Locale locale;
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/ASDocComment.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/ASDocComment.java
index f28eda2..52931b8 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/ASDocComment.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/ASDocComment.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -26,11 +26,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.flex.compiler.internal.parsing.as.ASDocToken;
-import org.apache.flex.compiler.internal.parsing.as.ASDocTokenizer;
-import org.apache.flex.compiler.internal.parsing.as.ASToken;
-import org.apache.flex.compiler.internal.parsing.as.ASTokenTypes;
-import org.apache.flex.compiler.tree.as.IDocumentableDefinitionNode;
+import org.apache.royale.compiler.internal.parsing.as.ASDocToken;
+import org.apache.royale.compiler.internal.parsing.as.ASDocTokenizer;
+import org.apache.royale.compiler.internal.parsing.as.ASToken;
+import org.apache.royale.compiler.internal.parsing.as.ASTokenTypes;
+import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
 
 import antlr.Token;
 
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocBundleDelegate.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocBundleDelegate.java
index 9ca81e1..c13f1a1 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocBundleDelegate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocBundleDelegate.java
@@ -17,10 +17,10 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
-import org.apache.flex.compiler.definitions.IDocumentableDefinition;
-import org.apache.flex.compiler.internal.projects.ASProject;
+import org.apache.royale.compiler.definitions.IDocumentableDefinition;
+import org.apache.royale.compiler.internal.projects.ASProject;
 
 /**
  * Delegate interface used by {@link ASProject} to delegate
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocComment.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocComment.java
index 82a0325..94dfbee 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocComment.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocComment.java
@@ -17,14 +17,14 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.flex.compiler.definitions.IDocumentableDefinition;
-import org.apache.flex.compiler.tree.as.IDocumentableDefinitionNode;
+import org.apache.royale.compiler.definitions.IDocumentableDefinition;
+import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
 
 /**
  * Opaque interface used by {@link IDocumentableDefinitionNode}s and
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocDelegate.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocDelegate.java
index 6b31868..9409205 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocDelegate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocDelegate.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
-import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.definitions.IDocumentableDefinition;
-import org.apache.flex.compiler.internal.parsing.as.ASParser;
-import org.apache.flex.swc.io.SWCReader;
+import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.definitions.IDocumentableDefinition;
+import org.apache.royale.compiler.internal.parsing.as.ASParser;
+import org.apache.royale.swc.io.SWCReader;
 
 
 /**
@@ -50,7 +50,7 @@ public interface IASDocDelegate
      * Called by MXML tree building code to create an {@link IASDocComment} for
      * classes defined by MXML files.
      * @param location The location of the ASDoc text in an MXML file.
-     * @param definition The {@link org.apache.flex.compiler.definitions.IDefinition} the ASDoc documents
+     * @param definition The {@link org.apache.royale.compiler.definitions.IDefinition} the ASDoc documents
      * @return A new {@link IASDocComment} or null.
      */
     IASDocComment createASDocComment(ISourceLocation location, IDocumentableDefinition definition);
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocTag.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocTag.java
index 9e4b4be..e6db661 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocTag.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASDocTag.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 public interface IASDocTag
 {
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASParserASDocDelegate.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASParserASDocDelegate.java
index ca6e4be..3e36ba5 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASParserASDocDelegate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IASParserASDocDelegate.java
@@ -17,13 +17,13 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 import antlr.Token;
 
-import org.apache.flex.compiler.internal.parsing.as.ASParser;
-import org.apache.flex.compiler.internal.parsing.as.MetadataParser;
-import org.apache.flex.compiler.tree.as.IDocumentableDefinitionNode;
+import org.apache.royale.compiler.internal.parsing.as.ASParser;
+import org.apache.royale.compiler.internal.parsing.as.MetadataParser;
+import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
 
 /**
  * Interface used by the {@link ASParser} to record ASDoc information.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IMetadataParserASDocDelegate.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IMetadataParserASDocDelegate.java
index fb93098..1830db0 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IMetadataParserASDocDelegate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IMetadataParserASDocDelegate.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 import antlr.Token;
 
-import org.apache.flex.compiler.internal.parsing.as.MetadataParser;
-import org.apache.flex.compiler.tree.as.IDocumentableDefinitionNode;
+import org.apache.royale.compiler.internal.parsing.as.MetadataParser;
+import org.apache.royale.compiler.tree.as.IDocumentableDefinitionNode;
 
 /**
  * Interface used by the {@link MetadataParser} to recored information about
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IPackageDITAParser.java b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IPackageDITAParser.java
index 3b60989..3d888c3 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/IPackageDITAParser.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/IPackageDITAParser.java
@@ -17,12 +17,12 @@
  *
  */
 
-package org.apache.flex.compiler.asdoc;
+package org.apache.royale.compiler.asdoc;
 
 import java.io.InputStream;
 
-import org.apache.flex.swc.dita.IDITAList;
-import org.apache.flex.swc.io.SWCReader;
+import org.apache.royale.swc.dita.IDITAList;
+import org.apache.royale.swc.io.SWCReader;
 
 /**
  * Interface used by {@link SWCReader} to parse DITA files containing ASDoc
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/ASC.java b/compiler/src/main/java/org/apache/royale/compiler/clients/ASC.java
index f8c9cd4..b0a3a2f 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/ASC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/ASC.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -52,49 +52,49 @@ import org.apache.commons.cli.UnrecognizedOptionException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.output.CountingOutputStream;
 
-import org.apache.flex.abc.ABCConstants;
-import org.apache.flex.abc.ABCLinker;
-import org.apache.flex.compiler.clients.problems.CompilerProblemCategorizer;
-import org.apache.flex.compiler.clients.problems.ProblemFormatter;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.RSLSettings;
-import org.apache.flex.compiler.filespecs.FileSpecification;
-import org.apache.flex.compiler.filespecs.IFileSpecification;
-import org.apache.flex.compiler.internal.clients.CLIFactory;
-import org.apache.flex.compiler.internal.config.FrameInfo;
-import org.apache.flex.compiler.internal.projects.ASCProject;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority.BasePriority;
-import org.apache.flex.compiler.internal.targets.AppSWFTarget;
-import org.apache.flex.compiler.internal.tree.as.FileNode;
-import org.apache.flex.compiler.internal.units.ABCCompilationUnit;
-import org.apache.flex.compiler.internal.units.ASCompilationUnit;
-import org.apache.flex.compiler.internal.units.ImportedASCompilationUnit;
-import org.apache.flex.compiler.internal.units.SWCCompilationUnit;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.FileWriteProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InvalidImportFileProblem;
-import org.apache.flex.compiler.problems.MultipleExternallyVisibleDefinitionsProblem;
-import org.apache.flex.compiler.problems.UnfoundPropertyProblem;
-import org.apache.flex.compiler.targets.ISWFTarget;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.requests.IABCBytesRequestResult;
-import org.apache.flex.swc.ISWC;
-import org.apache.flex.swc.ISWCLibrary;
-import org.apache.flex.swc.ISWCManager;
-import org.apache.flex.swc.ISWCScript;
-import org.apache.flex.swf.Header;
-import org.apache.flex.swf.ISWF;
-import org.apache.flex.swf.io.ISWFWriter;
-import org.apache.flex.swf.io.SWFWriter;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.abc.ABCConstants;
+import org.apache.royale.abc.ABCLinker;
+import org.apache.royale.compiler.clients.problems.CompilerProblemCategorizer;
+import org.apache.royale.compiler.clients.problems.ProblemFormatter;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.RSLSettings;
+import org.apache.royale.compiler.filespecs.FileSpecification;
+import org.apache.royale.compiler.filespecs.IFileSpecification;
+import org.apache.royale.compiler.internal.clients.CLIFactory;
+import org.apache.royale.compiler.internal.config.FrameInfo;
+import org.apache.royale.compiler.internal.projects.ASCProject;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority.BasePriority;
+import org.apache.royale.compiler.internal.targets.AppSWFTarget;
+import org.apache.royale.compiler.internal.tree.as.FileNode;
+import org.apache.royale.compiler.internal.units.ABCCompilationUnit;
+import org.apache.royale.compiler.internal.units.ASCompilationUnit;
+import org.apache.royale.compiler.internal.units.ImportedASCompilationUnit;
+import org.apache.royale.compiler.internal.units.SWCCompilationUnit;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.FileWriteProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InvalidImportFileProblem;
+import org.apache.royale.compiler.problems.MultipleExternallyVisibleDefinitionsProblem;
+import org.apache.royale.compiler.problems.UnfoundPropertyProblem;
+import org.apache.royale.compiler.targets.ISWFTarget;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.requests.IABCBytesRequestResult;
+import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.ISWCLibrary;
+import org.apache.royale.swc.ISWCManager;
+import org.apache.royale.swc.ISWCScript;
+import org.apache.royale.swf.Header;
+import org.apache.royale.swf.ISWF;
+import org.apache.royale.swf.io.ISWFWriter;
+import org.apache.royale.swf.io.SWFWriter;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java b/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
index dadfbf7..91c19d6 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/ASDOC.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,26 +26,26 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.flex.compiler.Messages;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.config.COMPCConfiguration;
-import org.apache.flex.compiler.internal.parsing.as.SimpleASDocDelegate;
-import org.apache.flex.compiler.internal.targets.SWFTarget;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.MissingRequirementConfigurationProblem;
-import org.apache.flex.compiler.targets.ISWCTarget;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.swc.ISWC;
-import org.apache.flex.swc.io.ISWCWriter;
-import org.apache.flex.swc.io.SWCDirectoryWriter;
-import org.apache.flex.swc.io.SWCWriter;
-import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.Messages;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.internal.config.COMPCConfiguration;
+import org.apache.royale.compiler.internal.parsing.as.SimpleASDocDelegate;
+import org.apache.royale.compiler.internal.targets.SWFTarget;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.MissingRequirementConfigurationProblem;
+import org.apache.royale.compiler.targets.ISWCTarget;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.io.ISWCWriter;
+import org.apache.royale.swc.io.SWCDirectoryWriter;
+import org.apache.royale.swc.io.SWCWriter;
+import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.FilenameNormalization;
 
 /**
  * Documentation compiler entry point.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
index a83b69b..fdc4d4e 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/COMPC.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,24 +26,24 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.flex.compiler.Messages;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.targets.SWFTarget;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.MissingRequirementConfigurationProblem;
-import org.apache.flex.compiler.targets.ISWCTarget;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.swc.ISWC;
-import org.apache.flex.swc.io.ISWCWriter;
-import org.apache.flex.swc.io.SWCDirectoryWriter;
-import org.apache.flex.swc.io.SWCWriter;
-import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.Messages;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.internal.targets.SWFTarget;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.MissingRequirementConfigurationProblem;
+import org.apache.royale.compiler.targets.ISWCTarget;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.swc.ISWC;
+import org.apache.royale.swc.io.ISWCWriter;
+import org.apache.royale.swc.io.SWCDirectoryWriter;
+import org.apache.royale.swc.io.SWCWriter;
+import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.FilenameNormalization;
 
 /**
  * Component compiler entry point.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
index 3410bd0..d165088 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
@@ -17,9 +17,9 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
-import org.apache.flex.tools.AbstractFlexToolGroup;
+import org.apache.royale.tools.AbstractFlexToolGroup;
 
 /**
  * FlexToolGroup exposing the implementations of the Falcon compilers tools.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
index 473f48d..61c5d18 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/MXMLC.java
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.royale.compiler.clients;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -38,59 +38,59 @@ import java.util.Set;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.output.CountingOutputStream;
 
-import org.apache.flex.compiler.Messages;
-import org.apache.flex.compiler.clients.problems.CompilerProblemCategorizer;
-import org.apache.flex.compiler.clients.problems.ProblemFormatter;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.CommandLineConfigurator;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.ConfigurationPathResolver;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.config.ICompilerProblemSettings;
-import org.apache.flex.compiler.config.ICompilerSettingsConstants;
-import org.apache.flex.compiler.config.RSLSettings;
-import org.apache.flex.compiler.config.RSLSettings.RSLAndPolicyFileURLPair;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.filespecs.IFileSpecification;
-import org.apache.flex.compiler.internal.common.Counter;
-import org.apache.flex.compiler.internal.config.FlashBuilderConfigurator;
-import org.apache.flex.compiler.internal.config.localization.LocalizationManager;
-import org.apache.flex.compiler.internal.graph.GraphMLWriter;
-import org.apache.flex.compiler.internal.projects.FlexProject;
-import org.apache.flex.compiler.internal.projects.DefinitionPriority.BasePriority;
-import org.apache.flex.compiler.internal.targets.LinkageChecker;
-import org.apache.flex.compiler.internal.targets.SWFTarget;
-import org.apache.flex.compiler.internal.targets.Target;
-import org.apache.flex.compiler.internal.units.ResourceModuleCompilationUnit;
-import org.apache.flex.compiler.internal.units.SourceCompilationUnitFactory;
-import org.apache.flex.compiler.internal.units.StyleModuleCompilationUnit;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.FileIOProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.problems.InternalCompilerProblem;
-import org.apache.flex.compiler.problems.UnableToBuildSWFProblem;
-import org.apache.flex.compiler.projects.ICompilerProject;
-import org.apache.flex.compiler.targets.ISWFTarget;
-import org.apache.flex.compiler.targets.ITargetReport;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.compiler.targets.ITarget.TargetType;
-import org.apache.flex.compiler.tree.as.IASNode;
-import org.apache.flex.compiler.tree.as.IFileNode;
-import org.apache.flex.compiler.units.ICompilationUnit;
-import org.apache.flex.compiler.units.ICompilationUnit.UnitType;
-import org.apache.flex.swf.io.ISWFWriterFactory;
-import org.apache.flex.swf.Header;
-import org.apache.flex.swf.ISWF;
-import org.apache.flex.swf.io.ISWFWriter;
-import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
-import org.apache.flex.tools.FlexTool;
-import org.apache.flex.utils.FilenameNormalization;
+import org.apache.royale.compiler.Messages;
+import org.apache.royale.compiler.clients.problems.CompilerProblemCategorizer;
+import org.apache.royale.compiler.clients.problems.ProblemFormatter;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.CommandLineConfigurator;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.ConfigurationPathResolver;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.config.ICompilerProblemSettings;
+import org.apache.royale.compiler.config.ICompilerSettingsConstants;
+import org.apache.royale.compiler.config.RSLSettings;
+import org.apache.royale.compiler.config.RSLSettings.RSLAndPolicyFileURLPair;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.filespecs.IFileSpecification;
+import org.apache.royale.compiler.internal.common.Counter;
+import org.apache.royale.compiler.internal.config.FlashBuilderConfigurator;
+import org.apache.royale.compiler.internal.config.localization.LocalizationManager;
+import org.apache.royale.compiler.internal.graph.GraphMLWriter;
+import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.projects.DefinitionPriority.BasePriority;
+import org.apache.royale.compiler.internal.targets.LinkageChecker;
+import org.apache.royale.compiler.internal.targets.SWFTarget;
+import org.apache.royale.compiler.internal.targets.Target;
+import org.apache.royale.compiler.internal.units.ResourceModuleCompilationUnit;
+import org.apache.royale.compiler.internal.units.SourceCompilationUnitFactory;
+import org.apache.royale.compiler.internal.units.StyleModuleCompilationUnit;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.FileIOProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.problems.InternalCompilerProblem;
+import org.apache.royale.compiler.problems.UnableToBuildSWFProblem;
+import org.apache.royale.compiler.projects.ICompilerProject;
+import org.apache.royale.compiler.targets.ISWFTarget;
+import org.apache.royale.compiler.targets.ITargetReport;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.compiler.targets.ITarget.TargetType;
+import org.apache.royale.compiler.tree.as.IASNode;
+import org.apache.royale.compiler.tree.as.IFileNode;
+import org.apache.royale.compiler.units.ICompilationUnit;
+import org.apache.royale.compiler.units.ICompilationUnit.UnitType;
+import org.apache.royale.swf.io.ISWFWriterFactory;
+import org.apache.royale.swf.Header;
+import org.apache.royale.swf.ISWF;
+import org.apache.royale.swf.io.ISWFWriter;
+import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
+import org.apache.royale.tools.FlexTool;
+import org.apache.royale.utils.FilenameNormalization;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -107,7 +107,7 @@ public class MXMLC implements FlexTool
     static final String NEWLINE = System.getProperty("line.separator");
     private static final String SWF_EXT = ".swf";
     private static final String DEFAULT_VAR = "file-specs";
-    private static final String L10N_CONFIG_PREFIX = "org.apache.flex.compiler.internal.config.configuration";
+    private static final String L10N_CONFIG_PREFIX = "org.apache.royale.compiler.internal.config.configuration";
 
     /**
      * Exit code enumerations.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java b/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
index fa62e0a..2da3726 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/Optimizer.java
@@ -17,41 +17,41 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
-
-import org.apache.flex.compiler.Messages;
-import org.apache.flex.compiler.clients.problems.ProblemFormatter;
-import org.apache.flex.compiler.clients.problems.ProblemPrinter;
-import org.apache.flex.compiler.clients.problems.ProblemQuery;
-import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
-import org.apache.flex.compiler.common.VersionInfo;
-import org.apache.flex.compiler.config.CommandLineConfigurator;
-import org.apache.flex.compiler.config.Configuration;
-import org.apache.flex.compiler.config.ConfigurationBuffer;
-import org.apache.flex.compiler.config.ConfigurationPathResolver;
-import org.apache.flex.compiler.config.ConfigurationValue;
-import org.apache.flex.compiler.config.Configurator;
-import org.apache.flex.compiler.exceptions.ConfigurationException;
-import org.apache.flex.compiler.internal.config.IConfigurationFilter;
-import org.apache.flex.compiler.internal.config.annotations.Arguments;
-import org.apache.flex.compiler.internal.config.annotations.Config;
-import org.apache.flex.compiler.internal.config.localization.LocalizationManager;
-import org.apache.flex.compiler.internal.projects.CompilerProject;
-import org.apache.flex.compiler.internal.projects.FlexProject;
-import org.apache.flex.compiler.internal.targets.AppSWFTarget;
-import org.apache.flex.compiler.internal.targets.Target;
-import org.apache.flex.compiler.internal.workspaces.Workspace;
-import org.apache.flex.compiler.problems.ConfigurationProblem;
-import org.apache.flex.compiler.problems.FileNotFoundProblem;
-import org.apache.flex.compiler.problems.ICompilerProblem;
-import org.apache.flex.compiler.targets.ITargetProgressMonitor;
-import org.apache.flex.compiler.targets.ITargetSettings;
-import org.apache.flex.swf.io.ISWFWriterFactory;
-import org.apache.flex.swf.Header;
-import org.apache.flex.swf.ISWF;
-import org.apache.flex.swf.io.ISWFWriter;
-import org.apache.flex.swf.io.SWFReader;
-import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
+package org.apache.royale.compiler.clients;
+
+import org.apache.royale.compiler.Messages;
+import org.apache.royale.compiler.clients.problems.ProblemFormatter;
+import org.apache.royale.compiler.clients.problems.ProblemPrinter;
+import org.apache.royale.compiler.clients.problems.ProblemQuery;
+import org.apache.royale.compiler.clients.problems.WorkspaceProblemFormatter;
+import org.apache.royale.compiler.common.VersionInfo;
+import org.apache.royale.compiler.config.CommandLineConfigurator;
+import org.apache.royale.compiler.config.Configuration;
+import org.apache.royale.compiler.config.ConfigurationBuffer;
+import org.apache.royale.compiler.config.ConfigurationPathResolver;
+import org.apache.royale.compiler.config.ConfigurationValue;
+import org.apache.royale.compiler.config.Configurator;
+import org.apache.royale.compiler.exceptions.ConfigurationException;
+import org.apache.royale.compiler.internal.config.IConfigurationFilter;
+import org.apache.royale.compiler.internal.config.annotations.Arguments;
+import org.apache.royale.compiler.internal.config.annotations.Config;
+import org.apache.royale.compiler.internal.config.localization.LocalizationManager;
+import org.apache.royale.compiler.internal.projects.CompilerProject;
+import org.apache.royale.compiler.internal.projects.FlexProject;
+import org.apache.royale.compiler.internal.targets.AppSWFTarget;
+import org.apache.royale.compiler.internal.targets.Target;
+import org.apache.royale.compiler.internal.workspaces.Workspace;
+import org.apache.royale.compiler.problems.ConfigurationProblem;
+import org.apache.royale.compiler.problems.FileNotFoundProblem;
+import org.apache.royale.compiler.problems.ICompilerProblem;
+import org.apache.royale.compiler.targets.ITargetProgressMonitor;
+import org.apache.royale.compiler.targets.ITargetSettings;
+import org.apache.royale.swf.io.ISWFWriterFactory;
+import org.apache.royale.swf.Header;
+import org.apache.royale.swf.ISWF;
+import org.apache.royale.swf.io.ISWFWriter;
+import org.apache.royale.swf.io.SWFReader;
+import org.apache.royale.swf.io.SizeReportWritingSWFWriter;
 import com.google.common.collect.ImmutableSet;
 
 import java.io.BufferedInputStream;
@@ -69,7 +69,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.flex.tools.FlexTool;
+import org.apache.royale.tools.FlexTool;
 
 /**
  * Command line optimizer - can read in a swf, apply the optimizations usually done during swf linking,
@@ -79,7 +79,7 @@ public class Optimizer implements FlexTool
 {
     static final String NEWLINE = System.getProperty("line.separator");
     private static final String DEFAULT_VAR = "input";
-    private static final String L10N_CONFIG_PREFIX = "org.apache.flex.compiler.internal.config.configuration";
+    private static final String L10N_CONFIG_PREFIX = "org.apache.royale