royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 02/02: replace even more references to Flex
Date Wed, 01 Nov 2017 18:14:34 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 3c9c1b85d214fe94d221fd02c5313307aed0c68b
Author: Alex Harui <aharui@apache.org>
AuthorDate: Wed Nov 1 11:14:13 2017 -0700

    replace even more references to Flex
---
 LICENSE                                            |  19 ++
 LICENSE.jx.bin => LICENSE.bin                      |   0
 LICENSE.jx                                         | 222 ---------------------
 NOTICE                                             |   2 +-
 NOTICE.base                                        |   2 +-
 NOTICE.fdb                                         |   2 +-
 NOTICE.jx                                          |   5 -
 NOTICE.oem                                         |   2 +-
 RELEASE_NOTES                                      |   6 +-
 build.properties                                   |   4 +-
 build.xml                                          |  16 +-
 compiler-build-tools/build.xml                     |   2 +-
 compiler-build-tools/pom.xml                       |   2 +-
 compiler-jburg-types/build.xml                     |   2 +-
 compiler-jburg-types/pom.xml                       |   2 +-
 compiler-jx/build.xml                              |   6 +-
 compiler-jx/src/assembly/scripts/asjsc             |  10 +-
 compiler-jx/src/assembly/scripts/asjsc.bat         |   4 +-
 compiler-jx/src/assembly/scripts/compc             |  10 +-
 compiler-jx/src/assembly/scripts/compc.bat         |   4 +-
 compiler-jx/src/assembly/scripts/mxmlc             |  10 +-
 compiler-jx/src/assembly/scripts/mxmlc.bat         |   4 +-
 .../javascript/jscomp/RoyaleDiagnosticGroups.java  |   6 +-
 .../codegen/js/jx/PackageHeaderEmitter.java        |   2 +-
 .../codegen/mxml/royale/MXMLRoyaleEmitter.java     |   2 +-
 .../driver/js/royale/JSCSSCompilationSession.java  |   2 +-
 compiler-jx/src/main/resources/downloads.xml       |   4 +-
 compiler-jx/src/test/downloads.xml                 |   4 +-
 .../royale/compiler/internal/test/TestBase.java    |   2 +-
 .../royale/files/CSSTestSource_result.css          |   2 +-
 .../royale/projects/circular_proto/A_result.js     |   2 +-
 .../royale/projects/circular_proto/B_result.js     |   2 +-
 .../royale/projects/circular_proto/C_result.js     |   2 +-
 .../royale/projects/circular_proto/D_result.js     |   2 +-
 .../royale/projects/circular_proto/E_result.js     |   2 +-
 .../royale/projects/circular_proto/F_result.js     |   2 +-
 .../AmbiguousDefinition_result.js                  |   2 +-
 .../Event_result.js                                |   2 +-
 .../Event_result.js                                |   2 +-
 .../mypackage/TestClass_result.js                  |   2 +-
 .../otherpackage/Event_result.js                   |   2 +-
 .../Event_result.js                                |   2 +-
 .../mypackage/TestClass_result.js                  |   2 +-
 .../Event_result.js                                |   2 +-
 .../mypackage/TestClass_result.js                  |   2 +-
 .../Event_result.js                                |   2 +-
 .../mypackage/Event_result.js                      |   2 +-
 .../mypackage/TestClass_result.js                  |   2 +-
 .../package_conflicts_use_window/Event_result.js   |   2 +-
 .../mypackage/TestClass_result.js                  |   2 +-
 .../otherpackage/Event_result.js                   |   2 +-
 compiler-test-utils/pom.xml                        |   2 +-
 compiler/src/assembly/scripts/compc                |  10 +-
 compiler/src/assembly/scripts/compc.bat            |   4 +-
 compiler/src/assembly/scripts/mxmlc                |  10 +-
 compiler/src/assembly/scripts/mxmlc.bat            |   4 +-
 compiler/src/assembly/scripts/swcdepends.bat       |   4 +-
 .../org/apache/royale/compiler/internal/css/CSS.g  |   6 +-
 .../org/apache/royale/compiler/clients/ASDOC.java  |   2 +-
 .../org/apache/royale/compiler/clients/COMPC.java  |   2 +-
 .../org/apache/royale/compiler/clients/MXMLC.java  |   2 +-
 .../royale/compiler/config/Configurator.java       |  12 +-
 .../config/ICompilerSettingsConstants.java         |   2 +-
 .../internal/config/ICompilerSettings.java         |   4 +-
 .../compiler/internal/targets/RoyaleTarget.java    |   4 +-
 .../compiler/internal/targets/SWCTarget.java       |   2 +-
 .../java/org/apache/royale/compiler/package.html   |   2 +-
 .../ClassesMappedToSameRemoteAliasProblem.java     |   2 +-
 .../problems/ConstructorInInterfaceProblem.java    |   2 +-
 .../RoyaleOnlyConfigurationOptionNotSupported.java |   2 +-
 .../royale/compiler/projects/IRoyaleProject.java   |   8 +-
 .../apache/royale/compiler/projects/package.html   |   6 +-
 .../royale/compiler/targets/ITargetSettings.java   |   6 +-
 .../java/org/apache/royale/swc/ISWCVersion.java    |  10 +-
 .../java/org/apache/royale/swc/SWCVersion.java     |   4 +-
 .../royale/swc/catalog/ICatalogXMLConstants.java   |   2 +-
 .../royale/swc/catalog/StAXCatalogReader.java      |   4 +-
 .../royale/swc/catalog/StAXCatalogWriter.java      |   6 +-
 .../java/org/apache/royale/swf/io/SWFDump.java     |   2 +-
 .../org/apache/royale/swf/tags/ProductInfoTag.java |   2 +-
 .../apache/royale/compiler/messages_en.properties  |   8 +-
 .../apache/royale/compiler/messages_fr.properties  |  14 +-
 .../apache/royale/compiler/messages_ja.properties  |  12 +-
 .../royale/compiler/messages_zh_CN.properties      |  12 +-
 compiler/src/test/build.xml                        |   6 +-
 compiler/src/test/downloads.xml                    |   4 +-
 .../java/utils/FlashplayerSecurityHandler.java     |   2 +-
 debugger/build.properties                          |   2 +-
 debugger/build.xml                                 |   6 +-
 debugger/pom.xml                                   |   2 +-
 .../tools/debugger/DefaultDebuggerCallbacks.java   |   2 +-
 flex-compiler-oem/src/site/site.xml                |  11 +-
 pom.xml                                            |   2 +-
 royale-ant-tasks/build.xml                         |  10 +-
 royale-ant-tasks/pom.xml                           |   2 +-
 .../org/apache/royale/compiler/ant/COMPCTask.java  |   4 +-
 .../org/apache/royale/compiler/ant/FlexTask.java   |   2 +-
 .../org/apache/royale/compiler/ant/MXMLCTask.java  |   2 +-
 royale-ant-tasks/src/test/build.xml                |   8 +-
 royale-maven-extension/pom.xml                     |   2 +-
 ...uageSupport.java => RoyaleLanguageSupport.java} |   8 +-
 ...JsScopeDeriver.java => RoyaleScopeDeriver.java} |   2 +-
 ...ScopeSelector.java => RoyaleScopeSelector.java} |   2 +-
 royale-maven-plugin/pom.xml                        |   2 +-
 .../org/apache/royale/maven/CompileJSMojo.java     |   2 +-
 .../royale/maven/trust/DefaultTrustHandler.java    |   2 +-
 .../org/apache/royale/maven/types/FlexScope.java   |  26 ---
 .../main/resources/config/compile-app-config.xml   |   6 +-
 src/site/asciidoc/build.adoc                       |   3 +-
 src/site/asciidoc/featurebranch-autobuild.adoc     |   2 +-
 src/site/site.xml                                  |   2 +-
 111 files changed, 229 insertions(+), 471 deletions(-)

diff --git a/LICENSE b/LICENSE
index 6b0b127..c88e59c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,3 +201,22 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+--------------------------------------------------------------------------------
+
+APACHE ROYALE COMPILER SUBCOMPONENTS:
+
+The Apache Royale Compiler includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+The Google Closure Library Externs For Common Libraries are available 
+under Apache License 2.0.  For details see the flex-typedefs folder.
+
+The .as files in flex-typedefs/GCL/src are derived from the .js files in the 
+Google Closure Library which are available under Apache License 2.0.
+
+The createjs.js file in flex-typedefs/createjs/src/main/javascript is
+a non-copyrightable subset of EaselJS and TweenJS from 
+https://github.com/CreateJS 
+
diff --git a/LICENSE.jx.bin b/LICENSE.bin
similarity index 100%
rename from LICENSE.jx.bin
rename to LICENSE.bin
diff --git a/LICENSE.jx b/LICENSE.jx
deleted file mode 100644
index d94ce68..0000000
--- a/LICENSE.jx
+++ /dev/null
@@ -1,222 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------------------------------------
-
-APACHE FLEX CROSS-COMPILER SUBCOMPONENTS:
-
-The Apache Flex Cross-Compiler includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-The Google Closure Library Externs For Common Libraries are available 
-under Apache License 2.0.  For details see the flex-typedefs folder.
-
-The .as files in flex-typedefs/GCL/src are derived from the .js files in the 
-Google Closure Library which are available under Apache License 2.0.
-
-The createjs.js file in flex-typedefs/createjs/src/main/javascript is
-a non-copyrightable subset of EaselJS and TweenJS from 
-https://github.com/CreateJS 
-
diff --git a/NOTICE b/NOTICE
index 2f34c3b..fa9e750 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Flex Compiler
+Apache Royale Compiler
 Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/NOTICE.base b/NOTICE.base
index 5a27857..ba002ff 100644
--- a/NOTICE.base
+++ b/NOTICE.base
@@ -1,4 +1,4 @@
-Apache Flex Compiler
+Apache Royale Compiler
 Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/NOTICE.fdb b/NOTICE.fdb
index 4962b1c..f4b1b1a 100644
--- a/NOTICE.fdb
+++ b/NOTICE.fdb
@@ -1,4 +1,4 @@
-Apache Flex Debugger
+Apache Royale Debugger
 Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/NOTICE.jx b/NOTICE.jx
deleted file mode 100644
index 9f7bf65..0000000
--- a/NOTICE.jx
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Flex Cross-Compiler
-Copyright 2012-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.oem b/NOTICE.oem
index 735b898..77532e7 100644
--- a/NOTICE.oem
+++ b/NOTICE.oem
@@ -1,4 +1,4 @@
-Apache Flex Compiler
+Apache Royale Compiler
 Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 0dceb98..1f7e3ef 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -25,7 +25,7 @@ The Java compiler will report warnings for several files in this release.
 
 Please report new issues to our bugbase at:
 
-    https://issues.apache.org/jira/browse/FLEX
+    https://github.com/apache/royale-compiler/issues
 
-                                          The Apache Flex Project
-                                          <http://flex.apache.org/>
+                                          The Apache Royale Project
+                                          <http://royale.apache.org/>
diff --git a/build.properties b/build.properties
index e170f80..d4d10ed 100644
--- a/build.properties
+++ b/build.properties
@@ -19,9 +19,9 @@
 
 release.version = 0.9.0
 
-generated.by.match=/\\*\\*. \\* Generated by Apache Flex Cross-Compiler
+generated.by.match=/\\*\\*. \\* Generated by Apache Royale Compiler
 generated.by.comment=/**\n\
-\ * Generated by Apache Flex Cross-Compiler
+\ * Generated by Apache Royale Compiler
 
 asfheader=/**\n\
 \ * Licensed under the Apache License, Version 2.0 (the 'License');\n\
diff --git a/build.xml b/build.xml
index 64f6e68..f88eb42 100644
--- a/build.xml
+++ b/build.xml
@@ -25,8 +25,8 @@
     <property file="${basedir}/local.properties"/>
     <property file="${basedir}/build.properties"/>
 
-    <property name="kit.prefix" value="apache-flex-royale-${release.version}"/>
-    <property name="kit.jx.prefix" value="apache-flex-royalejx-${release.version}"/>
+    <property name="kit.prefix" value="apache-royale-${release.version}"/>
+    <property name="kit.jx.prefix" value="apache-royalejx-${release.version}"/>
     <property name="source.kit" value="${kit.prefix}-src"/>
     <property name="binary.kit" value="${kit.prefix}-bin"/>
     <property name="source.jx.kit" value="${kit.jx.prefix}-src"/>
@@ -245,7 +245,7 @@
         description="Builds and packages the binary kit which is provided as a convenience."/>
         
     <!--
-        Package up the Apache Flex sources.  Do not include empty directories.
+        Package up the Apache Royale sources.  Do not include empty directories.
                                                                                        
         Note: even if cleaned, this will package up unversioned files that happen
         to be in the tree.
@@ -321,7 +321,7 @@
         <!-- flex-compiler-oem and fdb -->
         <antcall target="stage-fb-integration"/>
         
-        <!-- flex ant tasks -->
+        <!-- royale ant tasks -->
         <antcall target="stage-ant-tasks"/>
         
         <!-- typedefs -->
@@ -661,12 +661,6 @@
         <antcall target="binary-package-jx-zip"/>
         <antcall target="binary-package-jx-tgz"/>
         
-        <copy todir="${basedir}/out">
-            <fileset dir="${basedir}">
-                <include name="apache-flex-royale-installer-config.xml"/>
-                <include name="apache-flex-royalejx-installer-config.xml"/>
-            </fileset>
-        </copy>
     </target>
 
     <!--
@@ -756,7 +750,7 @@
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
-                <exclude name="**/org.apache.royale.tools.FlexToolGroup"/>
+                <exclude name="**/org.apache.royale.tools.RoyaleToolGroup"/>
                 <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 7169c89..b548f01 100644
--- a/compiler-build-tools/build.xml
+++ b/compiler-build-tools/build.xml
@@ -47,7 +47,7 @@
 
     <!-- JAR manifest entries -->
     <property name="manifest.sealed" value="false"/>
-    <property name="manifest.Implementation-Title" value="Apache Flex Compiler"/>
+    <property name="manifest.Implementation-Title" value="Apache Royale Compiler"/>
     <property name="manifest.Implementation-Version" value="${release.version}"/>
     <property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
     
diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml
index 61b4f5c..396854c 100644
--- a/compiler-build-tools/pom.xml
+++ b/compiler-build-tools/pom.xml
@@ -32,7 +32,7 @@
   <version>1.1.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
-  <name>Apache Flex - Royale: Build Tools</name>
+  <name>Apache Royale: Build Tools</name>
 
   <build>
     <plugins>
diff --git a/compiler-jburg-types/build.xml b/compiler-jburg-types/build.xml
index 8059e57..9076f9b 100644
--- a/compiler-jburg-types/build.xml
+++ b/compiler-jburg-types/build.xml
@@ -47,7 +47,7 @@
 
     <!-- JAR manifest entries -->
     <property name="manifest.sealed" value="false"/>
-    <property name="manifest.Implementation-Title" value="Apache Flex Compiler"/>
+    <property name="manifest.Implementation-Title" value="Apache Royale Compiler"/>
     <property name="manifest.Implementation-Version" value="${release.version}"/>
     <property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
     
diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml
index 898fc62..bb298e3 100644
--- a/compiler-jburg-types/pom.xml
+++ b/compiler-jburg-types/pom.xml
@@ -32,7 +32,7 @@
   <artifactId>compiler-jburg-types</artifactId>
   <version>1.1.0-SNAPSHOT</version>
 
-  <name>Apache Flex - Royale: JBurg Types</name>
+  <name>Apache Royale: JBurg Types</name>
   <description>Types needed by JBurg to perform it's code generation.</description>
 
   <dependencies>
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 8770a06..df733d9 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -38,7 +38,7 @@
 
     <!-- JAR manifest entries -->
     <property name="manifest.sealed" value="false"/>
-    <property name="manifest.Implementation-Title" value="Apache Flex Cross-Compiler"/>
+    <property name="manifest.Implementation-Title" value="Apache Royale Compiler"/>
     <property name="manifest.Implementation-Version" value="${release.version}"/>
     <property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
 
@@ -103,12 +103,12 @@
         <property name="jar.classpath" value="commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar" />
 
         <copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/>
-        <copy file="${basedir}/../NOTICE.jx" tofile="${classes.dir}/META-INF/NOTICE"/>
+        <copy file="${basedir}/../NOTICE" tofile="${classes.dir}/META-INF/NOTICE"/>
         
 		<echo message="Building ${jsc.jar}" />
 		<jar file="${jsc.jar}" basedir="${classes.dir}"
             includes="**/*.properties,org/apache/**/*,com/google/**/*,META-INF/**/*"
-			excludes="**/JSDriver*,**/IASNodeAdapter*,org/apache/flex/compiler/internal/parsing/abc/*" >
+			excludes="**/JSDriver*,**/IASNodeAdapter*,org/apache/royale/compiler/internal/parsing/abc/*" >
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
diff --git a/compiler-jx/src/assembly/scripts/asjsc b/compiler-jx/src/assembly/scripts/asjsc
index 50eca44..92c6a28 100755
--- a/compiler-jx/src/assembly/scripts/asjsc
+++ b/compiler-jx/src/assembly/scripts/asjsc
@@ -33,11 +33,11 @@ fi
 
 echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
 then
-    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
+    ROYALE_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
-echo Using Flex SDK: $FLEX_HOME
+echo Using Royale SDK: $ROYALE_HOME
 
 case `uname` in
 		CYGWIN*)
@@ -52,7 +52,7 @@ D32=''
 if [ $OS = "Windows" ]; then
 
 	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
-	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	ROYALE_HOME=`cygpath -m $ROYALE_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$FLEX_HOME/frameworks" -external-library-path="$SCRIPT_HOME/../libs/JS.swc" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -external-library-path="$SCRIPT_HOME/../libs/JS.swc" "$@"
diff --git a/compiler-jx/src/assembly/scripts/asjsc.bat b/compiler-jx/src/assembly/scripts/asjsc.bat
index c603080..48d6d00 100644
--- a/compiler-jx/src/assembly/scripts/asjsc.bat
+++ b/compiler-jx/src/assembly/scripts/asjsc.bat
@@ -24,6 +24,6 @@ rem
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" -external-library-path="%ROYALE_COMPILER_HOME%\libs\JS.swc" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" -external-library-path="%ROYALE_COMPILER_HOME%\libs\JS.swc" %*
diff --git a/compiler-jx/src/assembly/scripts/compc b/compiler-jx/src/assembly/scripts/compc
index b718b89..b63ddeb 100755
--- a/compiler-jx/src/assembly/scripts/compc
+++ b/compiler-jx/src/assembly/scripts/compc
@@ -33,11 +33,11 @@ fi
 
 echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
 then
-    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
+    ROYALE_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
-echo Using Flex SDK: $FLEX_HOME
+echo Using Royale SDK: $ROYALE_HOME
 
 case `uname` in
 		CYGWIN*)
@@ -52,7 +52,7 @@ D32=''
 if [ $OS = "Windows" ]; then
 
 	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
-	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	ROYALE_HOME=`cygpath -m $ROYALE_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$FLEX_HOME/frameworks" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$ROYALE_HOME/frameworks" "$@"
diff --git a/compiler-jx/src/assembly/scripts/compc.bat b/compiler-jx/src/assembly/scripts/compc.bat
index 9e935e2..77907b0 100644
--- a/compiler-jx/src/assembly/scripts/compc.bat
+++ b/compiler-jx/src/assembly/scripts/compc.bat
@@ -24,6 +24,6 @@ rem
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" %*
diff --git a/compiler-jx/src/assembly/scripts/mxmlc b/compiler-jx/src/assembly/scripts/mxmlc
index 5b1fc1b..9d4e502 100755
--- a/compiler-jx/src/assembly/scripts/mxmlc
+++ b/compiler-jx/src/assembly/scripts/mxmlc
@@ -33,11 +33,11 @@ fi
 
 echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
 then
-    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
+    ROYALE_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
-echo Using Flex SDK: $FLEX_HOME
+echo Using Royale SDK: $ROYALE_HOME
 
 case `uname` in
 		CYGWIN*)
@@ -52,7 +52,7 @@ D32=''
 if [ $OS = "Windows" ]; then
 
 	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
-	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	ROYALE_HOME=`cygpath -m $ROYALE_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$FLEX_HOME/frameworks" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" "$@"
diff --git a/compiler-jx/src/assembly/scripts/mxmlc.bat b/compiler-jx/src/assembly/scripts/mxmlc.bat
index 9e935e2..77907b0 100644
--- a/compiler-jx/src/assembly/scripts/mxmlc.bat
+++ b/compiler-jx/src/assembly/scripts/mxmlc.bat
@@ -24,6 +24,6 @@ rem
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" %*
diff --git a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
index ce6d884..406b399 100644
--- a/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
+++ b/compiler-jx/src/main/java/com/google/javascript/jscomp/RoyaleDiagnosticGroups.java
@@ -27,7 +27,7 @@ package com.google.javascript.jscomp;
 public class RoyaleDiagnosticGroups {
 
 	/**
-	 * Flex ItemRenderer Factories store the constructor in a variable
+	 * Royale ItemRenderer Factories store the constructor in a variable
 	 * resulting in this warning.
 	 */
 	public static final DiagnosticGroup ROYALE_NOT_A_CONSTRUCTOR =
@@ -35,7 +35,7 @@ public class RoyaleDiagnosticGroups {
                 TypeCheck.NOT_A_CONSTRUCTOR);
 
 	/**
-	 * Flex code calls super.methodName from functions other than
+	 * Royale code calls super.methodName from functions other than
 	 * overrides of the methodName.
 	 */
 	public static final DiagnosticGroup ROYALE_SUPER_CALL_TO_DIFFERENT_NAME =
@@ -48,7 +48,7 @@ public class RoyaleDiagnosticGroups {
     */
 	
 	/**
-	 * Flex code won't always generate a goog.requires for types only used
+	 * Royale code won't always generate a goog.requires for types only used
 	 * in JSDoc annotations, but the compiler complains.
 	 */
 	public static final DiagnosticGroup ROYALE_UNKNOWN_JSDOC_TYPE_NAME =
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 a8bf39c..172519e 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
@@ -130,7 +130,7 @@ public class PackageHeaderEmitter extends JSSubEmitter implements
         }
 
         writeNewline("/**");
-        writeNewline(" * Generated by Apache Flex Cross-Compiler from " + sourceName);
+        writeNewline(" * Generated by Apache Royale Compiler from " + sourceName);
         writeNewline(" * " + qname);
         writeNewline(" *");
         writeNewline(" * @fileoverview");
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
index 33760bb..27bb63f 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyaleEmitter.java
@@ -2547,7 +2547,7 @@ public class MXMLRoyaleEmitter extends MXMLEmitter implements
             }
         }
         writeNewline("/**");
-        writeNewline(" * Generated by Apache Flex Cross-Compiler from " + sourceName);
+        writeNewline(" * Generated by Apache Royale Compiler from " + sourceName);
         writeNewline(" * " + cname);
         writeNewline(" *");
         writeNewline(" * @fileoverview");
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
index d4f31d5..736efe0 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
@@ -72,7 +72,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession
     {
         final ICSSDocument css = synthesisNormalizedCSS();
         StringBuilder sb = new StringBuilder();
-        sb.append("/* Generated by Apache Flex Cross-Compiler */\n");
+        sb.append("/* Generated by Apache Royale Compiler */\n");
         walkCSS(css, sb);
         return sb.toString();
     }
diff --git a/compiler-jx/src/main/resources/downloads.xml b/compiler-jx/src/main/resources/downloads.xml
index ddeb68b..5e9c91f 100644
--- a/compiler-jx/src/main/resources/downloads.xml
+++ b/compiler-jx/src/main/resources/downloads.xml
@@ -403,13 +403,13 @@
                 <not>
                     <available file="${destDir}/${destFile}" />
                 </not>
-                <isset property="env.FLEX_DOWNLOAD_CACHE" />
+                <isset property="env.ROYALE_DOWNLOAD_CACHE" />
             </and>
         </condition>
         <echo>Need file: ${still_no_file}</echo>
     </target>
     <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file">
-        <copy file="${env.FLEX_DOWNLOAD_CACHE}/${srcFile}" tofile="${destDir}/${destFile}" />
+        <copy file="${env.ROYALE_DOWNLOAD_CACHE}/${srcFile}" tofile="${destDir}/${destFile}" />
     </target>
 
 
diff --git a/compiler-jx/src/test/downloads.xml b/compiler-jx/src/test/downloads.xml
index 025e62e..b6b334f 100644
--- a/compiler-jx/src/test/downloads.xml
+++ b/compiler-jx/src/test/downloads.xml
@@ -142,13 +142,13 @@
                 <not>
                     <available file="${destDir}/${destJarFile}" />
                 </not>
-                <isset property="env.FLEX_DOWNLOAD_CACHE" />
+                <isset property="env.ROYALE_DOWNLOAD_CACHE" />
             </and>
         </condition>
         <echo>Need file: ${still_no_file}</echo>
     </target>
     <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file">
-        <copy file="${env.FLEX_DOWNLOAD_CACHE}/${srcJarFile}" tofile="${destDir}/${destJarFile}" />
+        <copy file="${env.ROYALE_DOWNLOAD_CACHE}/${srcJarFile}" tofile="${destDir}/${destJarFile}" />
     </target>
 
 </project>
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 ec0dd5b..a8ac33d 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
@@ -271,7 +271,7 @@ public class TestBase implements ITestBase
 
     protected String removeGeneratedString(String code)
     {
-    	int c = code.indexOf(" * Generated by Apache Flex Cross-Compiler");
+    	int c = code.indexOf(" * Generated by Apache Royale Compiler");
     	if (c != -1)
     	{
     		int c2 = code.indexOf("\n", c);
diff --git a/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css b/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
index b652b77..42684f0 100755
--- a/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
+++ b/compiler-jx/src/test/resources/royale/files/CSSTestSource_result.css
@@ -18,7 +18,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 */
-/* Generated by Apache Flex Cross-Compiler */
+/* Generated by Apache Royale Compiler */
 .glass {
         border-color: #767473;
         highlight-alphas: .07, .45;
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/A_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/A_result.js
index dd84121..b2481e4 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/A_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/A_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from A.as
+ * Generated by Apache Royale Compiler from A.as
  * A
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/B_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/B_result.js
index 82942db..efacd72 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/B_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/B_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from B.as
+ * Generated by Apache Royale Compiler from B.as
  * B
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/C_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/C_result.js
index c29f4e4..e230054 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/C_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/C_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from C.as
+ * Generated by Apache Royale Compiler from C.as
  * C
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/D_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/D_result.js
index 22fe70c..d3171dc 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/D_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/D_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from D.as
+ * Generated by Apache Royale Compiler from D.as
  * D
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/E_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/E_result.js
index 34c5de9..9eb682c 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/E_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/E_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from E.as
+ * Generated by Apache Royale Compiler from E.as
  * E
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/F_result.js b/compiler-jx/src/test/resources/royale/projects/circular_proto/F_result.js
index 421fc17..c641222 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/F_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/F_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from F.as
+ * Generated by Apache Royale Compiler from F.as
  * F
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js
index d4442a1..b176467 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/AmbiguousDefinition_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from AmbiguousDefinition.as
+ * Generated by Apache Royale Compiler from AmbiguousDefinition.as
  * AmbiguousDefinition
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/Event_result.js
index df93739..9541f33 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_ambiguous_definition/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js
index b8a3743..7ab655d 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js
index d17b0d3..6b487b5 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/mypackage/TestClass_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/TestClass.as
+ * Generated by Apache Royale Compiler from mypackage/TestClass.as
  * mypackage.TestClass
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js
index 8222b84..9064c05 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_different_package_as_conflict/otherpackage/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from otherpackage/Event.as
+ * Generated by Apache Royale Compiler from otherpackage/Event.as
  * otherpackage.Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js
index b8a3743..7ab655d 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js
index e9c6f34..c644d1f 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_no_window/mypackage/TestClass_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/TestClass.as
+ * Generated by Apache Royale Compiler from mypackage/TestClass.as
  * mypackage.TestClass
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js
index b8a3743..7ab655d 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js
index e9c6f34..c644d1f 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_no_conflict_use_window/mypackage/TestClass_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/TestClass.as
+ * Generated by Apache Royale Compiler from mypackage/TestClass.as
  * mypackage.TestClass
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js
index b8a3743..7ab655d 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js
index c8e4c05..6bf3477 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/Event.as
+ * Generated by Apache Royale Compiler from mypackage/Event.as
  * mypackage.Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js
index 688e992..a0a5b4e 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_same_package_as_conflict/mypackage/TestClass_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/TestClass.as
+ * Generated by Apache Royale Compiler from mypackage/TestClass.as
  * mypackage.TestClass
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js
index b8a3743..7ab655d 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from Event.as
+ * Generated by Apache Royale Compiler from Event.as
  * Event
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js
index bea4073..812e1b0 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/mypackage/TestClass_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from mypackage/TestClass.as
+ * Generated by Apache Royale Compiler from mypackage/TestClass.as
  * mypackage.TestClass
  *
  * @fileoverview
diff --git a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js
index 8222b84..9064c05 100644
--- a/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/package_conflicts_use_window/otherpackage/Event_result.js
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 /**
- * Generated by Apache Flex Cross-Compiler from otherpackage/Event.as
+ * Generated by Apache Royale Compiler from otherpackage/Event.as
  * otherpackage.Event
  *
  * @fileoverview
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 795f839..fb538fe 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>compiler-test-utils</artifactId>
   <version>0.9.0-SNAPSHOT</version>
 
-  <name>Apache Flex - Royale: Compiler: Test Utils</name>
+  <name>Apache Royale: Compiler: Test Utils</name>
   <description>
     Shared test code, which is needed by the compiler and the compiler-jx test-suites.
   </description>
diff --git a/compiler/src/assembly/scripts/compc b/compiler/src/assembly/scripts/compc
index bbbc77a..4a37dd8 100755
--- a/compiler/src/assembly/scripts/compc
+++ b/compiler/src/assembly/scripts/compc
@@ -32,12 +32,12 @@ else
     echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FLEX_HOME=${SCRIPT_HOME}/..
+    ROYALE_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Flex SDK: $FLEX_HOME
+    echo Using Royale SDK: $ROYALE_HOME
 fi
 
 case `uname` in
@@ -53,7 +53,7 @@ D32=''
 if [ $OS = "Windows" ]; then
 
 	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
-	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	ROYALE_HOME=`cygpath -m $ROYALE_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -68,4 +68,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$ROYALE_COMPILER_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS  -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" "$@"
diff --git a/compiler/src/assembly/scripts/compc.bat b/compiler/src/assembly/scripts/compc.bat
index 46123be..54b9ca3 100644
--- a/compiler/src/assembly/scripts/compc.bat
+++ b/compiler/src/assembly/scripts/compc.bat
@@ -26,7 +26,7 @@ setlocal
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%/frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-compc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m  -Droyalelib="%ROYALE_HOME%/frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-compc.jar" %*
 
diff --git a/compiler/src/assembly/scripts/mxmlc b/compiler/src/assembly/scripts/mxmlc
index 7e819a9..061cdf4 100755
--- a/compiler/src/assembly/scripts/mxmlc
+++ b/compiler/src/assembly/scripts/mxmlc
@@ -32,12 +32,12 @@ else
     echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
-if [ "x${FLEX_HOME}" = "x" ]
+if [ "x${ROYALE_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FLEX_HOME=${SCRIPT_HOME}/..
+    ROYALE_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Flex SDK: $FLEX_HOME
+    echo Using Royale SDK: $ROYALE_HOME
 fi
 
 case `uname` in
@@ -53,7 +53,7 @@ D32=''
 if [ $OS = "Windows" ]; then
 
 	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
-	FLEX_HOME=`cygpath -m $FLEX_HOME`
+	ROYALE_HOME=`cygpath -m $ROYALE_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -68,4 +68,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$ROYALE_COMPILER_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-mxmlc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS  -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-mxmlc.jar" "$@"
diff --git a/compiler/src/assembly/scripts/mxmlc.bat b/compiler/src/assembly/scripts/mxmlc.bat
index d46755b..37458cf 100644
--- a/compiler/src/assembly/scripts/mxmlc.bat
+++ b/compiler/src/assembly/scripts/mxmlc.bat
@@ -26,8 +26,8 @@ setlocal
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m  -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-mxmlc.jar" %*
 
 
diff --git a/compiler/src/assembly/scripts/swcdepends.bat b/compiler/src/assembly/scripts/swcdepends.bat
index 1f2d585..b4c7a3e 100644
--- a/compiler/src/assembly/scripts/swcdepends.bat
+++ b/compiler/src/assembly/scripts/swcdepends.bat
@@ -26,6 +26,6 @@ setlocal
 
 if "x%ROYALE_COMPILER_HOME%"=="x"  (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
 
-if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..) else echo Using Flex SDK: %FLEX_HOME%
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\royale-swcdepends.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m  -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\royale-swcdepends.jar" %*
diff --git a/compiler/src/main/antlr3/org/apache/royale/compiler/internal/css/CSS.g b/compiler/src/main/antlr3/org/apache/royale/compiler/internal/css/CSS.g
index c16a61e..d71b4f5 100644
--- a/compiler/src/main/antlr3/org/apache/royale/compiler/internal/css/CSS.g
+++ b/compiler/src/main/antlr3/org/apache/royale/compiler/internal/css/CSS.g
@@ -18,7 +18,7 @@
  */
 
 /**
- * This is a grammar for advanced CSS in Flex. It parses the CSS document and
+ * This is a grammar for advanced CSS in Royale. It parses the CSS document and
  * generate DOM objects.
  */
 grammar CSS;
@@ -211,13 +211,13 @@ mediaQuery
     ;
   
 /**
- * This rule matches the actual Flex media query conditions.
+ * This rule matches the actual Royale media query conditions.
  * For example: (application-dpi: 240) and (os-platform: "Android")
  */
 medium 
     :   mediumCondition    
         (  
-            // Flex only support "and" at the moment.
+            // Royale only support "and" at the moment.
             'and' 
             mediumCondition
             | mediumCondition
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 88eba86..07d66f5 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
@@ -127,7 +127,7 @@ public class ASDOC extends MXMLC implements FlexTool
     protected String getStartMessage()
     {
         // This message should not be localized.
-        String message = "Apache Flex ASDoc Compiler" + NEWLINE +
+        String message = "Apache Royale ASDoc Compiler" + NEWLINE +
             VersionInfo.buildMessage() + NEWLINE;
         return message;
     }
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 49efb0d..49197f3 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
@@ -120,7 +120,7 @@ public class COMPC extends MXMLC implements FlexTool
     protected String getStartMessage()
     {
         // This message should not be localized.
-        String message = "Apache Flex SWC Component Compiler (compc)" + NEWLINE + 
+        String message = "Apache Royale SWC Component Compiler (compc)" + NEWLINE +
             VersionInfo.buildMessage() + NEWLINE;
         return message;
     }
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 b23a1c8..7f37059 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
@@ -1044,7 +1044,7 @@ public class MXMLC implements FlexTool
     protected String getStartMessage()
     {
         // This message should not be localized.
-        String message = "Apache Flex MXML and ActionScript Compiler (mxmlc)" + NEWLINE + 
+        String message = "Apache Royale MXML and ActionScript Compiler (mxmlc)" + NEWLINE +
             VersionInfo.buildMessage() + NEWLINE;
         return message;
     }
diff --git a/compiler/src/main/java/org/apache/royale/compiler/config/Configurator.java b/compiler/src/main/java/org/apache/royale/compiler/config/Configurator.java
index aa90faa..35704bf 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/config/Configurator.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/config/Configurator.java
@@ -2108,7 +2108,7 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
     }
 
     /**
-     * Controls if the compiler warns when "Flex only" configuration options 
+     * Controls if the compiler warns when "Royale only" configuration options
      * are used in the compiler.
      * 
      * @param value True to enable warnings, false to disable warnings. The
@@ -2825,8 +2825,8 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
      * <pre>
      * &lt;script>
      *     &lt;!-- use 'dep', 'pre' or 'dep' to specify a definition to be omitted from linking. -->
-     *     &lt;def id="mx.skins:ProgrammaticSkin"/>
-     *     &lt;pre id="mx.core:IFlexDisplayObject"/>
+     *     &lt;def id="org.apache.royale.core:UIBase"/>
+     *     &lt;pre id="org.apache.royale.core:IUIBase"/>
      *     &lt;dep id="String"/>
      * &lt;/script>
      * </pre>
@@ -2958,10 +2958,10 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
      * 
      * <pre>
      * Map titles = new HashMap();
-     * titles.put("EN", "Apache Flex 4.8.0 Application");
+     * titles.put("EN", "Apache Royale 1.0.0 Application");
      * 
      * Map descriptions = new HashMap();
-     * descriptions.put("EN", "http://www.adobe.com/products/flex");
+     * descriptions.put("EN", "http://royale.apache.org");
      * 
      * setSWFMetaData(Configuration.LANGUAGE, "EN");
      * setSWFMetaData(Configuration.TITLE, titles);
@@ -3443,7 +3443,7 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
     @Override
     public void setRoyale(boolean value)
     {
-        args.put(FLEX, value ? Boolean.TRUE : Boolean.FALSE);
+        args.put(ROYALE, value ? Boolean.TRUE : Boolean.FALSE);
         
         isConfigurationDirty = true;        
     }
diff --git a/compiler/src/main/java/org/apache/royale/compiler/config/ICompilerSettingsConstants.java b/compiler/src/main/java/org/apache/royale/compiler/config/ICompilerSettingsConstants.java
index 6e8cdb4..71a39ec 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/config/ICompilerSettingsConstants.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/config/ICompilerSettingsConstants.java
@@ -40,7 +40,7 @@ public interface ICompilerSettingsConstants
     static final String LICENSES_LICENSE                                     = "--licenses.license";
     static final String INCLUDES                                             = "--includes";
     static final String INCLUDE_RESOURCE_BUNDLES                             = "--include-resource-bundles";
-    static final String FLEX                                                 = "--flex";
+    static final String ROYALE                                               = "--royale";
     static final String FRAMES_FRAME                                         = "--frames.frame";
     static final String LOAD_EXTERNS                                         = "--load-externs";
     static final String LOAD_CONFIG                                          = "--load-config";
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/config/ICompilerSettings.java b/compiler/src/main/java/org/apache/royale/compiler/internal/config/ICompilerSettings.java
index d1a8892..4bc7e75 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/config/ICompilerSettings.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/config/ICompilerSettings.java
@@ -700,10 +700,10 @@ public interface ICompilerSettings extends IWriteOnlyProjectSettings
      * 
      * <pre>
      * Map titles = new HashMap();
-     * titles.put("EN", "Apache Flex 4.8.0 Application");
+     * titles.put("EN", "Apache Royale 1.0.0 Application");
      * 
      * Map descriptions = new HashMap();
-     * descriptions.put("EN", "http://www.adobe.com/products/flex");
+     * descriptions.put("EN", "http://royale.apache.org");
      * 
      * setSWFMetadata(Configuration.LANGUAGE, "EN");
      * setSWFMetadata(Configuration.TITLE, titles);
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
index dc16fc9..933d9a6 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/RoyaleTarget.java
@@ -74,7 +74,7 @@ import com.google.common.collect.Iterables;
 import static org.apache.royale.compiler.mxml.IMXMLLanguageConstants.*;
 
 /**
- * Delegate class used by flex specific targets to generate flex specific code.
+ * Delegate class used by Royale specific targets to generate Royale specific code.
  * If we were writing this compiler in C++ this would be a mix-in class.
  */
 public abstract class RoyaleTarget
@@ -756,7 +756,7 @@ public abstract class RoyaleTarget
     public void addProductInfoToSWF(ISWF swf)
     {
         // Add product info to the swf.
-        ProductInfoTag productInfo = new ProductInfoTag(Product.FLEX,
+        ProductInfoTag productInfo = new ProductInfoTag(Product.ROYALE,
                 Edition.NONE,
                 (byte)Integer.parseInt(VersionInfo.FLEX_MAJOR_VERSION),
                 (byte)Integer.parseInt(VersionInfo.FLEX_MINOR_VERSION),
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
index f158379..698834a 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/SWCTarget.java
@@ -158,7 +158,7 @@ public class SWCTarget extends Target implements ISWCTarget
         if (royaleProject.isRoyale())
         {
             swcVersion.setRoyaleVersion(VersionInfo.getRoyaleVersion());
-            swcVersion.setFlexBuild(VersionInfo.getBuild());
+            swcVersion.setRoyaleBuild(VersionInfo.getBuild());
             swcVersion.setRoyaleMinSupportedVersion(targetSettings.getRoyaleMinimumSupportedVersion());
         }
         swcVersion.setCompilerName(VersionInfo.getCompilerName());
diff --git a/compiler/src/main/java/org/apache/royale/compiler/package.html b/compiler/src/main/java/org/apache/royale/compiler/package.html
index c07d291..5c0c95f 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/package.html
+++ b/compiler/src/main/java/org/apache/royale/compiler/package.html
@@ -23,7 +23,7 @@
 This package and its subpackages contain the Royale compiler.
 
 <p>
-The Royale compiler compiles Flex code consisting of <code>.mxml</code>
+The Royale compiler compiles Royale code consisting of <code>.mxml</code>
 <code>.as</code>, <code>.css</code>, <code>.fxg</code>, and
 <code>.properties</code> files into SWF and SWC files.
 <p>
diff --git a/compiler/src/main/java/org/apache/royale/compiler/problems/ClassesMappedToSameRemoteAliasProblem.java b/compiler/src/main/java/org/apache/royale/compiler/problems/ClassesMappedToSameRemoteAliasProblem.java
index d999d7c..055d319 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/problems/ClassesMappedToSameRemoteAliasProblem.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/problems/ClassesMappedToSameRemoteAliasProblem.java
@@ -22,7 +22,7 @@ package org.apache.royale.compiler.problems;
 public final class ClassesMappedToSameRemoteAliasProblem extends CompilerProblem
 {
     public static final String DESCRIPTION =
-        "A mapping for '${existingClassName}' to the remote class alias '${alias}' was found while processing class '${className}'. Flex now generates code to check if an alias has already been registered. When deserializing remote data an alias can only map to a single class.";
+        "A mapping for '${existingClassName}' to the remote class alias '${alias}' was found while processing class '${className}'. Royale now generates code to check if an alias has already been registered. When deserializing remote data an alias can only map to a single class.";
 
     public static final int errorCode = 1316;
     /**
diff --git a/compiler/src/main/java/org/apache/royale/compiler/problems/ConstructorInInterfaceProblem.java b/compiler/src/main/java/org/apache/royale/compiler/problems/ConstructorInInterfaceProblem.java
index ac49bc0..358a80b 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/problems/ConstructorInInterfaceProblem.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/problems/ConstructorInInterfaceProblem.java
@@ -24,7 +24,7 @@ import org.apache.royale.compiler.tree.as.IASNode;
 
 /**
  * Diagnostic emitted when an interface has a constructor.  This defaults
- * to a warning because Flex 4.X asc allows interfaces to have constructors.
+ * to a warning because Royale allows interfaces to have constructors.
  */
 @DefaultSeverity(CompilerProblemSeverity.WARNING)
 public final class ConstructorInInterfaceProblem extends SemanticWarningProblem
diff --git a/compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java b/compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java
index 6009558..8025412 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/problems/RoyaleOnlyConfigurationOptionNotSupported.java
@@ -22,7 +22,7 @@ package org.apache.royale.compiler.problems;
 import org.apache.royale.compiler.problems.annotations.DefaultSeverity;
 
 /**
- * Warn the user that using a "Flex only" configuration option is not fully
+ * Warn the user that using a "Royale only" configuration option is not fully
  * supported.
  */
 @DefaultSeverity(CompilerProblemSeverity.WARNING)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/projects/IRoyaleProject.java b/compiler/src/main/java/org/apache/royale/compiler/projects/IRoyaleProject.java
index 1b815ec..f8f4553 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/projects/IRoyaleProject.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/projects/IRoyaleProject.java
@@ -42,7 +42,7 @@ import org.apache.royale.compiler.targets.ITargetProgressMonitor;
 import org.apache.royale.compiler.targets.ITargetSettings;
 
 /**
- * Base interface for all project types that support all flex source file types
+ * Base interface for all project types that support all Royale source file types
  * ( mxml, fxg, css, etc ).
  */
 public interface IRoyaleProject extends IASProject, IXMLNameResolver, IWriteOnlyProjectSettings
@@ -130,7 +130,7 @@ public interface IRoyaleProject extends IASProject, IXMLNameResolver, IWriteOnly
 
     /**
      * The absolute path of the services-config.xml file. This file used
-     * to configure a Flex client to talk to a BlazeDS server.
+     * to configure a Royale client to talk to a BlazeDS server.
      * 
      * @return the absolute path of the services-config.xml file. Null
      * if the file has not been configured.
@@ -190,7 +190,7 @@ public interface IRoyaleProject extends IASProject, IXMLNameResolver, IWriteOnly
     List<String> getThemeNames();
     
     /**
-     * Option of enable or prevent various Flex compiler behaviors.
+     * Option of enable or prevent various Royale compiler behaviors.
      * This is currently used to enable/disable the generation of a root class for library swfs 
      * and generation of code for application swfs.
      */
@@ -205,7 +205,7 @@ public interface IRoyaleProject extends IASProject, IXMLNameResolver, IWriteOnly
      * <code>"spark.controls.Button"</code>
      * @return A collection of {@link XMLName}'s representing a MXML tags, such
      * as a <code>"Button"</code> tag in the namespace
-     * <code>"library://ns.adobe.com/flex/spark"</code>.
+     * <code>"library://ns.apache.org/royale/basic"</code>.
      */
     Collection<XMLName> getTagNamesForClass(String className);
     
diff --git a/compiler/src/main/java/org/apache/royale/compiler/projects/package.html b/compiler/src/main/java/org/apache/royale/compiler/projects/package.html
index a983967..69098e7 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/projects/package.html
+++ b/compiler/src/main/java/org/apache/royale/compiler/projects/package.html
@@ -141,9 +141,9 @@ There are four different kinds of projects, each with its own subinterface:
 
 <table border="1" cellspacing="0" cellpadding="3">
 	<tr>
-		<td><code>IFlexProjectProject</code></td>
-		<td>Can create a SWF target to build a Flex application or module,
-		or a SWC target to build a Flex library or resource bundle.
+		<td><code>IRoyaleProject</code></td>
+		<td>Can create a SWF target to build a Royale application or module,
+		or a SWC target to build a Royale library or resource bundle.
 		Supports <code>.mxml</code>, <code>.fxg</code>, <code>.css</code>,
 		and <code>.properties</code> files as well as <code>.as</code>
 		files.</td>
diff --git a/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetSettings.java b/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetSettings.java
index 57277e5..946e670 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetSettings.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetSettings.java
@@ -462,13 +462,13 @@ public interface ITargetSettings
     boolean useGPU();
 
     /**
-     * Used when creating a library. Specifies the minimum version of Flex that
-     * is written into the catalog of the created library. Flex uses the minimum
+     * Used when creating a library. Specifies the minimum version of Royale that
+     * is written into the catalog of the created library. Royale uses the minimum
      * version when compiling an application to filter out libraries that have a
      * minimum version that is greater than the specified compatibility
      * version.
      * 
-     * @return the minimum supported version of Flex.
+     * @return the minimum supported version of Royale.
      */
     String getRoyaleMinimumSupportedVersion();
 
diff --git a/compiler/src/main/java/org/apache/royale/swc/ISWCVersion.java b/compiler/src/main/java/org/apache/royale/swc/ISWCVersion.java
index b0d47a7..b597d21 100644
--- a/compiler/src/main/java/org/apache/royale/swc/ISWCVersion.java
+++ b/compiler/src/main/java/org/apache/royale/swc/ISWCVersion.java
@@ -20,8 +20,8 @@
 package org.apache.royale.swc;
 
 /**
- * Version information of a SWC file. Since Flex 3, Flex version is decoupled
- * with SWC library version.
+ * Version information of a SWC file. The Royale version is decoupled
+ * from SWC library version.
  */
 public interface ISWCVersion
 {
@@ -35,8 +35,8 @@ public interface ISWCVersion
     String getRoyaleVersion();
     void setRoyaleVersion(String value);
     
-    String getFlexBuild();
-    void setFlexBuild(String value);
+    String getRoyaleBuild();
+    void setRoyaleBuild(String value);
     
     String getRoyaleMinSupportedVersion();
     void setRoyaleMinSupportedVersion(String value);
@@ -44,7 +44,7 @@ public interface ISWCVersion
     /**
      * Get the royale min supported version as an integer. The bits 24-31 are the
      * royale major version number, bits 16-23 are the royale minor version number,
-     * and bits 0-15 are the flex revision number.
+     * and bits 0-15 are the royale revision number.
      * <p>
      * For example, "4.6.1" becomes (4<<24) | (6<<16) | 1.
      * @return the royale min supported version as an integer
diff --git a/compiler/src/main/java/org/apache/royale/swc/SWCVersion.java b/compiler/src/main/java/org/apache/royale/swc/SWCVersion.java
index a017e53..15bfa1c 100644
--- a/compiler/src/main/java/org/apache/royale/swc/SWCVersion.java
+++ b/compiler/src/main/java/org/apache/royale/swc/SWCVersion.java
@@ -73,7 +73,7 @@ public class SWCVersion implements ISWCVersion
      * @return the royaleBuild
      */
     @Override
-    public String getFlexBuild()
+    public String getRoyaleBuild()
     {
         return royaleBuild;
     }
@@ -82,7 +82,7 @@ public class SWCVersion implements ISWCVersion
      * @param royaleBuild the royaleBuild to set
      */
     @Override
-    public void setFlexBuild(String royaleBuild)
+    public void setRoyaleBuild(String royaleBuild)
     {
         this.royaleBuild = royaleBuild;
     }
diff --git a/compiler/src/main/java/org/apache/royale/swc/catalog/ICatalogXMLConstants.java b/compiler/src/main/java/org/apache/royale/swc/catalog/ICatalogXMLConstants.java
index cd6a922..9543c88 100644
--- a/compiler/src/main/java/org/apache/royale/swc/catalog/ICatalogXMLConstants.java
+++ b/compiler/src/main/java/org/apache/royale/swc/catalog/ICatalogXMLConstants.java
@@ -53,7 +53,7 @@ public interface ICatalogXMLConstants
     static final String TAG_FEATURES = "features";
     static final String TAG_FILE = "file";
     static final String TAG_FILES = "files";
-    static final String TAG_FLEX = "royale";
+    static final String TAG_ROYALE = "royale";
     static final String TAG_KEEP_AS3_METADATA = "keep-as3-metadata";
     static final String TAG_LIBRARIES = "libraries";
     static final String TAG_LIBRARY = "library";
diff --git a/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogReader.java b/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogReader.java
index 8ffa886..0a27ccd 100644
--- a/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogReader.java
+++ b/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogReader.java
@@ -166,7 +166,7 @@ public class StAXCatalogReader implements ICatalogXMLConstants
                     currentLibrary.addScript(currentScript);
                     timeStamps.put(name, mod);
                 }
-                else if (tagName.equals(TAG_FLEX))
+                else if (tagName.equals(TAG_ROYALE))
                 {
                     final String royaleVersion = reader.getAttributeValue(null, ATTR_VERSION);
                     final String minSupportedVersion = reader.getAttributeValue(null, ATTR_MINIMUM_SUPPORTED_VERSION);
@@ -174,7 +174,7 @@ public class StAXCatalogReader implements ICatalogXMLConstants
                     ISWCVersion swcVersion = swc.getVersion();
                     swcVersion.setRoyaleVersion(royaleVersion);
                     swcVersion.setRoyaleMinSupportedVersion(minSupportedVersion);
-                    swcVersion.setFlexBuild(royaleBuild);
+                    swcVersion.setRoyaleBuild(royaleBuild);
                 }
                 else if (tagName.equals(TAG_SWC))
                 {
diff --git a/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogWriter.java b/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogWriter.java
index 5d56842..47feacf 100644
--- a/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogWriter.java
+++ b/compiler/src/main/java/org/apache/royale/swc/catalog/StAXCatalogWriter.java
@@ -341,14 +341,14 @@ public class StAXCatalogWriter implements ICatalogXMLConstants
             xmlWriter.writeAttribute(ATTR_VERSION, swcVersion);
         }
 
-        // Flex version
+        // Royale version
         final String royaleVersion = version.getRoyaleVersion();
         if (royaleVersion != null)
         {
-            xmlWriter.writeEmptyElement(TAG_FLEX);
+            xmlWriter.writeEmptyElement(TAG_ROYALE);
             xmlWriter.writeAttribute(ATTR_VERSION, royaleVersion);
 
-            final String royaleBuild = version.getFlexBuild();
+            final String royaleBuild = version.getRoyaleBuild();
             if (royaleBuild != null)
                 xmlWriter.writeAttribute(ATTR_BUILD, royaleBuild);
 
diff --git a/compiler/src/main/java/org/apache/royale/swf/io/SWFDump.java b/compiler/src/main/java/org/apache/royale/swf/io/SWFDump.java
index 34ea9ef..951bcc1 100644
--- a/compiler/src/main/java/org/apache/royale/swf/io/SWFDump.java
+++ b/compiler/src/main/java/org/apache/royale/swf/io/SWFDump.java
@@ -2385,7 +2385,7 @@ public final class SWFDump
     public static void main(String[] args) throws IOException
     {
         // This message should not be localized.
-        System.err.println("Apache Flex SWF Dump Utility");
+        System.err.println("Apache Royale SWF Dump Utility");
         System.err.println(VersionInfo.buildMessage());
         System.err.println("");
 
diff --git a/compiler/src/main/java/org/apache/royale/swf/tags/ProductInfoTag.java b/compiler/src/main/java/org/apache/royale/swf/tags/ProductInfoTag.java
index 13e6c3f..0e0209b 100644
--- a/compiler/src/main/java/org/apache/royale/swf/tags/ProductInfoTag.java
+++ b/compiler/src/main/java/org/apache/royale/swf/tags/ProductInfoTag.java
@@ -140,7 +140,7 @@ public class ProductInfoTag extends Tag implements IManagedTag
         UNKNOWN(0, "unknown"),
         J2EE(1, "Macromedia Flex for J2EE"),
         DOTNET(2, "Macromedia Flex for .NET"),
-        FLEX(3, "Apache Flex");
+        ROYALE(3, "Apache Royale");
 
         public static Product fromCode(int code)
         {
diff --git a/compiler/src/main/resources/org/apache/royale/compiler/messages_en.properties b/compiler/src/main/resources/org/apache/royale/compiler/messages_en.properties
index 2bcba53..79b3191 100644
--- a/compiler/src/main/resources/org/apache/royale/compiler/messages_en.properties
+++ b/compiler/src/main/resources/org/apache/royale/compiler/messages_en.properties
@@ -70,7 +70,7 @@ compiler.external-library-path=list of SWC files or directories to compile again
 compiler.fonts.languages.language-range=a range to restrict the number of font glyphs embedded into the SWF
 compiler.fonts.managers=Compiler font manager classes, in policy resolution order
 compiler.fonts.local-fonts-snapshot=File containing system font data produced by flex2.tools.FontSnapshot.
-compiler.headless-server=a flag to set when Flex is running on a server without a display
+compiler.headless-server=a flag to set when Royale is running on a server without a display
 compiler.include-libraries=a list of libraries (SWCs) to completely include in the SWF
 compiler.incremental=enables incremental compilation
 compiler.keep-all-type-selectors=disables the pruning of unused CSS type selectors
@@ -85,7 +85,7 @@ compiler.namespaces.namespace=Specify a URI to associate with a manifest of comp
 compiler.optimize=Enable post-link SWF optimization
 compiler.preloader=Specifies the default value for the Application's preloader attribute. If not specified, the default preloader value is mx.preloaders.SparkDownloadProgressBar when -compatibility-version >= 4.0 and mx.preloaders.DownloadProgressBar when -compatibility-version < 4.0.
 compiler.profile=generate a movie that is suitable for performance and memory profiling
-compiler.services=path to Flex Data Services configuration file
+compiler.services=path to Royale Data Services configuration file
 compiler.omit-trace-statements=toggle whether trace statements are omitted
 compiler.report-invalid-styles-as-warnings=enables reporting of invalid styles as warnings
 compiler.report-missing-required-skin-parts-as-warnings=Use this option to generate a warning instead of an error when a missing required skin part is detected.
@@ -168,7 +168,7 @@ include-sources=a list of directories and source files to include in the output
 include-stylesheet=a list of named stylesheet resources to include in the output SWC
 file-specs=a list of source files to compile, the last file specified will be used as the target application
 frames.frame=A SWF frame label with a sequence of classnames that will be linked onto the frame.
-generate-frame-loader=toggle generation of an IFlexModuleFactory-derived loader class
+generate-frame-loader=toggle generation of an IRoyaleModuleFactory-derived loader class
 help=For information on command line syntax and descriptions of configuration variables, specify a search string, or one of the following special keywords:\n\
 \ \ \ syntax   - describe the general syntax of the command line\n\
 \ \ \ list     - show a list of all basic configuration variables\n\
@@ -281,7 +281,7 @@ tools-locale=specifies the locale used by the compiler when reporting errors and
 error-problems=specifies the fully qualified class names of compiler problems that should be reported as errors.
 warning-problems=specifies the fully qualified class names of compiler problems that should be reported as warnings.
 ignore-problems=specifies the fully qualified class names of compiler problems that should not be reported.
-FlexOnly=Flex only
+RoyaleOnly=Royale only
 
 #
 # ConfigurationException error messages
diff --git a/compiler/src/main/resources/org/apache/royale/compiler/messages_fr.properties b/compiler/src/main/resources/org/apache/royale/compiler/messages_fr.properties
index 031b019..93729f7 100644
--- a/compiler/src/main/resources/org/apache/royale/compiler/messages_fr.properties
+++ b/compiler/src/main/resources/org/apache/royale/compiler/messages_fr.properties
@@ -70,7 +70,7 @@ compiler.external-library-path=liste des fichiers ou r\u00e9pertoires SWC de r\u
 compiler.fonts.languages.language-range=plage limitant le nombre de glyphes de polices incorpor\u00e9s dans le fichier SWF
 compiler.fonts.managers=Classes du gestionnaire de polices du compilateur, par ordre de r\u00e9solution de strat\u00e9gie
 compiler.fonts.local-fonts-snapshot=Fichier contenant les donn\u00e9es de polices syst\u00e8me g\u00e9n\u00e9r\u00e9es par flex2.tools.FontSnapshot.
-compiler.headless-server=indicateur \u00e0 d\u00e9finir lorsque Flex est ex\u00e9cut\u00e9 sur un serveur sans \u00e9cran
+compiler.headless-server=indicateur \u00e0 d\u00e9finir lorsque Royale est ex\u00e9cut\u00e9 sur un serveur sans \u00e9cran
 compiler.include-libraries=liste des biblioth\u00e8ques (SWC) \u00e0 inclure enti\u00e8rement dans le fichier SWF
 compiler.incremental=active la compilation incr\u00e9mentielle
 compiler.keep-all-type-selectors=d\u00e9sactive le nettoyage des s\u00e9lecteurs de type CSS inutilis\u00e9s.
@@ -85,7 +85,7 @@ compiler.namespaces.namespace=Sp\u00e9cifiez un URI \u00e0 associer \u00e0 un fi
 compiler.optimize=Activer l'optimisation SWF apr\u00e8s liaison
 compiler.preloader=Sp\u00e9cifie la valeur par d\u00e9faut de l\u2019attribut preloader de l\u2019application. Si elle n\u2019est pas sp\u00e9cifi\u00e9e, la valeur de preloader par d\u00e9faut est mx.preloaders.SparkDownloadProgressBar lorsque la version de compatibilit\u00e9 est \u00e9gale ou ult\u00e9rieure \u00e0 4.0 et mx.preloaders.DownloadProgressBar lorsqu'elle est ant\u00e9rieure \u00e0 4.0.
 compiler.profile=g\u00e9n\u00e9rer un film adapt\u00e9 \u00e0 la cr\u00e9ation de profils de performances et de m\u00e9moires
-compiler.services=chemin d'acc\u00e8s au fichier de configuration de Flex Data Services
+compiler.services=chemin d'acc\u00e8s au fichier de configuration de Royale Data Services
 compiler.omit-trace-statements=basculer vers l'omission des instructions trace
 compiler.report-invalid-styles-as-warnings=active le rapport de styles non valides en tant qu'avertissements
 compiler.report-missing-required-skin-parts-as-warnings=Cette option permet de g\u00e9n\u00e9rer un avertissement au lieu d'une erreur lorsqu'un \u00e9l\u00e9ment d'habillage requis manquant est d\u00e9tect\u00e9.
@@ -156,7 +156,7 @@ dependency.dependency-report=a g\u00e9n\u00e9r\u00e9 un rapport au format XML d\
 digest.rsl-file=emplacement de l'attribut RSL permettant de calculer la valeur de pr\u00e9traitement de
 digest.swc-path=chemin du fichier ou r\u00e9pertoire SWC o\u00f9 la valeur sera mise \u00e0 jour.
 directory=g\u00e9n\u00e9rer la biblioth\u00e8que sous forme d'un r\u00e9pertoire ouvert au lieu d'un fichier SWC
-dump-config=\u00e9crire un fichier contenant toutes les valeurs de configuration d\u00e9finies existantes dans un format pouvant \u00eatre utilis\u00e9 comme fichier de configuration Flex
+dump-config=\u00e9crire un fichier contenant toutes les valeurs de configuration d\u00e9finies existantes dans un format pouvant \u00eatre utilis\u00e9 comme fichier de configuration Royale
 externs=liste des symboles \u00e0 omettre de la liaison lors de la construction d'un fichier SWF
 includes=liste des symboles vers laquelle un lien doit pointer lors de la construction d'un fichier SWF
 include-classes=liste de classes \u00e0 inclure dans le fichier SWC g\u00e9n\u00e9r\u00e9
@@ -168,7 +168,7 @@ include-sources=liste de r\u00e9pertoires et de fichiers sources \u00e0 inclure
 include-stylesheet=liste de ressources de feuilles de style nomm\u00e9es \u00e0 inclure dans le fichier SWC g\u00e9n\u00e9r\u00e9
 file-specs=liste des fichiers source \u00e0 compiler, le dernier fichier sp\u00e9cifi\u00e9 devant servir d'application cible
 frames.frame=Libell\u00e9 d'image SWF dot\u00e9 d'une s\u00e9quence de noms de classes qui seront li\u00e9s \u00e0 l'image.
-generate-frame-loader=activer/d\u00e9sactiver la g\u00e9n\u00e9ration d'une classe de chargeur IFlexModuleFactory-derived
+generate-frame-loader=activer/d\u00e9sactiver la g\u00e9n\u00e9ration d'une classe de chargeur IRoyaleModuleFactory-derived
 help=Pour obtenir des informations sur la syntaxe de ligne de commande et des descriptions de variables de configuration, sp\u00e9cifiez une cha\u00eene de recherche ou un des mots cl\u00e9s suivants  :\n   syntax   - permet de d\u00e9crire la syntaxe g\u00e9n\u00e9rale de la ligne de commande\n   list     - permet d'afficher une liste de toutes les variables de configuration de base\n   advanced - permet d'obtenir les variables de configuration avanc\u00e9es\n   aliases  - permet de tri [...]
 lazy-init=Activer/D\u00e9sactiver l'initialisation non stricte de code en octets ABC
 link-report=G\u00e9n\u00e8re un rapport au format XML de toutes les d\u00e9finitions li\u00e9es dans l'application.
@@ -233,7 +233,7 @@ tools-locale=sp\u00e9cifie les param\u00e8tres r\u00e9gionaux utilis\u00e9s par
 error-problems=sp\u00e9cifie les noms de classes complets des probl\u00e8mes du compilateur \u00e0 signaler comme erreurs.
 warning-problems=sp\u00e9cifie les noms de classes complets des probl\u00e8mes du compilateur \u00e0 signaler comme avertissements.
 ignore-problems=sp\u00e9cifie les noms de classes complets des probl\u00e8mes du compilateur \u00e0 ne pas signaler.
-FlexOnly=Flex uniquement
+RoyaleOnly=Royale uniquement
 
 #
 # ConfigurationException error messages
@@ -334,7 +334,7 @@ CanNotInsertSemicolonProblem=Un point-virgule ou une nouvelle ligne est attendu
 CannotResolveConfigExpressionProblem=Impossible de r\u00e9soudre la constante de configuration\u00a0: "${configName}"
 CannotResolveProjectLevelConfigExpressionProblem=La constante de config n\u2019a pas \u00e9t\u00e9 correctement sp\u00e9cifi\u00e9e dans la ligne du projet/de commande\u00a0: ${configName}.
 CircularTypeReferenceProblem=Une r\u00e9f\u00e9rence de type circulaire a \u00e9t\u00e9 d\u00e9tect\u00e9e dans ${className}
-ClassesMappedToSameRemoteAliasProblem=Un mappage de "${existingClassName}" sur l\u2019alias de classe distante "${alias}" a \u00e9t\u00e9 d\u00e9tect\u00e9 lors du traitement de la classe "${className}". A pr\u00e9sent, Flex g\u00e9n\u00e8re un code pour v\u00e9rifier si un alias a d\u00e9j\u00e0 \u00e9t\u00e9 enregistr\u00e9. Lors de la d\u00e9s\u00e9rialisation de donn\u00e9es distantes, un alias peut uniquement \u00eatre mapp\u00e9 sur une seule classe.
+ClassesMappedToSameRemoteAliasProblem=Un mappage de "${existingClassName}" sur l\u2019alias de classe distante "${alias}" a \u00e9t\u00e9 d\u00e9tect\u00e9 lors du traitement de la classe "${className}". A pr\u00e9sent, Royale g\u00e9n\u00e8re un code pour v\u00e9rifier si un alias a d\u00e9j\u00e0 \u00e9t\u00e9 enregistr\u00e9. Lors de la d\u00e9s\u00e9rialisation de donn\u00e9es distantes, un alias peut uniquement \u00eatre mapp\u00e9 sur une seule classe.
 CodegenInternalProblem=${diagnostic}
 ComparisonBetweenUnrelatedTypesProblem=Comparaison entre une valeur de type ${firstType} et un type ${secondType} non associ\u00e9.
 CompiledAsAComponentProblem=${className} est un module ou une application directement r\u00e9f\u00e9renc\u00e9(e). Par cons\u00e9quent, ${className} et toutes ses d\u00e9pendances sont li\u00e9es \u00e0 la ${mainDefinition}. L\u2019utilisation d\u2019une interface est recommand\u00e9e pour \u00e9viter ce probl\u00e8me.
@@ -421,7 +421,7 @@ FileIOProblem=Erreur de fichier\u00a0: ${msg}
 FileNotFoundProblem=Fichier introuvable\u00a0: ${file}
 FileWriteProblem=Impossible d\u2019\u00e9crire le fichier\u00a0: ${msg}
 FinalOutsideClassProblem=L\u2019attribut ${FINAL} ne peut \u00eatre utilis\u00e9 que dans une m\u00e9thode d\u00e9finie dans une ${CLASS}.
-FlexOnlyConfigurationOptionNotSupported=${option} n\u2019est pas int\u00e9gralement pris en charge.
+RoyaleOnlyConfigurationOptionNotSupported=${option} n\u2019est pas int\u00e9gralement pris en charge.
 FontEmbeddingNotSupported=L\u2019incorporation directe de polices n\u2019est pas prise en charge. Utilisez l\u2019utilitaire ${FONTSWF} et incorporez le ${SWF} obtenu.
 ForwardReferenceToBaseClassProblem=R\u00e9f\u00e9rence future \u00e0 la classe de base ${baseClassName}.
 FunctionNotMarkedOverrideProblem=Remplacement d\u2019une ${FUNCTION} non marqu\u00e9e pour ${OVERRIDE}
diff --git a/compiler/src/main/resources/org/apache/royale/compiler/messages_ja.properties b/compiler/src/main/resources/org/apache/royale/compiler/messages_ja.properties
index 260c413..5ef95a5 100644
--- a/compiler/src/main/resources/org/apache/royale/compiler/messages_ja.properties
+++ b/compiler/src/main/resources/org/apache/royale/compiler/messages_ja.properties
@@ -70,7 +70,7 @@ compiler.external-library-path=\u30b3\u30f3\u30d1\u30a4\u30eb\u5bfe\u8c61\u3067\
 compiler.fonts.languages.language-range=SWF \u306b\u57cb\u3081\u8fbc\u307e\u308c\u308b\u30d5\u30a9\u30f3\u30c8\u30b0\u30ea\u30d5\u306e\u6570\u3092\u5236\u9650\u3059\u308b\u7bc4\u56f2
 compiler.fonts.managers=\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u30d5\u30a9\u30f3\u30c8\u30de\u30cd\u30fc\u30b8\u30e3\u30fc\u30af\u30e9\u30b9\u3001\u30dd\u30ea\u30b7\u30fc\u306e\u89e3\u6c7a\u9806
 compiler.fonts.local-fonts-snapshot=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u306f\u3001flex2.tools.FontSnapshot \u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u305f\u30b7\u30b9\u30c6\u30e0\u30d5\u30a9\u30f3\u30c8\u30c7\u30fc\u30bf\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002
-compiler.headless-server=Flex \u304c\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4\u306a\u3057\u306e\u30b5\u30fc\u30d0\u30fc\u3067\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306b\u8a2d\u5b9a\u3055\u308c\u308b\u30d5\u30e9\u30b0
+compiler.headless-server=Royale \u304c\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4\u306a\u3057\u306e\u30b5\u30fc\u30d0\u30fc\u3067\u5b9f\u884c\u3055\u308c\u3066\u3044\u308b\u5834\u5408\u306b\u8a2d\u5b9a\u3055\u308c\u308b\u30d5\u30e9\u30b0
 compiler.include-libraries=SWF \u306b\u5b8c\u5168\u306b\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3055\u308c\u308b\u30e9\u30a4\u30d6\u30e9\u30ea (SWC) \u306e\u4e00\u89a7
 compiler.incremental=\u30a4\u30f3\u30af\u30ea\u30e1\u30f3\u30bf\u30eb\u30b3\u30f3\u30d1\u30a4\u30eb\u3092\u6709\u52b9\u306b\u3057\u307e\u3059
 compiler.keep-all-type-selectors=\u4f7f\u7528\u3055\u308c\u3066\u3044\u306a\u3044 CSS \u30bf\u30a4\u30d7\u30bb\u30ec\u30af\u30bf\u30fc\u306e\u524a\u9664\u3092\u7121\u52b9\u306b\u3057\u307e\u3059
@@ -85,7 +85,7 @@ compiler.namespaces.namespace=MXML \u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u3057\u3
 compiler.optimize=\u30ea\u30f3\u30af\u5f8c\u306e SWF \u306e\u6700\u9069\u5316\u3092\u6709\u52b9\u306b\u3057\u307e\u3059
 compiler.preloader=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30d7\u30ea\u30ed\u30fc\u30c0\u30fc\u5c5e\u6027\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002\u6307\u5b9a\u3057\u306a\u3044\u5834\u5408\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30d7\u30ea\u30ed\u30fc\u30c0\u30fc\u5024\u306f\u3001-compatibility-version >= 4.0 \u306e\u3068\u304d\u306b mx.preloaders.SparkDownloadProgressBar \u3068\u306a\u308a\u3001-compatibility-version < 4.0 \u [...]
 compiler.profile=\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3084\u30e1\u30e2\u30ea\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306b\u9069\u3057\u305f\u30e0\u30fc\u30d3\u30fc\u3092\u751f\u6210\u3057\u307e\u3059
-compiler.services=Flex \u30c7\u30fc\u30bf\u30b5\u30fc\u30d3\u30b9\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
+compiler.services=Royale \u30c7\u30fc\u30bf\u30b5\u30fc\u30d3\u30b9\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
 compiler.omit-trace-statements=trace \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u3092\u7701\u7565\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u5207\u308a\u66ff\u3048\u307e\u3059
 compiler.report-invalid-styles-as-warnings=\u7121\u52b9\u306a\u30b9\u30bf\u30a4\u30eb\u3092\u8b66\u544a\u3068\u3057\u3066\u5831\u544a\u3057\u307e\u3059
 compiler.report-missing-required-skin-parts-as-warnings=\u5fc5\u8981\u306a\u30b9\u30ad\u30f3\u30d1\u30fc\u30c4\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u5834\u5408\u306b\u30a8\u30e9\u30fc\u3067\u306f\u306a\u304f\u8b66\u544a\u3092\u751f\u6210\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
@@ -168,7 +168,7 @@ include-sources=\u51fa\u529b SWC \u306b\u542b\u3081\u308b\u30c7\u30a3\u30ec\u30a
 include-stylesheet=\u51fa\u529b SWC \u306b\u542b\u3081\u308b\u540d\u524d\u4ed8\u304d\u30b9\u30bf\u30a4\u30eb\u30b7\u30fc\u30c8\u30ea\u30bd\u30fc\u30b9\u306e\u4e00\u89a7
 file-specs=\u30b3\u30f3\u30d1\u30a4\u30eb\u5bfe\u8c61\u306e\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u306e\u4e00\u89a7\u3067\u3001\u6700\u5f8c\u306b\u6307\u5b9a\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u30bf\u30fc\u30b2\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3068\u3057\u3066\u4f7f\u7528\u3055\u308c\u307e\u3059
 frames.frame=\u30d5\u30ec\u30fc\u30e0\u306b\u30ea\u30f3\u30af\u3055\u308c\u308b\u4e00\u9023\u306e\u30af\u30e9\u30b9\u540d\u3092\u542b\u3080 SWF \u30d5\u30ec\u30fc\u30e0\u30e9\u30d9\u30eb\u3002
-generate-frame-loader=IFlexModuleFactory \u304b\u3089\u6d3e\u751f\u3057\u305f\u30ed\u30fc\u30c0\u30fc\u30af\u30e9\u30b9\u3092\u751f\u6210\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u5207\u308a\u66ff\u3048\u307e\u3059
+generate-frame-loader=IRoyaleModuleFactory \u304b\u3089\u6d3e\u751f\u3057\u305f\u30ed\u30fc\u30c0\u30fc\u30af\u30e9\u30b9\u3092\u751f\u6210\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u5207\u308a\u66ff\u3048\u307e\u3059
 help=\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u30b7\u30f3\u30bf\u30c3\u30af\u30b9\u306e\u60c5\u5831\u304a\u3088\u3073\u8a2d\u5b9a\u5909\u6570\u306e\u8aac\u660e\u306b\u3064\u3044\u3066\u306f\u3001\u691c\u7d22\u30b9\u30c8\u30ea\u30f3\u30b0\u307e\u305f\u306f\u6b21\u306e\u3044\u305a\u308c\u304b\u306e\u7279\u5225\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u6307\u5b9a\u3057\u307e\u3059 :\n   syntax   - \u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u306e\u4e00\u822c\u7684\u306a\u30b7\u30f3\u30bf\ [...]
 lazy-init=ABC \u30d0\u30a4\u30c8\u30b3\u30fc\u30c9\u306e\u9045\u5ef6\u521d\u671f\u5316\u3092\u6709\u52b9 / \u7121\u52b9\u306b\u3057\u307e\u3059\u3002
 link-report=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u30ea\u30f3\u30af\u3055\u308c\u308b\u3059\u3079\u3066\u306e\u5b9a\u7fa9\u306b\u95a2\u3059\u308b XML \u5f62\u5f0f\u306e\u30ec\u30dd\u30fc\u30c8\u3092\u51fa\u529b\u3057\u307e\u3059\u3002
@@ -233,7 +233,7 @@ tools-locale=\u30a8\u30e9\u30fc\u3068\u8b66\u544a\u3092\u901a\u77e5\u3059\u308b\
 error-problems=\u30a8\u30e9\u30fc\u3068\u3057\u3066\u5831\u544a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u554f\u984c\u306b\u3064\u3044\u3066\u3001\u5b8c\u5168\u4fee\u98fe\u3055\u308c\u305f\u30af\u30e9\u30b9\u540d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 warning-problems=\u8b66\u544a\u3068\u3057\u3066\u5831\u544a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u554f\u984c\u306b\u3064\u3044\u3066\u3001\u5b8c\u5168\u4fee\u98fe\u3055\u308c\u305f\u30af\u30e9\u30b9\u540d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
 ignore-problems=\u5831\u544a\u3059\u308b\u5fc5\u8981\u304c\u306a\u3044\u30b3\u30f3\u30d1\u30a4\u30e9\u30fc\u306e\u554f\u984c\u306b\u3064\u3044\u3066\u3001\u5b8c\u5168\u4fee\u98fe\u3055\u308c\u305f\u30af\u30e9\u30b9\u540d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
-FlexOnly=Flex \u306e\u307f
+RoyaleOnly=Royale \u306e\u307f
 
 #
 # ConfigurationException error messages
@@ -334,7 +334,7 @@ CanNotInsertSemicolonProblem=\u3053\u3053\u3067\u306f\u300c\u30bb\u30df\u30b3\u3
 CannotResolveConfigExpressionProblem=\u6761\u4ef6\u4ed8\u304d\u30b3\u30f3\u30d1\u30a4\u30eb\u5b9a\u6570\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093 : \u300c${configName}\u300d
 CannotResolveProjectLevelConfigExpressionProblem=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u307e\u305f\u306f\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3067\u6761\u4ef6\u4ed8\u304d\u30b3\u30f3\u30d1\u30a4\u30eb\u5b9a\u6570\u304c\u6b63\u3057\u304f\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 : \u300c${configName}\u300d
 CircularTypeReferenceProblem=${className} \u3067\u5faa\u74b0\u578b\u53c2\u7167\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f
-ClassesMappedToSameRemoteAliasProblem=\u30af\u30e9\u30b9\u300c${className}\u300d\u306e\u51e6\u7406\u4e2d\u306b\u3001\u30ea\u30e2\u30fc\u30c8\u30af\u30e9\u30b9\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u300c${alias}\u300d\u3078\u306e\u300c${existingClassName}\u300d\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002Flex \u3067\u3001\u30a8\u30a4\u30ea\u30a2\u30b9\u304c\u65e2\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u78ba\ [...]
+ClassesMappedToSameRemoteAliasProblem=\u30af\u30e9\u30b9\u300c${className}\u300d\u306e\u51e6\u7406\u4e2d\u306b\u3001\u30ea\u30e2\u30fc\u30c8\u30af\u30e9\u30b9\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u300c${alias}\u300d\u3078\u306e\u300c${existingClassName}\u300d\u306e\u30de\u30c3\u30d4\u30f3\u30b0\u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002Royale \u3067\u3001\u30a8\u30a4\u30ea\u30a2\u30b9\u304c\u65e2\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u78b [...]
 CodegenInternalProblem=${diagnostic}
 ComparisonBetweenUnrelatedTypesProblem=\u578b ${firstType} \u306e\u5024\u3068\u3001\u95a2\u9023\u3057\u306a\u3044\u578b ${secondType} \u3068\u306e\u6bd4\u8f03\u3002
 CompiledAsAComponentProblem=${className} \u306f\u3001\u76f4\u63a5\u53c2\u7167\u3055\u308c\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u307e\u305f\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3067\u3059\u3002\u305d\u306e\u305f\u3081\u3001${className} \u304a\u3088\u3073\u305d\u306e\u3059\u3079\u3066\u306e\u4f9d\u5b58\u95a2\u4fc2\u306f ${mainDefinition} \u306b\u30ea\u30f3\u30af\u3055\u308c\u307e\u3059\u3002\u3053\u306e\u72b6\u6cc1\u3092\u56de\u907f\u3059\u308b\u306b\u306f\u3001\u30a4\u30f [...]
@@ -421,7 +421,7 @@ FileIOProblem=\u30d5\u30a1\u30a4\u30eb\u30a8\u30e9\u30fc - ${msg}
 FileNotFoundProblem=\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 : ${file}
 FileWriteProblem=\u30d5\u30a1\u30a4\u30eb\u306b\u66f8\u304d\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093 : ${msg}
 FinalOutsideClassProblem=\u5c5e\u6027 ${FINAL} \u306f ${CLASS} \u5185\u3067\u5b9a\u7fa9\u3055\u308c\u305f\u30e1\u30bd\u30c3\u30c9\u3067\u306e\u307f\u4f7f\u7528\u3067\u304d\u307e\u3059\u3002
-FlexOnlyConfigurationOptionNotSupported=\u300c${option}\u300d\u306f\u5b8c\u5168\u306b\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+RoyaleOnlyConfigurationOptionNotSupported=\u300c${option}\u300d\u306f\u5b8c\u5168\u306b\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 FontEmbeddingNotSupported=\u30d5\u30a9\u30f3\u30c8\u306e\u76f4\u63a5\u57cb\u3081\u8fbc\u307f\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002${FONTSWF} \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3092\u4f7f\u7528\u3057\u3066\u3001\u751f\u6210\u3055\u308c\u308b ${SWF} \u3092\u57cb\u3081\u8fbc\u3093\u3067\u304f\u3060\u3055\u3044\u3002
 ForwardReferenceToBaseClassProblem=\u53c2\u7167\u3092\u57fa\u672c\u30af\u30e9\u30b9 ${baseClassName} \u306b\u9001\u308a\u307e\u3059\u3002
 FunctionNotMarkedOverrideProblem=${OVERRIDE} \u306b\u5bfe\u5fdc\u3057\u3066\u3044\u306a\u3044 ${FUNCTION} \u3092\u30aa\u30fc\u30d0\u30fc\u30e9\u30a4\u30c9\u3057\u3066\u3044\u307e\u3059
diff --git a/compiler/src/main/resources/org/apache/royale/compiler/messages_zh_CN.properties b/compiler/src/main/resources/org/apache/royale/compiler/messages_zh_CN.properties
index c8e71dc..4509bf5 100644
--- a/compiler/src/main/resources/org/apache/royale/compiler/messages_zh_CN.properties
+++ b/compiler/src/main/resources/org/apache/royale/compiler/messages_zh_CN.properties
@@ -70,7 +70,7 @@ compiler.external-library-path=\u8981\u8fdb\u884c\u7f16\u8bd1\u4f46\u5ffd\u7565\
 compiler.fonts.languages.language-range=\u9650\u5236\u5d4c\u5165 SWF \u4e2d\u7684\u5b57\u4f53\u5b57\u5f62\u6570\u7684\u8303\u56f4
 compiler.fonts.managers=\u7f16\u8bd1\u5668\u5b57\u4f53\u7ba1\u7406\u5668\u7c7b\uff0c\u4ee5\u7b56\u7565\u89e3\u6790\u6392\u5e8f
 compiler.fonts.local-fonts-snapshot=\u5305\u542b\u7531 flex2.tools.FontSnapshot \u751f\u6210\u7684\u7cfb\u7edf\u5b57\u4f53\u6570\u636e\u7684\u6587\u4ef6\u3002
-compiler.headless-server=\u5f53 Flex \u5728\u6ca1\u6709\u663e\u793a\u5668\u7684\u670d\u52a1\u5668\u4e0a\u8fd0\u884c\u65f6\u8981\u8bbe\u7f6e\u7684\u6807\u5fd7
+compiler.headless-server=\u5f53 Royale \u5728\u6ca1\u6709\u663e\u793a\u5668\u7684\u670d\u52a1\u5668\u4e0a\u8fd0\u884c\u65f6\u8981\u8bbe\u7f6e\u7684\u6807\u5fd7
 compiler.include-libraries=\u8981\u5b8c\u5168\u5305\u62ec\u5728 SWF \u4e2d\u7684\u5e93 (SWC) \u5217\u8868
 compiler.incremental=\u542f\u7528\u589e\u91cf\u7f16\u8bd1
 compiler.keep-all-type-selectors=\u505c\u7528\u5220\u9664\u672a\u4f7f\u7528\u7684 CSS \u7c7b\u578b\u9009\u62e9\u5668
@@ -85,7 +85,7 @@ compiler.namespaces.namespace=\u6307\u5b9a\u8981\u4e0e\u7528\u4f5c MXML \u5143\u
 compiler.optimize=\u542f\u7528\u94fe\u63a5\u540e SWF \u4f18\u5316
 compiler.preloader=\u6307\u5b9a\u5e94\u7528\u7a0b\u5e8f\u9884\u52a0\u8f7d\u5668\u5c5e\u6027\u7684\u9ed8\u8ba4\u503c\u3002\u5982\u679c\u672a\u6307\u5b9a\uff0c\u5219\u9ed8\u8ba4\u7684\u9884\u52a0\u8f7d\u5668\u503c\u4e3a mx.preloaders.SparkDownloadProgressBar\uff08-compatibility-version >= 4.0 \u65f6\uff09\u548c mx.preloaders.DownloadProgressBar\uff08-compatibility-version < 4.0 \u65f6\uff09\u3002
 compiler.profile=\u751f\u6210\u9002\u4e8e\u8fdb\u884c\u6027\u80fd\u548c\u5185\u5b58\u5206\u6790\u7684\u7535\u5f71
-compiler.services=\u5230 Flex Data Services \u914d\u7f6e\u6587\u4ef6\u7684\u8def\u5f84
+compiler.services=\u5230 Royale Data Services \u914d\u7f6e\u6587\u4ef6\u7684\u8def\u5f84
 compiler.omit-trace-statements=\u5207\u6362\u662f\u5426\u5ffd\u7565 trace \u8bed\u53e5
 compiler.report-invalid-styles-as-warnings=\u5c06\u65e0\u6548\u6837\u5f0f\u62a5\u544a\u4e3a\u8b66\u544a
 compiler.report-missing-required-skin-parts-as-warnings=\u4f7f\u7528\u6b64\u9009\u9879\u53ef\u5728\u68c0\u6d4b\u5230\u7f3a\u5c11\u6240\u9700\u7684\u5916\u89c2\u90e8\u4ef6\u65f6\u751f\u6210\u8b66\u544a\uff0c\u800c\u4e0d\u662f\u751f\u6210\u9519\u8bef\u3002
@@ -168,7 +168,7 @@ include-sources=\u8981\u5305\u542b\u5728\u8f93\u51fa SWC \u4e2d\u7684\u76ee\u5f5
 include-stylesheet=\u8981\u5305\u542b\u5728\u8f93\u51fa SWC \u4e2d\u7684\u547d\u540d\u6837\u5f0f\u8868\u8d44\u6e90\u5217\u8868
 file-specs=\u8981\u7f16\u8bd1\u7684\u6e90\u6587\u4ef6\u5217\u8868\uff0c\u6307\u5b9a\u7684\u6700\u540e\u4e00\u4e2a\u6587\u4ef6\u5c06\u7528\u4f5c\u76ee\u6807\u5e94\u7528\u7a0b\u5e8f
 frames.frame=\u5e26\u6709\u5c06\u88ab\u94fe\u63a5\u5230\u5e27\u4e0a\u7684\u7c7b\u540d\u79f0\u5e8f\u5217\u7684 SWF \u5e27\u6807\u7b7e\u3002
-generate-frame-loader=\u5207\u6362\u751f\u6210/\u4e0d\u751f\u6210\u4ece IFlexModuleFactory \u6d3e\u751f\u7684\u52a0\u8f7d\u5668\u7c7b
+generate-frame-loader=\u5207\u6362\u751f\u6210/\u4e0d\u751f\u6210\u4ece IRoyaleModuleFactory \u6d3e\u751f\u7684\u52a0\u8f7d\u5668\u7c7b
 help=\u8981\u83b7\u53d6\u547d\u4ee4\u884c\u8bed\u6cd5\u7684\u4fe1\u606f\u548c\u914d\u7f6e\u53d8\u91cf\u7684\u8bf4\u660e\uff0c\u8bf7\u6307\u5b9a\u4e00\u4e2a\u641c\u7d22\u5b57\u7b26\u4e32\u6216\u4ee5\u4e0b\u7279\u6b8a\u5173\u952e\u5b57\u4e4b\u4e00: \n   syntax - \u8bf4\u660e\u547d\u4ee4\u884c\u7684\u4e00\u822c\u8bed\u6cd5\n   list - \u663e\u793a\u6240\u6709\u57fa\u672c\u914d\u7f6e\u53d8\u91cf\u7684\u5217\u8868\n   advanced - \u8fd8\u5339\u914d\u9ad8\u7ea7\u914d\u7f6e\u53d8\u91cf\n   aliase [...]
 lazy-init=\u542f\u7528/\u505c\u7528 ABC \u5b57\u8282\u7801\u60f0\u6027\u521d\u59cb\u5316
 link-report=\u8f93\u51fa\u6240\u6709\u94fe\u63a5\u5230\u5e94\u7528\u7a0b\u5e8f\u7684\u5b9a\u4e49\u7684 XML \u683c\u5f0f\u62a5\u544a\u3002
@@ -233,7 +233,7 @@ tools-locale=\u6307\u5b9a\u7f16\u8bd1\u5668\u5728\u62a5\u544a\u9519\u8bef\u548c\
 error-problems=\u6307\u5b9a\u5e94\u5f53\u62a5\u544a\u4e3a\u9519\u8bef\u7684\u7f16\u8bd1\u5668\u95ee\u9898\u7684\u5b8c\u5168\u9650\u5b9a\u7c7b\u540d\u79f0\u3002
 warning-problems=\u6307\u5b9a\u5e94\u5f53\u62a5\u544a\u4e3a\u8b66\u544a\u7684\u7f16\u8bd1\u5668\u95ee\u9898\u7684\u5b8c\u5168\u9650\u5b9a\u7c7b\u540d\u79f0\u3002
 ignore-problems=\u6307\u5b9a\u4e0d\u5e94\u5f53\u62a5\u544a\u7684\u7f16\u8bd1\u5668\u95ee\u9898\u7684\u5b8c\u5168\u9650\u5b9a\u7c7b\u540d\u79f0\u3002
-FlexOnly=\u4ec5\u9650 Flex
+RoyaleOnly=\u4ec5\u9650 Royale
 
 #
 # ConfigurationException error messages
@@ -334,7 +334,7 @@ CanNotInsertSemicolonProblem=\u6b64\u5904\u5e94\u8be5\u6709\u4e00\u4e2a\u201c\u5
 CannotResolveConfigExpressionProblem=\u65e0\u6cd5\u89e3\u6790\u914d\u7f6e\u5e38\u91cf:\u201c${configName}\u201d
 CannotResolveProjectLevelConfigExpressionProblem=\u672a\u5728\u9879\u76ee/\u547d\u4ee4\u884c\u4e2d\u6b63\u786e\u6307\u5b9a\u914d\u7f6e\u5e38\u6570:\u201c${configName}\u201d
 CircularTypeReferenceProblem=\u5728 ${className} \u4e2d\u68c0\u6d4b\u5230\u5faa\u73af\u7c7b\u578b\u5f15\u7528
-ClassesMappedToSameRemoteAliasProblem=\u5728\u5904\u7406\u7c7b\u201c${className}\u201d\u65f6\u53d1\u73b0\u201c${existingClassName}\u201d\u5230\u8fdc\u7a0b\u7c7b\u522b\u540d\u201c${alias}\u201d\u7684\u6620\u5c04\u3002Flex \u73b0\u5728\u751f\u6210\u4ee3\u7801\u6765\u68c0\u67e5\u662f\u5426\u5df2\u6ce8\u518c\u4e86\u522b\u540d\u3002\u5728\u5bf9\u8fdc\u7a0b\u6570\u636e\u8fdb\u884c\u53cd\u5e8f\u5217\u5316\u65f6\uff0c\u522b\u540d\u53ea\u80fd\u6620\u5c04\u5230\u5355\u4e2a\u7c7b\u3002
+ClassesMappedToSameRemoteAliasProblem=\u5728\u5904\u7406\u7c7b\u201c${className}\u201d\u65f6\u53d1\u73b0\u201c${existingClassName}\u201d\u5230\u8fdc\u7a0b\u7c7b\u522b\u540d\u201c${alias}\u201d\u7684\u6620\u5c04\u3002Royale \u73b0\u5728\u751f\u6210\u4ee3\u7801\u6765\u68c0\u67e5\u662f\u5426\u5df2\u6ce8\u518c\u4e86\u522b\u540d\u3002\u5728\u5bf9\u8fdc\u7a0b\u6570\u636e\u8fdb\u884c\u53cd\u5e8f\u5217\u5316\u65f6\uff0c\u522b\u540d\u53ea\u80fd\u6620\u5c04\u5230\u5355\u4e2a\u7c7b\u3002
 CodegenInternalProblem=${diagnostic}
 ComparisonBetweenUnrelatedTypesProblem=\u5c06 ${firstType} \u7c7b\u578b\u7684\u67d0\u4e2a\u503c\u4e0e\u4e00\u4e2a\u4e0d\u76f8\u5173\u7c7b\u578b ${secondType} \u8fdb\u884c\u6bd4\u8f83\u3002
 CompiledAsAComponentProblem=${className} \u662f\u4e00\u4e2a\u76f4\u63a5\u5f15\u7528\u7684\u6a21\u5757\u6216\u5e94\u7528\u7a0b\u5e8f\u3002\u8fd9\u5c06\u5bfc\u81f4\u4f7f\u7528 ${mainDefinition} \u5c06 ${className} \u53ca\u5176\u6240\u6709\u4f9d\u8d56\u9879\u94fe\u63a5\u5230\u4e00\u8d77\u3002\u4e3a\u907f\u514d\u6b64\u95ee\u9898\uff0c\u5efa\u8bae\u4f7f\u7528\u63a5\u53e3\u3002
@@ -421,7 +421,7 @@ FileIOProblem=\u6587\u4ef6\u9519\u8bef - ${msg}
 FileNotFoundProblem=\u627e\u4e0d\u5230\u6587\u4ef6: ${file}
 FileWriteProblem=\u65e0\u6cd5\u5199\u5165\u6587\u4ef6: ${msg}
 FinalOutsideClassProblem=\u5c5e\u6027 ${FINAL} \u53ea\u80fd\u5728 ${CLASS} \u4e2d\u5b9a\u4e49\u7684\u65b9\u6cd5\u4e0a\u4f7f\u7528\u3002
-FlexOnlyConfigurationOptionNotSupported=\u4e0d\u5b8c\u5168\u652f\u6301\u201c${option}\u201d\u3002
+RoyaleOnlyConfigurationOptionNotSupported=\u4e0d\u5b8c\u5168\u652f\u6301\u201c${option}\u201d\u3002
 FontEmbeddingNotSupported=\u4e0d\u652f\u6301\u76f4\u63a5\u5d4c\u5165\u5b57\u4f53\u3002\u8bf7\u4f7f\u7528 ${FONTSWF} \u5b9e\u7528\u7a0b\u5e8f\u5e76\u5d4c\u5165\u7ed3\u679c ${SWF}\u3002
 ForwardReferenceToBaseClassProblem=\u8f6c\u53d1\u5bf9\u57fa\u7c7b ${baseClassName} \u7684\u5f15\u7528\u3002
 FunctionNotMarkedOverrideProblem=\u8986\u76d6\u6ca1\u6709\u4e3a ${OVERRIDE} \u6807\u8bb0\u7684 ${FUNCTION}
diff --git a/compiler/src/test/build.xml b/compiler/src/test/build.xml
index cc1176c..f21943d 100644
--- a/compiler/src/test/build.xml
+++ b/compiler/src/test/build.xml
@@ -31,8 +31,8 @@
 	<property name="test.timeout" value="3000000" />
 	<property name="maxmem" value="512" />
 	
-	<condition property="sdk" value="${FLEX_HOME}" else="${env.FLEX_HOME}">
-	    <isset property="FLEX_HOME" />
+	<condition property="sdk" value="${ROYALE_HOME}" else="${env.ROYALE_HOME}">
+	    <isset property="ROYALE_HOME" />
 	</condition>
 	
 	<condition property="fpdbg" value="${FLASHPLAYER_DEBUGGER}" else="${env.FLASHPLAYER_DEBUGGER}">
@@ -48,7 +48,7 @@
     <property name="royale" value="${compiler}"/>
 
     <path id="lib.path">
-        <fileset dir="${royale}/lib" includes="royale-flexTasks.jar"/>
+        <fileset dir="${royale}/lib" includes="compiler-royaleTasks.jar"/>
     </path>
     
     <target name="download" description="Downloads third-party JARs">
diff --git a/compiler/src/test/downloads.xml b/compiler/src/test/downloads.xml
index 467685a..ba638a1 100644
--- a/compiler/src/test/downloads.xml
+++ b/compiler/src/test/downloads.xml
@@ -209,13 +209,13 @@
                 <not>
                     <available file="${destDir}/${destJarFile}" />
                 </not>
-                <isset property="env.FLEX_DOWNLOAD_CACHE" />
+                <isset property="env.ROYALE_DOWNLOAD_CACHE" />
             </and>
         </condition>
         <echo>Need file: ${still_no_file}</echo>
     </target>
     <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file">
-        <copy file="${env.FLEX_DOWNLOAD_CACHE}/${srcJarFile}" tofile="${destDir}/${destJarFile}" />
+        <copy file="${env.ROYALE_DOWNLOAD_CACHE}/${srcJarFile}" tofile="${destDir}/${destJarFile}" />
     </target>
 
 
diff --git a/compiler/src/test/java/utils/FlashplayerSecurityHandler.java b/compiler/src/test/java/utils/FlashplayerSecurityHandler.java
index 0de36a1..a198a42 100644
--- a/compiler/src/test/java/utils/FlashplayerSecurityHandler.java
+++ b/compiler/src/test/java/utils/FlashplayerSecurityHandler.java
@@ -34,7 +34,7 @@ import java.util.List;
 public class FlashplayerSecurityHandler {
 
     public void trustFile(File directory) {
-        File securityTrustFile = new File(getSecuritySettingsDirectory(), "apache-flex-maven-plugin.cfg");
+        File securityTrustFile = new File(getSecuritySettingsDirectory(), "apache-royale-maven-plugin.cfg");
 
         if(!securityTrustFile.exists()) {
             System.out.println(" - Creating new FlashPlayer security trust file at: " + securityTrustFile.getPath());
diff --git a/debugger/build.properties b/debugger/build.properties
index af40bbd..b45cdbd 100644
--- a/debugger/build.properties
+++ b/debugger/build.properties
@@ -25,7 +25,7 @@ source.fdb.jar = src/main/java/
 jars.compile.order = fdb.jar
 
 # description values 
-release=Apache Flex SWF Debugger
+release=Apache Royale SWF Debugger
 
 
 # JAR Manifest Entries
diff --git a/debugger/build.xml b/debugger/build.xml
index 17ab116..5ed1830 100644
--- a/debugger/build.xml
+++ b/debugger/build.xml
@@ -148,18 +148,18 @@
     </target>
 
     <target name="double-check-file" >
-        <echo>${env.FLEX_DOWNLOAD_CACHE}</echo>
+        <echo>${env.ROYALE_DOWNLOAD_CACHE}</echo>
         <condition property="still-no-file" value="true">
             <and>
                 <not>
                     <available file="${destDir}/${destFile}" />
                 </not>
-                <isset property="env.FLEX_DOWNLOAD_CACHE" />
+                <isset property="env.ROYALE_DOWNLOAD_CACHE" />
             </and>
         </condition>
         <echo>Need file: ${still_no_file}</echo>
     </target>
     <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file">
-        <copy file="${env.FLEX_DOWNLOAD_CACHE}/${srcFile}" tofile="${destDir}/${destFile}" />
+        <copy file="${env.ROYALE_DOWNLOAD_CACHE}/${srcFile}" tofile="${destDir}/${destFile}" />
     </target>
 </project>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index ddc95c5..83b98b3 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>debugger</artifactId>
   <version>0.9.0-SNAPSHOT</version>
 
-  <name>Apache Flex - Royale: Compiler: Debugger</name>
+  <name>Apache Royale: Compiler: Debugger</name>
 
   <build>
     <plugins>
diff --git a/debugger/src/main/java/flash/tools/debugger/DefaultDebuggerCallbacks.java b/debugger/src/main/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
index 00caa7e..fe3690b 100644
--- a/debugger/src/main/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
+++ b/debugger/src/main/java/flash/tools/debugger/DefaultDebuggerCallbacks.java
@@ -349,7 +349,7 @@ public class DefaultDebuggerCallbacks implements IDebuggerCallbacks
 	/**
 	 * This implementation of queryWindowsRegistry() does not make any native
 	 * calls.  I had to do it this way because it is too hard, at this point,
-	 * to add native code to the Flex code tree.
+	 * to add native code to the Royale code tree.
 	 */
 	public String queryWindowsRegistry(String key, String value, int registryBitMode) throws IOException
 	{
diff --git a/flex-compiler-oem/src/site/site.xml b/flex-compiler-oem/src/site/site.xml
index 08d8448..bef4d3a 100644
--- a/flex-compiler-oem/src/site/site.xml
+++ b/flex-compiler-oem/src/site/site.xml
@@ -27,9 +27,9 @@
     </skin>
 
     <bannerLeft>
-        <name>Apache Flex</name>
-        <src>http://flex.apache.org/images/logo_01_fullcolor-sm.png</src>
-        <href>http://flex.apache.org/</href>
+        <name>Apache Royale</name>
+        <src>http://royale.apache.org/images/logo_01_fullcolor-sm.png</src>
+        <href>http://royale.apache.org/</href>
     </bannerLeft>
 
     <!--bannerRight>
@@ -38,9 +38,8 @@
 
     <body>
         <links>
-            <item name="Apache Flex Homepage" href="http://flex.apache.org/" />
-            <!--item name="Apache Royale Homepage" href="http://flex.apache.org/" /-->
-            <item name="Apache Flex Wiki" href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki"/>
+            <item name="Apache Royale Homepage" href="http://royale.apache.org/" />
+            <item name="Apache Royale Wiki" href="https://github.com/apache/royale-compiler/wiki"/>
         </links>
 
         <menu ref="reports" />
diff --git a/pom.xml b/pom.xml
index b2ed7eb..ba2537e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
   <version>0.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Apache Royale - Royale: Compiler: Parent</name>
+  <name>Apache Royale: Compiler: Parent</name>
   <description>The Apache Royale Project</description>
 
   <scm>
diff --git a/royale-ant-tasks/build.xml b/royale-ant-tasks/build.xml
index ae109f0..c5d5961 100644
--- a/royale-ant-tasks/build.xml
+++ b/royale-ant-tasks/build.xml
@@ -95,7 +95,7 @@
 	
 	<target name="set.royale.royaletasks.jar.uptodate">
 		<uptodate property="royale.royaletasks.jar.uptodate"
-		          targetfile="${sdk}/royale-royaleTasks.jar">
+		          targetfile="${sdk}/compiler-royaleTasks.jar">
 			<srcfiles dir="${royaletasks}/target/classes">
 				<include name="**/*.class"/>
 				<include name="**/*.properties"/>
@@ -108,7 +108,7 @@
         <copy file="${basedir}/../LICENSE.base" tofile="${royaletasks}/target/classes/META-INF/LICENSE"/>
         <copy file="${basedir}/../NOTICE.base" tofile="${royaletasks}/target/classes/META-INF/NOTICE"/>
         <mkdir dir="${sdk}"/>
-        <jar file="${sdk}/royale-royaleTasks.jar" basedir="${royaletasks}/target/classes" >
+        <jar file="${sdk}/compiler-royaleTasks.jar" basedir="${royaletasks}/target/classes" >
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -132,9 +132,9 @@
 
     -->
 	
-	<target name="sdk" depends="jar, test" description="Builds the royale-royaleTasks.jar"/>
+	<target name="sdk" depends="jar, test" description="Builds the compiler-royaleTasks.jar"/>
 
-    <target name="main" depends="sdk" description="Default target - Builds the royale-royaleTasks.jar">
+    <target name="main" depends="sdk" description="Default target - Builds the compiler-royaleTasks.jar">
         <tstamp>
             <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa"/>
         </tstamp>
@@ -153,7 +153,7 @@
 
     <target name="clean" description="clean">
         <delete dir="${royaletasks}/target" failonerror="false"/>
-        <delete file="${sdk}/royale-royaletasks.jar" failonerror="false"/>
+        <delete file="${sdk}/compiler-royaletasks.jar" failonerror="false"/>
     </target>
 
     <target name="wipe" depends="clean" description="Wipes everything that didn't come from Git.">
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 0bb2944..513b256 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>royale-ant-tasks</artifactId>
   <version>0.9.0-SNAPSHOT</version>
 
-  <name>Apache Flex - Royale: Royale Ant Tasks</name>
+  <name>Apache Royale: Royale Ant Tasks</name>
 
   <dependencies>
     <dependency>
diff --git a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
index fddd721..4d70f44 100644
--- a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
+++ b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/COMPCTask.java
@@ -49,14 +49,14 @@ import org.apache.royale.compiler.ant.types.RuntimeSharedLibraryPath;
  * For example:
  * <pre>
  * &lt;compc fork="true" 
- *         output="${FLEX_HOME}/frameworks/libs/sparkskins.swc"
+ *         output="${ROYALE_HOME}/frameworks/libs/sparkskins.swc"
  *         resource-bundle-list="${basedir}/bundles.properties"&gt;
  *     &lt;target-player&gt;10&lt;/target-player&gt;
  *     &lt;jvmarg line="${compc.jvm.args}"/&gt;
  *     &lt;include-classes&gt;SparkSkinsClasses&lt;/include-classes&gt;
  *     &lt;source-path path-element="${basedir}/src"/&gt;
  *     &lt;library-path/&gt;
- *     &lt;external-library-path dir="${FLEX_HOME}/frameworks/libs"&gt;
+ *     &lt;external-library-path dir="${ROYALE_HOME}/frameworks/libs"&gt;
  *         &lt;include name="player/${local.playerglobal.version}/playerglobal.swc"/&gt;
  *         &lt;include name="framework.swc"/&gt;
  *         &lt;include name="spark.swc" /&gt;
diff --git a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
index 23de529..79f7060 100644
--- a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
+++ b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/FlexTask.java
@@ -243,7 +243,7 @@ public abstract class FlexTask extends Java
         if (compilerHomeProperty == null)
             throw new BuildException("ROYALE_COMPILER_HOME must be set to use the Flex Ant Tasks");
 				
-        System.setProperty("FLEX_HOME", royaleHomeProperty);
+        System.setProperty("ROYALE_HOME", royaleHomeProperty);
         String royalelibProperty = royaleHomeProperty.concat("/frameworks/");
 		System.setProperty("royalelib", royalelibProperty);
 
diff --git a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/MXMLCTask.java b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/MXMLCTask.java
index 2b96544..e9150a5 100644
--- a/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/MXMLCTask.java
+++ b/royale-ant-tasks/src/main/java/org/apache/royale/compiler/ant/MXMLCTask.java
@@ -59,7 +59,7 @@ import org.apache.royale.compiler.ant.types.RuntimeSharedLibraryPath;
  *         show-invalid-css-property-warnings="false"
  *         tools-locale="de_DE"
  *         fork="false"&gt;
- *     &lt;source-path path-element="${FLEX_HOME}/frameworks/projects/framework/src"/&gt;
+ *     &lt;source-path path-element="${ROYALE_HOME}/frameworks/projects/framework/src"/&gt;
  * &lt;/mxmlc&gt;
  * </pre>
  *
diff --git a/royale-ant-tasks/src/test/build.xml b/royale-ant-tasks/src/test/build.xml
index d0ba5d3..e99c701 100644
--- a/royale-ant-tasks/src/test/build.xml
+++ b/royale-ant-tasks/src/test/build.xml
@@ -51,8 +51,8 @@
     </condition>
 		
     <property name="compiler" value="${royaletasks.tests}/../../../compiler-jx"/>
-    <condition property="flexsdk" value="${FLEX_HOME}" else="${env.FLEX_HOME}">
-        <isset property="FLEX_HOME" />
+    <condition property="royalesdk" value="${ROYALE_HOME}" else="${env.ROYALE_HOME}">
+        <isset property="ROYALE_HOME" />
     </condition>
     <condition property="playerglobal.version" value="${env.PLAYERGLOBAL_VERSION}">
         <isset property="env.PLAYERGLOBAL_VERSION" />
@@ -68,10 +68,10 @@
     </path>
     
     <target name="ant.tests">
-        <property name="FLEX_HOME" value="${flexsdk}"/>
+        <property name="ROYALE_HOME" value="${royalesdk}"/>
         <property name="ROYALE_COMPILER_HOME" value="${royale}"/>
         <echo message="GOOG_HOME: ${GOOG_HOME}"/>
-        <echo>FLEX_HOME=${flexsdk}</echo>
+        <echo>ROYALE_HOME=${royalesdk}</echo>
         <echo>ROYALE_COMPILER_HOME=${ROYALE_COMPILER_HOME}</echo>
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
         <mxmlc file="${royaletasks.tests}/as/Hello.as"
diff --git a/royale-maven-extension/pom.xml b/royale-maven-extension/pom.xml
index 0fc71d2..6df1a77 100644
--- a/royale-maven-extension/pom.xml
+++ b/royale-maven-extension/pom.xml
@@ -33,7 +33,7 @@
   <version>0.9.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Apache Flex - Royale: Royale Maven Extension</name>
+  <name>Apache Royale: Royale Maven Extension</name>
   <description>Implementation of a Maven extension which adds resolution of Royale scopes to Maven.</description>
 
   <!--
diff --git a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsLanguageSupport.java b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleLanguageSupport.java
similarity index 83%
rename from royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsLanguageSupport.java
rename to royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleLanguageSupport.java
index d5707d7..53748a8 100644
--- a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsLanguageSupport.java
+++ b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleLanguageSupport.java
@@ -27,12 +27,12 @@ import javax.inject.Named;
  */
 @Named
 @Component( role = LanguageSupport.class, hint = "royale" )
-public class FlexJsLanguageSupport implements LanguageSupport {
+public class RoyaleLanguageSupport implements LanguageSupport {
 
-    private static final FlexJsScopeSelector SCOPE_SELECTOR = new FlexJsScopeSelector();
-    private static final FlexJsScopeDeriver SCOPE_DERIVER = new FlexJsScopeDeriver();
+    private static final RoyaleScopeSelector SCOPE_SELECTOR = new RoyaleScopeSelector();
+    private static final RoyaleScopeDeriver SCOPE_DERIVER = new RoyaleScopeDeriver();
 
-    public FlexJsLanguageSupport() {
+    public RoyaleLanguageSupport() {
         System.out.println("Royale Support");
     }
 
diff --git a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeDeriver.java b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeDeriver.java
similarity index 93%
rename from royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeDeriver.java
rename to royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeDeriver.java
index 18f6013..cc9c72a 100644
--- a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeDeriver.java
+++ b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeDeriver.java
@@ -20,7 +20,7 @@ import org.eclipse.aether.util.graph.transformer.ConflictResolver;
 /**
  * Created by christoferdutz on 18.07.16.
  */
-public class FlexJsScopeDeriver extends ConflictResolver.ScopeDeriver {
+public class RoyaleScopeDeriver extends ConflictResolver.ScopeDeriver {
 
     @Override
     public void deriveScope(ConflictResolver.ScopeContext scopeContext) throws RepositoryException {
diff --git a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeSelector.java b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeSelector.java
similarity index 93%
rename from royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeSelector.java
rename to royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeSelector.java
index 98a516f..214fa63 100644
--- a/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/FlexJsScopeSelector.java
+++ b/royale-maven-extension/src/main/java/org/apache/royale/maven/extension/RoyaleScopeSelector.java
@@ -20,7 +20,7 @@ import org.eclipse.aether.util.graph.transformer.ConflictResolver;
 /**
  * Created by christoferdutz on 18.07.16.
  */
-public class FlexJsScopeSelector extends ConflictResolver.ScopeSelector {
+public class RoyaleScopeSelector extends ConflictResolver.ScopeSelector {
 
     @Override
     public void selectScope(ConflictResolver.ConflictContext conflictContext) throws RepositoryException {
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index 250945a..cadbd21 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -30,7 +30,7 @@
   <version>0.9.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
-  <name>Apache Flex - Royale: Royale Maven Plugin</name>
+  <name>Apache Royale: Royale Maven Plugin</name>
 
   <properties>
     <maven.version>3.3.1</maven.version>
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
index adcb590..03246c7 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileJSMojo.java
@@ -158,7 +158,7 @@ public class CompileJSMojo
                     "<swc xmlns=\"http://www.adobe.com/flash/swccatalog/9\">\n" +
                     "    <versions>\n" +
                     "        <swc version=\"1.2\"/>\n" +
-                    "        <compiler name=\"Apache Flex - Royale: Compiler: Compiler\" version=\"0.8\" build=\"0-SNAPSHOT\"/>\n" +
+                    "        <compiler name=\"Apache Royale: Compiler: Transpiler\" version=\"0.8\" build=\"0-SNAPSHOT\"/>\n" +
                     "    </versions>\n" +
                     "    <features>\n" +
                     "    </features>\n" +
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/trust/DefaultTrustHandler.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/trust/DefaultTrustHandler.java
index a96368b..f201244 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/trust/DefaultTrustHandler.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/trust/DefaultTrustHandler.java
@@ -36,7 +36,7 @@ public class DefaultTrustHandler implements TrustHandler {
 
     @Override
     public void trustDirectory(File directory) {
-        File securityTrustFile = new File(getSecuritySettingsDirectory(), "apache-flex-maven-plugin.cfg");
+        File securityTrustFile = new File(getSecuritySettingsDirectory(), "apache-royale-maven-plugin.cfg");
 
         if(!securityTrustFile.exists()) {
             System.out.println(" - Creating new FlashPlayer security trust file at: " + securityTrustFile.getPath());
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/types/FlexScope.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/types/FlexScope.java
deleted file mode 100644
index 2fc7736..0000000
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/types/FlexScope.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.royale.maven.types;
-
-/**
- * Created by christoferdutz on 18.04.16.
- */
-public enum FlexScope {
-
-    COMPILE,
-    TEST,
-    EXTERNAL
-
-}
diff --git a/royale-maven-plugin/src/main/resources/config/compile-app-config.xml b/royale-maven-plugin/src/main/resources/config/compile-app-config.xml
index 97b3324..a264b7e 100644
--- a/royale-maven-plugin/src/main/resources/config/compile-app-config.xml
+++ b/royale-maven-plugin/src/main/resources/config/compile-app-config.xml
@@ -73,7 +73,7 @@
 
     <!-- Turn on writing of generated/*.as files to disk. These files are generated by -->
     <!-- the compiler during mxml translation and are helpful with understanding and   -->
-    <!-- debugging Flex applications.                                                  -->
+    <!-- debugging Royale applications.                                                  -->
     <keep-generated-actionscript>false</keep-generated-actionscript>
 
     <!-- not set -->
@@ -138,7 +138,7 @@
     <omit-trace-statements>true</omit-trace-statements>
 
     <!-- Keep the following AS3 metadata in the bytecodes.                                             -->
-    <!-- Warning: For the data binding feature in the Flex framework to work properly,                 -->
+    <!-- Warning: For the data binding feature in the Royale framework to work properly,                 -->
     <!--          the following metadata must be kept:                                                 -->
     <!--          1. Bindable                                                                          -->
     <!--          2. Managed                                                                           -->
@@ -215,7 +215,7 @@
       -->
 
       <!-- Compiler font manager classes, in policy resolution order -->
-      <!-- NOTE: For Apache Flex -->
+      <!-- NOTE: For Apache Royale -->
       <!-- AFEFontManager and CFFFontManager both use proprietary technology.  -->
       <!-- You must install the optional font jars if you wish to use embedded fonts  -->
       <!-- directly or you can use fontswf to precompile the font as a swf.  -->
diff --git a/src/site/asciidoc/build.adoc b/src/site/asciidoc/build.adoc
index 9226dbf..8433c5c 100644
--- a/src/site/asciidoc/build.adoc
+++ b/src/site/asciidoc/build.adoc
@@ -255,8 +255,7 @@ mvn clean install -P build-distribution
 
 However this doesn't automatically build the directory distribution. It builds
 a zip and a tar.gz version of the Royale SDK, without any of the Adobe dependencies.
-This is the part that is for example used by the Flex Installer to install a
-local FDK.
+This is the part that produces package usable by IDEs.
 
 If you want to have a Royale SDK (including Air, Flash, Fontkit, etc.) you need to
 tell the build where to put it by providing a property to the build:
diff --git a/src/site/asciidoc/featurebranch-autobuild.adoc b/src/site/asciidoc/featurebranch-autobuild.adoc
index 5fe6a38..c24e7f6 100644
--- a/src/site/asciidoc/featurebranch-autobuild.adoc
+++ b/src/site/asciidoc/featurebranch-autobuild.adoc
@@ -29,7 +29,7 @@ The Royale compiler module contains a `Jenkinsfile` which describes the setup of
 
 The ASF Jenkins is setup to automatically build the `develop` branch of all modules (royale-compiler, royale-typedefs and royale-framework) as soon as something changes in the GIT repo.
 
-Here's a link to that particular job: https://builds.apache.org/view/E-G/view/Flex/job/Royale%20Pipeline/
+Here's a link to that particular job: https://builds.apache.org/job/Royale%20Pipeline/open 
 
 Additionally as soon as Jenkins detects a branch with the prefix of `feature-autobuild/`, it sets up a new Build job for that branch and starts automatically building that branch.
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 52591d3..315c6a9 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -62,7 +62,7 @@
 
         <links>
             <item name="Apache Royale Homepage" href="http://royale.apache.org/" />
-            <item name="Apache Royale Documentation" href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki"/>
+            <item name="Apache Royale Documentation" href="https://apache.github.io/royale-docs/"/>
         </links>
 
         <menu name="Royale">

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

Mime
View raw message