royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] 05/06: no more Falcon references I think. In theory we don't need FALCON_HOME and FALCONJX_HOME since the transpiler can launch the SWF compiler
Date Tue, 31 Oct 2017 00:24:01 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 9a80dfe197ea65fa500110ea29e3154391c96fdf
Author: Alex Harui <aharui@apache.org>
AuthorDate: Tue Oct 24 22:21:17 2017 -0700

    no more Falcon references I think.  In theory we don't need FALCON_HOME and FALCONJX_HOME since the transpiler can launch the SWF compiler
---
 ApproveFalcon.xml                                  |   6 +-
 README                                             |  10 +-
 README_MAVEN.txt                                   |  23 ---
 apache-flex-falcon-installer-config.xml            |  94 -----------
 apache-flex-falconjx-installer-config.xml          | 101 -----------
 build.xml                                          |  19 +--
 compiler-build-tools/build.xml                     |   2 -
 compiler-jx/build.xml                              |   2 -
 compiler-jx/src/assembly/scripts/asjsc             |  12 +-
 compiler-jx/src/assembly/scripts/asjsc.bat         |   4 +-
 compiler-jx/src/assembly/scripts/compc             |  12 +-
 compiler-jx/src/assembly/scripts/compc.bat         |   4 +-
 compiler-jx/src/assembly/scripts/mxmlc             |  12 +-
 compiler-jx/src/assembly/scripts/mxmlc.bat         |   4 +-
 .../internal/codegen/js/goog/JSGoogEmitter.java    |   2 +-
 .../internal/driver/js/JSSourceFileHandler.java    |   2 +-
 .../driver/mxml/ASDocASSourceFileHandler.java      |   2 +-
 .../driver/mxml/ASDocMXMLSourceFileHandler.java    |   2 +-
 .../driver/mxml/MXMLSourceFileHandler.java         |   2 +-
 .../compiler/internal/graph/GoogDepsWriter.java    |   2 +-
 compiler-jx/src/main/resources/downloads.xml       |   6 +-
 .../internal/codegen/as/TestStatements.java        |   2 +-
 .../codegen/js/goog/TestGoogAccessorMembers.java   |  20 +--
 .../internal/codegen/js/goog/TestGoogEmitter.java  |  14 +-
 .../codegen/js/goog/TestGoogExpressions.java       |   4 +-
 .../codegen/js/goog/TestGoogFieldMembers.java      |  40 ++---
 .../codegen/js/goog/TestGoogGlobalClasses.java     |   2 +-
 .../codegen/js/goog/TestGoogGlobalConstants.java   |   8 +-
 .../codegen/js/goog/TestGoogMethodMembers.java     |  32 ++--
 .../codegen/js/goog/TestGoogStatements.java        |   2 +-
 .../js/royale/TestRoyaleAccessorMembers.java       |  48 +++---
 .../codegen/js/royale/TestRoyaleAccessors.java     |  42 ++---
 .../codegen/js/royale/TestRoyaleEmitter.java       |  14 +-
 .../codegen/js/royale/TestRoyaleExpressions.java   |  56 +++----
 .../codegen/js/royale/TestRoyaleFieldMembers.java  |  68 ++++----
 .../codegen/js/royale/TestRoyaleGlobalClasses.java |   4 +-
 .../js/royale/TestRoyaleGlobalConstants.java       |   8 +-
 .../internal/codegen/js/royale/TestRoyaleJSX.java  |  84 +++++-----
 .../codegen/js/royale/TestRoyaleMethodMembers.java |  52 +++---
 .../codegen/js/royale/TestRoyaleStatements.java    |  16 +-
 .../js/sourcemaps/TestSourceMapFieldMembers.java   |  34 ++--
 .../mxml/sourcemaps/TestSourceMapMXMLScript.java   |   4 +-
 .../royale/compiler/internal/test/ASTestBase.java  |   2 +-
 .../royale/compiler/internal/test/TestBase.java    |   2 +-
 .../test/resources/externals/app1/as_src/Main.as   |   2 +-
 .../projects/circular_proto/index_result.html      |   2 +-
 compiler-test-utils/build.xml                      |   2 -
 compiler/README                                    | 109 ------------
 compiler/build.xml                                 |   9 +-
 compiler/src/assembly/scripts/compc                |  10 +-
 compiler/src/assembly/scripts/compc.bat            |   4 +-
 compiler/src/assembly/scripts/fdb                  |  10 +-
 compiler/src/assembly/scripts/mxmlc                |  10 +-
 compiler/src/assembly/scripts/mxmlc.bat            |   4 +-
 compiler/src/assembly/scripts/optimizer            |  10 +-
 compiler/src/assembly/scripts/swcdepends           |  10 +-
 compiler/src/assembly/scripts/swcdepends.bat       |   4 +-
 compiler/src/assembly/scripts/swfdump              |  10 +-
 .../royale/compiler/internal/parsing/as/ASParser.g |   2 +-
 .../org/apache/royale/compiler/asdoc/package.html  |   2 +-
 .../royale/compiler/clients/FalconToolGroup.java   |   8 +-
 .../royale/compiler/config/Configurator.java       |   2 +-
 .../internal/as/codegen/ABCGeneratingReducer.java  |   2 +-
 .../internal/definitions/FunctionDefinition.java   |   2 +-
 .../internal/definitions/NamespaceDefinition.java  |   2 +-
 .../internal/definitions/VariableDefinition.java   |   2 +-
 .../royale/compiler/internal/mxml/MXMLData.java    |   2 +-
 .../internal/parsing/mxml/MXMLScopeBuilder.java    |   2 +-
 .../royale/compiler/internal/scopes/ASScope.java   |   6 +-
 .../compiler/internal/targets/LinkageChecker.java  |   2 +-
 .../compiler/internal/targets/RoyaleTarget.java    |   2 +-
 .../internal/tree/mxml/MXMLInstanceNode.java       |   2 +-
 .../internal/tree/mxml/MXMLReparentNode.java       |   2 +-
 .../units/ResourceBundleCompilationUnit.java       |   2 +-
 .../java/org/apache/royale/compiler/package.html   |   8 +-
 .../compiler/targets/ITargetProgressMonitor.java   |   2 +-
 .../workspaces/IWorkspaceProfilingDelegate.java    |   2 +-
 .../apache/royale/compiler/workspaces/package.html |   4 +-
 .../royale/swc/catalog/StAXCatalogWriter.java      |   4 +-
 .../java/org/apache/royale/utils/ArgumentUtil.java |   2 +-
 .../compiler/internal/as/codegen/CmcPatterns.jbg   |   2 +-
 .../compiler/internal/parsing/as/skeleton.falcon   |   4 +-
 .../services/org.apache.flex.tools.FlexToolGroup   |   2 +-
 compiler/src/main/resources/downloads.xml          |  22 +--
 compiler/src/main/resources/overview.html          |   4 +-
 .../tools/debugger/expression/CmcPatterns.jbg      |   2 +-
 flex-compiler-oem/build.xml                        |   6 +-
 installer.properties/en_US.properties              |  22 ---
 installer.xml                                      | 184 ---------------------
 royale-ant-tasks/build.xml                         |   2 +-
 .../org/apache/royale/compiler/ant/FlexTask.java   |  18 +-
 royale-ant-tasks/src/test/build.xml                |   4 +-
 .../org/apache/royale/maven/BaseCompileMojo.java   |   2 +-
 .../apache/royale/maven/CompileTypedefsMojo.java   |   2 +-
 94 files changed, 441 insertions(+), 976 deletions(-)

diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index be9dd1e..9c1e3fc 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -18,7 +18,7 @@
 
 -->
 
-<project name="ApproveApacheFlexFalcon" default="main" basedir=".">
+<project name="ApproveApacheFlexRoyale" default="main" basedir=".">
 
 
     <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
@@ -405,7 +405,7 @@
     <target name="examine-jars" if="isMac">
         <!-- comma delimited list, no spaces, not one file per line -->
         <copy file="jars.txt" tofile="loop.txt" />
-        <ant antfile="ApproveFalcon.xml" target="loopOnce" inheritAll="false" />
+        <ant antfile="ApproveRoyale.xml" target="loopOnce" inheritAll="false" />
     </target>
     <target name="loopOnce" >
         <!-- make a copy of the list so we can munge it to
@@ -427,7 +427,7 @@
         <loadfile srcFile="loop1.txt" property="thisFile" />
         <antcall target="jar-check" />
         <replaceregexp file="loop.txt" match="^(.*),(.*)" replace="\1" />
-        <ant antfile="ApproveFalcon.xml" target="loopOnce" inheritAll="false"/>
+        <ant antfile="ApproveRoyale.xml" target="loopOnce" inheritAll="false"/>
     </target>
     <target name="lastone" if="islast">
         <loadfile srcFile="loop1.txt" property="thisFile" />
diff --git a/README b/README
index 8b87274..48d67ab 100644
--- a/README
+++ b/README
@@ -232,9 +232,13 @@ Building the Source in the Source Distribution
 
     You can build the compiler via Apache Maven or Apache Ant.
 
-    To build the Apache Royale Compiler with Apache Maven, you must first build
-    the utils profile without the main profile and then the main profile.  
-    So, first run:
+    To build the Apache Royale Compiler with Apache Maven, get Maven 
+    (http://maven.apache.org) and unpack it somewhere.
+    This directory is now "MAVEN_HOME". Make sure MAVEN_HOME/bin
+    is on your systems path.
+
+    You must first build the utils profile without the main profile 
+    and then the main profile.  So, first run:
 
         mvn clean install -P -main,utils
 
diff --git a/README_MAVEN.txt b/README_MAVEN.txt
deleted file mode 100644
index 648f21d..0000000
--- a/README_MAVEN.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-In order to build Falcon with Maven you need to perform the following steps:
-
-1. Get Maven (http://maven.apache.org) and unpack it somewhere.
-    This directory is now "MAVEN_HOME". Now make sure MAVEN_HOME/bin
-    is on your systems path.
-
-2. Make sure you have the following environment variables set:
-    FLASHPLAYER_DEBUGGER (Set to the Flash Player Debug Projector)
-
-3. Build the project itself (without tests)
-    mvn install
-
-NOTE: The build currently still relies on an unreleased version of the
-flex-sdk-converter-maven-extension. Per default Maven can't find this artifact.
-The file settings-template.xml is a sample settings.xml which you can use to build.
-In order to build with this settings.xml by adding the "-s" parameter to the call
-to maven.
-
-Look here for examples:
-
-mvn -s settings-template.xml clean install
-
-mvn -s settings-template.xml clean install -DskipTests
diff --git a/apache-flex-falcon-installer-config.xml b/apache-flex-falcon-installer-config.xml
deleted file mode 100644
index 5a07168..0000000
--- a/apache-flex-falcon-installer-config.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
-
--->
-
-<config>
-    <!--<progressLabels>
-        <en_US>
-            <Copy>Copying %1 of %2</Copy>
-            <Get>Downloading bytes %1 of %2</Get>
-            <Checksum>Computing checksum: bytes %1 of %2</Checksum>
-        </en_US>
-    </progressLabels>
-     -->
-    <strings description="override default installer strings here">
-        <string id="INFO_DOWNLOADING_FLEX_SDK">
-            <el_GR>Γίνεται λήψη του Apache Flex Falcon Compiler από:</el_GR>
-            <en_US>Downloading Apache Flex Falcon Compiler from: </en_US>
-        </string>
-        <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
-            <el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή καταλόγου για το Flex SDK</el_GR>
-            <en_US>Please enter valid directory path for a Flex or Royale SDK</en_US>
-        </string>
-        <string id="INFO_SELECT_DIRECTORY">
-            <el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε να εγκαταστήσετε το Flex Falcon</el_GR>
-            <en_US>Select the directory where you want to install the Flex Falcon Compiler</en_US>
-        </string>
-        <string id="INFO_VERIFY_FLEX_SDK_DONE">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων είναι επιτυχής.</el_GR>
-            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
-        </string>
-        <string id="SELECT_PATH_PROMPT">
-            <el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το Flex Falcon Compiler</el_GR>
-            <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
-        </string>
-        <string id="ERROR_VERIFY_FLEX_SDK">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
-            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
-        </string>
-        <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
-            <el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEX FALCON</el_GR>
-            <en_US>OPEN APACHE FLEX FALCON FOLDER</en_US>
-        </string>
-        <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
-            <el_GR>Λήψη Apache Flex Falcon Compiler</el_GR>
-            <en_US>Apache Flex Falcon Compiler (Required)</en_US>
-        </string>
-        <string id="STEP_VERIFY_FLEX_SDK">
-            <el_GR>Γίνεται επαλήθευση του Apache Flex Falcon MD5 Signature</el_GR>
-            <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
-        </string>
-        <string id="STEP_UNZIP_FLEX_SDK">
-            <el_GR>Αποσυμπίεση του Apache Flex Falcon Compiler</el_GR>
-            <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
-        </string>
-    </strings>
-    <steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
-        <step id="download">
-            <el_GR></el_GR>
-            <en_US>Download Falcon dependencies</en_US>
-        </step>
-        <step id="copyfiles">
-            <el_GR></el_GR>
-            <en_US>Copy Falcon Compiler files</en_US>
-        </step>
-    </steps>
-    <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.flexroyale.install">
-        <el_GR>
-            <label>Apache Flex Falcon (Απαιτούμενο)</label>
-            <message>Για το Apache Flex Falcon ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache Flex Falcon;</message>
-        </el_GR>
-        <en_US>
-            <label>Apache Flex Falcon (Required)</label>
-            <message>The Apache License V2 applies to the Apache Flex Falcon Compiler.  Do you want to install the Apache Flex Falcon Compiler?</message>
-            <license>Apache V2 License</license>
-            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
-        </en_US>
-    </component>
-</config>
diff --git a/apache-flex-falconjx-installer-config.xml b/apache-flex-falconjx-installer-config.xml
deleted file mode 100644
index e74825a..0000000
--- a/apache-flex-falconjx-installer-config.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
-
--->
-
-<config>
-    <!--<progressLabels>
-        <en_US>
-            <Copy>Copying %1 of %2</Copy>
-            <Get>Downloading bytes %1 of %2</Get>
-            <Checksum>Computing checksum: bytes %1 of %2</Checksum>
-        </en_US>
-    </progressLabels>
-     -->
-    <strings description="override default installer strings here">
-        <string id="INFO_DOWNLOADING_FLEX_SDK">
-            <el_GR>Γίνεται λήψη του Apache Flex FalconJX από:</el_GR>
-            <en_US>Downloading Apache Flex FalconJX Compiler from: </en_US>
-        </string>
-        <string id="INFO_ENTER_VALID_FLEX_SDK_PATH">
-            <el_GR>Παρακαλώ εισάγετε μια έγκυρη διαδρομή καταλόγου για το Flex SDK</el_GR>
-            <en_US>Please enter valid directory path for a Flex or Royale SDK</en_US>
-        </string>
-        <string id="INFO_SELECT_DIRECTORY">
-            <el_GR>Επιλέξτε τον κατάλογο στον οποίο θέλετε να εγκαταστήσετε το Flex Falcon</el_GR>
-            <en_US>Select the directory where you want to install the Flex FalconJX Compiler</en_US>
-        </string>
-        <string id="INFO_VERIFY_FLEX_SDK_DONE">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων είναι επιτυχής.</el_GR>
-            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files matches the reference. The file is valid.</en_US>
-        </string>
-        <string id="SELECT_PATH_PROMPT">
-            <el_GR>Πληκτρολογήστε η επιλέξτε μια έγκυρη διαδρομή για το Flex Falcon Compiler</el_GR>
-            <en_US>Where do you want to install the Apache Flex Falcon Compiler?</en_US>
-        </string>
-        <string id="ERROR_VERIFY_FLEX_SDK">
-            <el_GR>Η επαλήθευση των ληφθέντων αρχείων απέτυχε. Η εγκατάσταση σταμάτησε.</el_GR>
-            <en_US>The Apache Flex Falcon MD5 Signature of the downloaded files does not match the reference value. The file is invalid, installation is aborted.</en_US>
-        </string>
-        <string id="BTN_LABEL_OPEN_APACHE_FLEX_FOLDER">
-            <el_GR>ΑΝΟΙΓΜΑ ΦΑΚΕΛΟΥ APACHE FLEX FALCONJX</el_GR>
-            <en_US>OPEN APACHE FLEX FALCONJX FOLDER</en_US>
-        </string>
-        <string id="STEP_REQUIRED_INSTALL_APACHE_FLEX_SDK">
-            <el_GR>Λήψη Apache Flex Falcon Compiler</el_GR>
-            <en_US>Apache Flex Falcon Compiler (Required)</en_US>
-        </string>
-        <string id="STEP_VERIFY_FLEX_SDK">
-            <el_GR>Γίνεται επαλήθευση του Apache Flex Falcon MD5 Signature</el_GR>
-            <en_US>Verifying Apache Flex Falcon MD5 Signature</en_US>
-        </string>
-        <string id="STEP_UNZIP_FLEX_SDK">
-            <el_GR>Αποσυμπίεση του Apache Flex Falcon Compiler</el_GR>
-            <en_US>Uncompress Apache Flex Falcon Compiler</en_US>
-        </string>
-    </strings>
-    <steps description="targets that should have a 'step' in the GUI progress indicator, in order of appearance.">
-        <step id="download">
-            <el_GR></el_GR>
-            <en_US>Download Falcon dependencies</en_US>
-        </step>
-        <step id="copyfiles">
-            <el_GR></el_GR>
-            <en_US>Copy Falcon SDK files</en_US>
-        </step>
-        <step id="download.jx">
-            <en_US>Download FalconJX Dependencies</en_US>
-        </step>
-        <step id="copyfiles.jx">
-            <el_GR></el_GR>
-            <en_US>Copy FalconJX SDK files</en_US>
-        </step>
-    </steps>
-    <component id="STEP_REQUIRED_INSTALL_APACHE_FLEX_FALCON" required="true" property="do.royale.install">
-        <el_GR>
-            <label>Apache Flex Falcon (Απαιτούμενο)</label>
-            <message>Για το Apache Flex FalconJX ισχύει η συμφωνία χρήσης του Apache License V2. Θέλετε να εγκαταστήσετε το Apache Flex FalconJX;</message>
-        </el_GR>
-        <en_US>
-            <label>Apache Flex FalconJX (Required)</label>
-            <message>The Apache License V2 applies to the Apache Flex FalconJX Compiler.  Do you want to install the Apache Flex FalconJX Compiler?</message>
-            <license>Apache V2 License</license>
-            <licenseURL>http://www.apache.org/licenses/LICENSE-2.0.html</licenseURL>
-        </en_US>
-    </component>
-</config>
diff --git a/build.xml b/build.xml
index 12c24cd..5ada965 100644
--- a/build.xml
+++ b/build.xml
@@ -85,11 +85,11 @@
         </fileset>
     </path>
 
-    <target name="javadoc" description="Builds Falcon's Javadoc at generated/javadoc.">
+    <target name="javadoc" description="Builds Royale's Javadoc at generated/javadoc.">
         <!--<ant dir="compiler" target="javadoc"/>-->
     </target>
 
-    <target name="eclipse" description="Prepares or updates Falcon's project(s) for use in Eclipse. This takes care of generating Java files for lexers, parsers, and BURMs.">
+    <target name="eclipse" description="Prepares or updates Royale's project(s) for use in Eclipse. This takes care of generating Java files for lexers, parsers, and BURMs.">
         <ant dir="compiler" target="eclipse"/>
         <ant dir="compiler.tests" target="eclipse"/>
     </target>
@@ -101,11 +101,11 @@
         <ant dir="compiler" />
     </target>
 
-    <target name="main" depends="sdk, javadoc, tests" description="Default target - Builds a Falcon SDK, builds Falcon Javadoc, and runs tests."/>
+    <target name="main" depends="sdk, javadoc, tests" description="Default target - Builds a Royale SDK, builds Royale Javadoc, and runs tests."/>
 
-    <target name="all" depends="main, jx, typedefs, oem, debugger, anttasks" description="Builds Falcon, then FalconJX"/>
+    <target name="all" depends="main, jx, typedefs, oem, debugger, anttasks" description="Builds Royale, then RoyaleJX"/>
 
-    <target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" />
+    <target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds RoyaleJX" />
     
     <target name="typedefs" depends="check-typedefs-home, typedef.swcs, typedef.tests" description="Build typedefs and run tests"/>
     
@@ -127,7 +127,7 @@
         <ant dir="debugger" target="jar"/>
     </target>
     
-    <target name="compiler.jx" description="Builds FalconJX.">
+    <target name="compiler.jx" description="Builds RoyaleJX.">
         <ant dir="compiler-jx" target="main"/>
     </target>
 
@@ -144,8 +144,7 @@
     </target>
     
     <target name="typedef.swcs">
-        <property name="FALCON_HOME" value="${basedir}/compiler" />
-        <property name="FALCONJX_HOME" value="${basedir}/compiler-jx" />
+        <property name="ROYALE_COMPILER_HOME" value="${basedir}/compiler-jx" />
         <ant dir="${ROYALE_TYPEDEFS_HOME}" />
     </target>
     <target name="typedef.swcs.clean" >
@@ -200,7 +199,7 @@
         <delete dir="${basedir}/externs" failonerror="false" includeEmptyDirs="true"/>
     </target>
 
-    <target name="maven-artifacts" description="Installs Falcon artifacts to a local maven repository">
+    <target name="maven-artifacts" description="Installs Royale artifacts to a local maven repository">
         <ant dir="compiler" target="maven-artifacts"/>
     </target>
 
@@ -236,7 +235,7 @@
      -->
     <target name="release"
         depends="source-release,binary-release,rat-check"
-        description="Creates source and binary kits for Apache Falcon and FalconJX."/>
+        description="Creates source and binary kits for Apache Royale and RoyaleJX."/>
         
     <target name="source-release"
         depends="wipe-all,check-flex-home,source-package"
diff --git a/compiler-build-tools/build.xml b/compiler-build-tools/build.xml
index 4e167e9..7169c89 100644
--- a/compiler-build-tools/build.xml
+++ b/compiler-build-tools/build.xml
@@ -34,8 +34,6 @@
         <path location="${basedir}"/>
     </pathconvert>
     
-    <property name="FALCON_HOME" value="${basedir}/../compiler"/>
-    
     <!-- Properties can be overridden locally by loading a local.properties file -->
     <!-- Java 8 users probably need javadoc.params=-Xdoclint:none -->
     <property file="${compiler-build-tools}/local.properties"/>
diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml
index 78fead6..4a91391 100644
--- a/compiler-jx/build.xml
+++ b/compiler-jx/build.xml
@@ -19,8 +19,6 @@
 -->
 <project name="compiler-jx" default="main" basedir=".">
 
-    <property name="FALCONJX_HOME" location="${basedir}"/>
-    
     <pathconvert property="basedir_clean" dirsep="/">
 		<path location="${basedir}" />
     </pathconvert>
diff --git a/compiler-jx/src/assembly/scripts/asjsc b/compiler-jx/src/assembly/scripts/asjsc
index 56cd9c7..50eca44 100755
--- a/compiler-jx/src/assembly/scripts/asjsc
+++ b/compiler-jx/src/assembly/scripts/asjsc
@@ -25,17 +25,17 @@
 # In Windows Command Prompt, use mxmlc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/../../compiler
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/../../compiler
 fi
 
-echo Using Falcon codebase: $FALCON_HOME
+echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
 if [ "x${FLEX_HOME}" = "x" ]
 then
-    FLEX_HOME=${FALCON_HOME}/generated/dist/sdk
+    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
 echo Using Flex SDK: $FLEX_HOME
 
@@ -51,7 +51,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 	FLEX_HOME=`cygpath -m $FLEX_HOME`
 
 elif [ $OS = "Unix" ]; then
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$FALCON_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="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$FLEX_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 c600e86..c603080 100644
--- a/compiler-jx/src/assembly/scripts/asjsc.bat
+++ b/compiler-jx/src/assembly/scripts/asjsc.bat
@@ -22,8 +22,8 @@ rem mxmlc.bat script to launch compiler-mxmlc.jar in Windows Command Prompt.
 rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
 rem
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%FALCON_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\mxmlc.jar" -external-library-path="%FALCON_HOME%\libs\JS.swc" %*
+@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" %*
diff --git a/compiler-jx/src/assembly/scripts/compc b/compiler-jx/src/assembly/scripts/compc
index 838c202..b718b89 100755
--- a/compiler-jx/src/assembly/scripts/compc
+++ b/compiler-jx/src/assembly/scripts/compc
@@ -25,17 +25,17 @@
 # In Windows Command Prompt, use mxmlc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/../../compiler
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/../../compiler
 fi
 
-echo Using Falcon codebase: $FALCON_HOME
+echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
 if [ "x${FLEX_HOME}" = "x" ]
 then
-    FLEX_HOME=${FALCON_HOME}/generated/dist/sdk
+    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
 echo Using Flex SDK: $FLEX_HOME
 
@@ -51,7 +51,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 	FLEX_HOME=`cygpath -m $FLEX_HOME`
 
 elif [ $OS = "Unix" ]; then
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$FALCON_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="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$FLEX_HOME/frameworks" "$@"
diff --git a/compiler-jx/src/assembly/scripts/compc.bat b/compiler-jx/src/assembly/scripts/compc.bat
index 5d80308..9e935e2 100644
--- a/compiler-jx/src/assembly/scripts/compc.bat
+++ b/compiler-jx/src/assembly/scripts/compc.bat
@@ -22,8 +22,8 @@ rem mxmlc.bat script to launch compiler-mxmlc.jar in Windows Command Prompt.
 rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
 rem
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%FALCON_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%FLEX_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 c13f7b2..5b1fc1b 100755
--- a/compiler-jx/src/assembly/scripts/mxmlc
+++ b/compiler-jx/src/assembly/scripts/mxmlc
@@ -25,17 +25,17 @@
 # In Windows Command Prompt, use mxmlc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/../../compiler
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/../../compiler
 fi
 
-echo Using Falcon codebase: $FALCON_HOME
+echo Using Royale codebase: $ROYALE_COMPILER_HOME
 
 if [ "x${FLEX_HOME}" = "x" ]
 then
-    FLEX_HOME=${FALCON_HOME}/generated/dist/sdk
+    FLEX_HOME=${ROYALE_COMPILER_HOME}/generated/dist/sdk
 fi
 echo Using Flex SDK: $FLEX_HOME
 
@@ -51,7 +51,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 	FLEX_HOME=`cygpath -m $FLEX_HOME`
 
 elif [ $OS = "Unix" ]; then
@@ -67,4 +67,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$FALCON_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="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$FLEX_HOME/frameworks" "$@"
diff --git a/compiler-jx/src/assembly/scripts/mxmlc.bat b/compiler-jx/src/assembly/scripts/mxmlc.bat
index 5d80308..9e935e2 100644
--- a/compiler-jx/src/assembly/scripts/mxmlc.bat
+++ b/compiler-jx/src/assembly/scripts/mxmlc.bat
@@ -22,8 +22,8 @@ rem mxmlc.bat script to launch compiler-mxmlc.jar in Windows Command Prompt.
 rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
 rem
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%FALCON_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\mxmlc.jar" %*
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index c95d7f7..25c3db1 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -635,7 +635,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         }
 
         boolean isRunningInTestMode = cnode != null
-                && cnode.getQualifiedName().equalsIgnoreCase("FalconTest_A");
+                && cnode.getQualifiedName().equalsIgnoreCase("RoyaleTest_A");
         if (writeSelf && !isRunningInTestMode)
         {
             write(JSGoogEmitterTokens.SELF);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
index 2feae00..0ba029e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/JSSourceFileHandler.java
@@ -30,7 +30,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
  * {@link ASCompilationUnit}'s. JSSourceFileHandler is the SourceFileHandler
  * that provides JSCompilationUnit for *.as files. JSDriver registers
  * JSSourceFileHandler at RoyaleApplicationProject. This implementation is part of
- * FalconJS. For more details on FalconJS see org.apache.royale.compiler.JSDriver
+ * RoyaleJS. For more details on RoyaleJS see org.apache.royale.compiler.JSDriver
  */
 public final class JSSourceFileHandler implements ISourceFileHandler
 {
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
index 40a8535..f8c42e5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocASSourceFileHandler.java
@@ -32,7 +32,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
  * {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is part
- * of FalconJS. For more details on FalconJS see
+ * of RoyaleJS. For more details on RoyaleJS see
  * org.apache.royale.compiler.JSDriver
  */
 public final class ASDocASSourceFileHandler implements ISourceFileHandler
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
index 6241c7c..20fda2c 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/ASDocMXMLSourceFileHandler.java
@@ -33,7 +33,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
  * {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is part
- * of FalconJS. For more details on FalconJS see
+ * of RoyaleJS. For more details on RoyaleJS see
  * org.apache.royale.compiler.JSDriver
  */
 public final class ASDocMXMLSourceFileHandler implements ISourceFileHandler
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
index de660a8..72bfc0a 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/mxml/MXMLSourceFileHandler.java
@@ -31,7 +31,7 @@ import org.apache.royale.compiler.units.ICompilationUnit;
  * {@link ASCompilationUnit}'s. MXMLSourceFileHandler is the SourceFileHandler
  * that provides JSCompilationUnit for *.mxml files. JSDriver registers
  * MXMLSourceFileHandler at RoyaleApplicationProject. This implementation is part
- * of FalconJS. For more details on FalconJS see
+ * of RoyaleJS. For more details on RoyaleJS see
  * org.apache.royale.compiler.JSDriver
  */
 public final class MXMLSourceFileHandler implements ISourceFileHandler
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index dfbaf31..f96c613 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -181,7 +181,7 @@ public class GoogDepsWriter {
 			}
 			mainDeps.append(getDependencies(restOfDeps)).append("]);\n");
 			sb.insert(0, mainDeps);
-			sb.insert(0, "// generated by FalconJX\n");
+			sb.insert(0, "// generated by RoyaleJX\n");
 			for (String dep : restOfDeps)
 			{
 				GoogDep gd = depMap.get(dep);
diff --git a/compiler-jx/src/main/resources/downloads.xml b/compiler-jx/src/main/resources/downloads.xml
index d58615b..4676b61 100644
--- a/compiler-jx/src/main/resources/downloads.xml
+++ b/compiler-jx/src/main/resources/downloads.xml
@@ -35,10 +35,10 @@
        risk around caching bad downloads and/or needing to
        clean up the cache -->
 
-  <property name="FALCONJX_HOME" location="${basedir}/../../.."/>
+  <property name="ROYALE_COMPILER_HOME" location="${basedir}/../../.."/>
 
-  <property name="lib.dir" value="${FALCONJX_HOME}/lib"/>
-  <property name="download.dir" value="${FALCONJX_HOME}/in"/>
+  <property name="lib.dir" value="${ROYALE_COMPILER_HOME}/lib"/>
+  <property name="download.dir" value="${ROYALE_COMPILER_HOME}/in"/>
 
   <property file="${basedir}/local.properties"/>
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
index f3bcec6..53211fb 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/as/TestStatements.java
@@ -464,6 +464,6 @@ public class TestStatements extends ASTestBase
                         + "foo: for each(var i:int in obj) break foo;",
                 IFileNode.class);
         asBlockWalker.visitFile(node);
-        assertOut("package {\n\tpublic class FalconTest_A {\n\t\tfunction royaleTest_a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t [...]
+        assertOut("package {\n\tpublic class RoyaleTest_A {\n\t\tfunction royaleTest_a():void {\n\t\t\ttry {\n\t\t\t\ta;\n\t\t\t} catch (e:Error) {\n\t\t\t\tif (a) {\n\t\t\t\t\tif (b) {\n\t\t\t\t\t\tif (c)\n\t\t\t\t\t\t\tb;\n\t\t\t\t\t\telse if (f)\n\t\t\t\t\t\t\ta;\n\t\t\t\t\t\telse\n\t\t\t\t\t\t\te;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} finally {\n\t\t\t}\n\t\t\tif (d)\n\t\t\t\tfor (var i:int = 0; i < len; i++)\n\t\t\t\t\tbreak;\n\t\t\tif (a) {\n\t\t\t\twith (ab) {\n\t\t\t\t\tc();\n\t\t\t\t [...]
     }
 }
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
index 11fc511..3fd051d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogAccessorMembers.java
@@ -41,7 +41,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         IGetterNode node = (IGetterNode) getAccessor("function get foo():int{}");
         asBlockWalker.visitGetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', "
                 + "\n\t{get:function() {\n\t}, configurable:true}\n)");
     }
 
@@ -50,7 +50,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         IGetterNode node = (IGetterNode) getAccessor("function get foo():int{return -1;}");
         asBlockWalker.visitGetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', "
                 + "\n\t{get:function() {\n\t\tvar self = this;\n\t\treturn -1;\n\t}, configurable:true}\n)");
     }
 
@@ -60,7 +60,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         IGetterNode node = (IGetterNode) getAccessor("public function get foo():int{return -1;}");
         asBlockWalker.visitGetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', "
                 + "\n\t{get:function() {\n\t\tvar self = this;\n\t\treturn -1;\n\t}, configurable:true}\n)");
     }
 
@@ -73,7 +73,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
         //                    anonymous function... goog.bind or goog.partial?
         IGetterNode node = (IGetterNode) getAccessor("public override function get foo():int{super.foo(); return -1;}");
         asBlockWalker.visitGetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{get:function() {\n\t\tvar self = this;\n\t\tFalconTest_A.base(this, 'foo');\n\t\treturn -1;\n\t}, configurable:true}\n)");
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', \n\t{get:function() {\n\t\tvar self = this;\n\t\tRoyaleTest_A.base(this, 'foo');\n\t\treturn -1;\n\t}, configurable:true}\n)");
     }
 
     @Override
@@ -82,7 +82,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         IGetterNode node = (IGetterNode) getAccessor("public static function get foo():int{return -1;}");
         asBlockWalker.visitGetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A, \n\t'foo', \n\t{get:function() {\n\t\treturn -1;\n\t}, configurable:true}\n)");
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A, \n\t'foo', \n\t{get:function() {\n\t\treturn -1;\n\t}, configurable:true}\n)");
     }
 
     @Override
@@ -91,7 +91,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{}");
         asBlockWalker.visitSetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
                 + " {\n\t}, configurable:true}\n)");
     }
 
@@ -100,7 +100,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         ISetterNode node = (ISetterNode) getAccessor("function set foo(value:int):void{trace('haai');}");
         asBlockWalker.visitSetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', "
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', "
                 + "\n\t{set:function(value) {\n\t\tvar self = this;\n\t\ttrace('haai');\n\t}, configurable:true}\n)");
     }
 
@@ -110,7 +110,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         ISetterNode node = (ISetterNode) getAccessor("public function set foo(value:int):void{}");
         asBlockWalker.visitSetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', \n\t{set:function(value)"
                 + " {\n\t}, configurable:true}\n)");
     }
 
@@ -121,7 +121,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
         // TODO (erikdebruin) see: testGetAccessor_withNamespaceOverride
         ISetterNode node = (ISetterNode) getAccessor("public override function set foo(value:int):void{super.foo();}");
         asBlockWalker.visitSetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A.prototype, \n\t'foo', \n\t{set:function(value) {\n\t\tvar self = this;\n\t\tFalconTest_A.base(this, 'foo');\n\t}, configurable:true}\n)");
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A.prototype, \n\t'foo', \n\t{set:function(value) {\n\t\tvar self = this;\n\t\tRoyaleTest_A.base(this, 'foo');\n\t}, configurable:true}\n)");
     }
 
     @Override
@@ -130,7 +130,7 @@ public class TestGoogAccessorMembers extends TestAccessorMembers
     {
         ISetterNode node = (ISetterNode) getAccessor("public static function set foo(value:int):void{}");
         asBlockWalker.visitSetter(node);
-        assertOut("Object.defineProperty(\n\tFalconTest_A, \n\t'foo', \n\t{set:function(value) {\n\t}, configurable:true}\n)");
+        assertOut("Object.defineProperty(\n\tRoyaleTest_A, \n\t'foo', \n\t{set:function(value) {\n\t}, configurable:true}\n)");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
index 57548d7..2fb6bfc 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogEmitter.java
@@ -78,7 +78,7 @@ public class TestGoogEmitter extends ASTestBase
     {
         IFunctionNode node = getMethod("function method1():void{\n}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.method1 = function() {\n}");
+        assertOut("RoyaleTest_A.prototype.method1 = function() {\n}");
     }
 
     @Test
@@ -87,7 +87,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(bar:int):int{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} bar\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar) {\n}");
     }
 
     @Test
@@ -96,7 +96,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
 
     @Test
@@ -105,7 +105,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
 
     @Test
@@ -114,7 +114,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{return p1 + p2 + p3 + p4;}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
                 + "\tvar self = this;\n"
                 + "\tp3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
                 + "\tp4 = typeof p4 !== 'undefined' ? p4 : 4;\n"
@@ -127,7 +127,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number=} bar\n * @param {number=} bax\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, bax) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, bax) {\n"
                 + "\tvar self = this;\n"
                 + "\tbar = typeof bar !== 'undefined' ? bar : 42;\n"
                 + "\tbax = typeof bax !== 'undefined' ? bax : 4;\n"
@@ -140,7 +140,7 @@ public class TestGoogEmitter extends ASTestBase
         IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
                 + "\tp3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
                 + "\tp4 = typeof p4 !== 'undefined' ? p4 : 4;\n}");
     }
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
index 02d164a..c62a563 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogExpressions.java
@@ -41,7 +41,7 @@ public class TestGoogExpressions extends TestExpressions
     {
         IFunctionNode node = getMethod("function foo(){if (a) super.foo();}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tFalconTest_A.base(this, 'foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tRoyaleTest_A.base(this, 'foo');\n}");
     }
 
     @Override
@@ -50,7 +50,7 @@ public class TestGoogExpressions extends TestExpressions
     {
         IFunctionNode node = getMethod("function foo(){if (a) super.foo(a, b, c);}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tFalconTest_A.base(this, 'foo', a, b, c);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (a)\n\t\tRoyaleTest_A.base(this, 'foo', a, b, c);\n}");
     }
 
     //----------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
index 21836c1..9bb864d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogFieldMembers.java
@@ -43,7 +43,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("var foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {*}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -52,7 +52,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("var foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -61,7 +61,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Test
@@ -69,7 +69,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("var foo:int = -420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = -420");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = -420");
     }
 
     @Override
@@ -78,7 +78,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("private var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @private\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -88,7 +88,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
         IVariableNode node = getField("mx_internal var foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -97,7 +97,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("protected var foo:Vector.<Foo>;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {Vector.<Foo>}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @protected\n * @type {Vector.<Foo>}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -106,7 +106,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("protected var foo:Vector.<Vector.<Vector.<Foo>>>;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {Vector.<Vector.<Vector.<Foo>>>}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @protected\n * @type {Vector.<Vector.<Vector.<Foo>>>}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -115,7 +115,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("protected var foo:Foo = new Foo('bar', 42);");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {Foo}\n */\nFalconTest_A.prototype.foo = new Foo('bar', 42)");
+        assertOut("/**\n * @protected\n * @type {Foo}\n */\nRoyaleTest_A.prototype.foo = new Foo('bar', 42)");
     }
 
     @Override
@@ -124,7 +124,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("protected var a:int = 4, b:int = 11, c:int = 42;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.c = 42");
+        assertOut("/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.c = 42");
     }
 
     //--------------------------------------------------------------------------
@@ -137,7 +137,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("static const foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {*}\n */\nFalconTest_A.foo");
+        assertOut("/**\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo");
     }
 
     @Test
@@ -145,7 +145,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("const foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {*}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -154,7 +154,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("static const foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo");
     }
 
     @Test
@@ -162,7 +162,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("const foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -171,7 +171,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -179,7 +179,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -188,7 +188,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("private static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -196,7 +196,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
     {
         IVariableNode node = getField("private const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -206,7 +206,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
         IVariableNode node = getField("mx_internal static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -215,7 +215,7 @@ public class TestGoogFieldMembers extends TestFieldMembers
         IVariableNode node = getField("mx_internal const foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     //--------------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
index 4ddfb55..0bf0f4a 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalClasses.java
@@ -46,7 +46,7 @@ public class TestGoogGlobalClasses extends TestGlobalClasses
     {
         IFunctionNode node = getMethod("function a():void {\ttrace(arguments);}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.a = function() {\n\tvar self = this;\n\ttrace(arguments);\n}");
+        assertOut("RoyaleTest_A.prototype.a = function() {\n\tvar self = this;\n\ttrace(arguments);\n}");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
index baa7b66..985df6d 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogGlobalConstants.java
@@ -36,7 +36,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
     {
         IVariableNode node = getField("var a:Number = Infinity;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = Infinity");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = Infinity");
     }
 
     @Override
@@ -45,7 +45,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
     {
         IVariableNode node = getField("var a:Number = -Infinity;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = -Infinity");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = -Infinity");
     }
 
     @Override
@@ -54,7 +54,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
     {
         IVariableNode node = getField("var a:Number = NaN;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {number}\n */\nFalconTest_A.prototype.a = NaN");
+        assertOut("/**\n * @type {number}\n */\nRoyaleTest_A.prototype.a = NaN");
     }
 
     @Override
@@ -63,7 +63,7 @@ public class TestGoogGlobalConstants extends TestGlobalConstants
     {
         IVariableNode node = getField("var a:* = undefined;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @type {*}\n */\nFalconTest_A.prototype.a = undefined");
+        assertOut("/**\n * @type {*}\n */\nRoyaleTest_A.prototype.a = undefined");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
index b733ce3..d297675 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogMethodMembers.java
@@ -41,7 +41,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(){}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n}");
     }
 
     @Override
@@ -50,7 +50,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo():int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @return {number}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
+        assertOut("/**\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
     @Override
@@ -59,7 +59,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
     @Override
@@ -68,7 +68,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
     @Override
@@ -77,7 +77,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String = \"baz\"):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\tbar = typeof bar !== 'undefined' ? bar : \"baz\";\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n\tvar self = this;\n\tbar = typeof bar !== 'undefined' ? bar : \"baz\";\n\treturn -1;\n}");
     }
 
     @Override
@@ -86,7 +86,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String, baz:int = null):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     @Test
@@ -94,7 +94,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String, ...rest):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, rest) {\n\tvar self = this;\n\trest = Array.prototype.slice.call(arguments, 1);\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, rest) {\n\tvar self = this;\n\trest = Array.prototype.slice.call(arguments, 1);\n\treturn -1;\n}");
     }
 
     @Override
@@ -104,7 +104,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
         IFunctionNode node = getMethod("public function foo(bar:String, baz:int = null):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
         // we ignore the 'public' namespace completely
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     @Override
@@ -113,7 +113,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("mx_internal function foo(bar:String, baz:int = null):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     @Override
@@ -125,7 +125,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
         // (erikdebruin) here we actually DO want to declare the method
         //               directly on the 'class' constructor instead of the
         //               prototype!
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.foo = function(bar, baz) {\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     @Override
@@ -134,7 +134,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("public override function foo(bar:String, baz:int = null):int{\treturn -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     @Override
@@ -143,7 +143,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
     //--------------------------------------------------------------------------
@@ -153,9 +153,9 @@ public class TestGoogMethodMembers extends TestMethodMembers
     @Test
     public void testConstructor_withThisInBody()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A() {this.foo;}", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A() {this.foo;}", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\tvar self = this;\n\tthis.foo;\n};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\tvar self = this;\n\tthis.foo;\n};");
     }
 
     @Test
@@ -163,7 +163,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(){this.foo;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tthis.foo;\n}");
+        assertOut("/**\n * @this {RoyaleTest_A}\n */\nRoyaleTest_A.prototype.foo = function() {\n\tvar self = this;\n\tthis.foo;\n}");
     }
 
     @Test
@@ -171,7 +171,7 @@ public class TestGoogMethodMembers extends TestMethodMembers
     {
         IFunctionNode node = getMethod("function foo(){if(true){while(i){this.bar(42);}}}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @this {FalconTest_A}\n */\nFalconTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
+        assertOut("/**\n * @this {RoyaleTest_A}\n */\nRoyaleTest_A.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
                 + "{\n\t\twhile (i) {\n\t\t\tthis.bar(42);\n\t\t}\n\t}\n}");
     }
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
index d9a644e..4017c5c 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/goog/TestGoogStatements.java
@@ -298,7 +298,7 @@ public class TestGoogStatements extends TestStatements
                         + "foo: for each(var i:int in obj) break foo;",
                 IFileNode.class);
         asBlockWalker.visitFile(node);
-        assertOut("goog.provide('FalconTest_A');\n\n/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\nFalconTest_A.prototype.royaleTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\ [...]
+        assertOut("goog.provide('RoyaleTest_A');\n\n/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\nRoyaleTest_A.prototype.royaleTest_a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\ [...]
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
index 54e7cca..e330925 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
@@ -37,9 +37,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
         IClassNode node = (IClassNode) getNode("function get foo():int{}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.get__foo = function() {\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: FalconTest_A.prototype.get__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.get__foo = function() {\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: RoyaleTest_A.prototype.get__foo}}\n);");
     }
 
     @Override
@@ -49,9 +49,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("function get foo():int{return -1;}",
     			IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.get__foo = function() {\n  return -1;\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: FalconTest_A.prototype.get__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.get__foo = function() {\n  return -1;\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: RoyaleTest_A.prototype.get__foo}}\n);");
     }
 
     @Override
@@ -61,9 +61,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("public function get foo():int{return -1;}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.get__foo = function() {\n  return -1;\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: FalconTest_A.prototype.get__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.get__foo = function() {\n  return -1;\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: RoyaleTest_A.prototype.get__foo}}\n);");
     }
 
     @Override
@@ -96,9 +96,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("public static function get foo():int{return -1;}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.get__foo = function() {\n  return -1;\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A, /** @lends {FalconTest_A} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: FalconTest_A.get__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.get__foo = function() {\n  return -1;\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A, /** @lends {RoyaleTest_A} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nget: RoyaleTest_A.get__foo}}\n);");
     }
 
     @Override
@@ -108,9 +108,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("function set foo(value:int):void{}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.set__foo = function(value) {\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: FalconTest_A.prototype.set__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.set__foo = function(value) {\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: RoyaleTest_A.prototype.set__foo}}\n);");
     }
 
     @Override
@@ -120,9 +120,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("function set foo(value:int):void{fetch('haai');}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.set__foo = function(value) {\n  fetch('haai');\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: FalconTest_A.prototype.set__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.set__foo = function(value) {\n  fetch('haai');\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: RoyaleTest_A.prototype.set__foo}}\n);");
     }
 
     @Override
@@ -132,9 +132,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("public function set foo(value:int):void{}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.prototype.set__foo = function(value) {\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: FalconTest_A.prototype.set__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.prototype.set__foo = function(value) {\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: RoyaleTest_A.prototype.set__foo}}\n);");
     }
 
     @Override
@@ -156,9 +156,9 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
     	IClassNode node = (IClassNode) getNode("public static function set foo(value:int):void{}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-				"FalconTest_A.set__foo = function(value) {\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A, /** @lends {FalconTest_A} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: FalconTest_A.set__foo}}\n);");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+				"RoyaleTest_A.set__foo = function(value) {\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A, /** @lends {RoyaleTest_A} */ {\n/**\n  * @export\n  * @type {number} */\nfoo: {\nset: RoyaleTest_A.set__foo}}\n);");
     }
 
     @Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
index df80431..abb45b5 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessors.java
@@ -46,11 +46,11 @@ public class TestRoyaleAccessors extends ASTestBase
                 "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
                 IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n */\nFalconTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n\n" +
-        		"FalconTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
-        		"FalconTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
-        		"label: {\nget: FalconTest_A.prototype.get__label,\nset: FalconTest_A.prototype.set__label}}\n);";
+        String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" +
+        		"RoyaleTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
+        		"RoyaleTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
+        		"label: {\nget: RoyaleTest_A.prototype.get__label,\nset: RoyaleTest_A.prototype.set__label}}\n);";
         assertOut(expected);
     }
 
@@ -76,11 +76,11 @@ public class TestRoyaleAccessors extends ASTestBase
                 "public function doStuff():void {label = label + 'bye'; var theLabel:String = label;}; private var _label:String; public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
                 IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n */\nFalconTest_A.prototype.doStuff = function() {\n  this.label = this.label + 'bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n\n" +
-				"FalconTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
-				"FalconTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
-				"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\nlabel: {\n" +
-				"get: FalconTest_A.prototype.get__label,\nset: FalconTest_A.prototype.set__label}}\n);"; 
+        String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n  this.label = this.label + 'bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" +
+				"RoyaleTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
+				"RoyaleTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
+				"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\nlabel: {\n" +
+				"get: RoyaleTest_A.prototype.get__label,\nset: RoyaleTest_A.prototype.set__label}}\n);"; 
         assertOut(expected);
     }
     
@@ -120,14 +120,14 @@ public class TestRoyaleAccessors extends ASTestBase
                 "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; [Bindable] public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
                 IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n */\nFalconTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n\n" +
-        		"FalconTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
-				"FalconTest_A.prototype.bindable__set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
-        		"FalconTest_A.prototype.set__label = function(value) {\nvar oldValue = this.get__label();\nif (oldValue != value) {\nthis.bindable__set__label(value);\n" +
+        String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" +
+        		"RoyaleTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
+				"RoyaleTest_A.prototype.bindable__set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
+        		"RoyaleTest_A.prototype.set__label = function(value) {\nvar oldValue = this.get__label();\nif (oldValue != value) {\nthis.bindable__set__label(value);\n" +
         		"    this.dispatchEvent(org.apache.royale.events.ValueChangeEvent.createUpdateEvent(\n" +
         		"         this, \"label\", oldValue, value));\n}\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
-        		"label: {\nget: FalconTest_A.prototype.get__label,\nset: FalconTest_A.prototype.set__label}}\n);";
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
+        		"label: {\nget: RoyaleTest_A.prototype.get__label,\nset: RoyaleTest_A.prototype.set__label}}\n);";
         assertOut(expected);
     }
 
@@ -138,11 +138,11 @@ public class TestRoyaleAccessors extends ASTestBase
                 "public function doStuff():void {label = 'hello, bye'; var theLabel:String = label;}; private var _label:String; [Bindable(\"change\")] public function get label():String {return _label}; public function set label(value:String):void {_label = value}; ",
                 IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        String expected = "/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n */\nFalconTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype._label;\n\n\n" +
-				"FalconTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
-				"FalconTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
-        		"Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
-        		"label: {\nget: FalconTest_A.prototype.get__label,\nset: FalconTest_A.prototype.set__label}}\n);";
+        String expected = "/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n */\nRoyaleTest_A.prototype.doStuff = function() {\n  this.label = 'hello, bye';\n  var /** @type {string} */ theLabel = this.label;\n};\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype._label;\n\n\n" +
+				"RoyaleTest_A.prototype.get__label = function() {\n  return this._label;\n};\n\n\n" +
+				"RoyaleTest_A.prototype.set__label = function(value) {\n  this._label = value;\n};\n\n\n" +
+        		"Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n/**\n  * @export\n  * @type {string} */\n" +
+        		"label: {\nget: RoyaleTest_A.prototype.get__label,\nset: RoyaleTest_A.prototype.set__label}}\n);";
         assertOut(expected);
     }
 
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
index 7c61326..d8225cd 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleEmitter.java
@@ -333,7 +333,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{return p1 + p2 + p3 + p4;}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
                 + "  p3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
                 + "  p4 = typeof p4 !== 'undefined' ? p4 : 4;\n"
                 + "  return p1 + p2 + p3 + p4;\n}");
@@ -346,7 +346,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number=} bar\n * @param {number=} bax\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, bax) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, bax) {\n"
                 + "  bar = typeof bar !== 'undefined' ? bar : 42;\n"
                 + "  bax = typeof bax !== 'undefined' ? bax : 4;\n"
                 + "  if (a)\n    foo();\n}");
@@ -359,7 +359,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n"
                 + "  p3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
                 + "  p4 = typeof p4 !== 'undefined' ? p4 : 4;\n}");
     }
@@ -371,7 +371,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("function method1(bar:int):int{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} bar\n * @return {number}\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar) {\n}");
     }
 
     @Override
@@ -381,7 +381,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
 
     @Override
@@ -391,7 +391,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("/**\n * This is copied from ASDoc.\n */\nfunction method1(bar:int, baz:String, goo:Array):void{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * This is copied from ASDoc.\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
 
     @Test
@@ -400,7 +400,7 @@ public class TestRoyaleEmitter extends TestGoogEmitter
         IFunctionNode node = getMethodWithPackage("/** This is copied from ASDoc. */\nfunction method1(bar:int, baz:String, goo:Array):void{\n}");
         asBlockWalker.visitFunction(node);
         assertOut("/** This is copied from ASDoc. \n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n"
-                + "foo.bar.FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
+                + "foo.bar.RoyaleTest_A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
index e3dc0e6..edd2393 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
@@ -85,25 +85,25 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         // getters and setters don't get output until the class is output so you can't just visit the accessorNode
         asBlockWalker.visitClass(node);
         assertOut("/**\n * @constructor\n */\n" + 
-        		  "FalconTest_A = function() {\n" +
+        		  "RoyaleTest_A = function() {\n" +
         		  "};\n\n\n" +
         		  "/**\n" +
         		  " * Prevent renaming of class. Needed for reflection.\n" +
         		  " */\n" +
-        		  "goog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-        		  "FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        		  "goog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+        		  "RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
         		  "  var self = this;\n" +
         		  "  ;\n" +
         		  "  function isDefaultPrevented() {\n" +
         		  "    return defaultPrevented;\n  };\n" +
         		  "  ;\n  \n" +
         		  "};\n\n\n" +
-        		  "FalconTest_A.prototype.get__defaultPrevented = function() {\n" +
-        		  "  return FalconTest_A.superClass_.isDefaultPrevented.apply(this);\n" +
+        		  "RoyaleTest_A.prototype.get__defaultPrevented = function() {\n" +
+        		  "  return RoyaleTest_A.superClass_.isDefaultPrevented.apply(this);\n" +
         		  "};\n\n\n" +
-        		  "Object.defineProperties(FalconTest_A.prototype, /** @lends {FalconTest_A.prototype} */ {\n" +
+        		  "Object.defineProperties(RoyaleTest_A.prototype, /** @lends {RoyaleTest_A.prototype} */ {\n" +
         		  "/**\n  * @export\n  * @type {boolean} */\n" +
-        		  "defaultPrevented: {\nget: FalconTest_A.prototype.get__defaultPrevented}}\n);");
+        		  "defaultPrevented: {\nget: RoyaleTest_A.prototype.get__defaultPrevented}}\n);");
     }
 
     @Override
@@ -112,7 +112,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IFunctionNode node = getMethod("function foo(){if (a) super.foo();}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  if (a)\n    FalconTest_A.superClass_.foo.apply(this);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  if (a)\n    RoyaleTest_A.superClass_.foo.apply(this);\n}");
     }
 
     @Override
@@ -121,22 +121,22 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IFunctionNode node = getMethod("function foo(){if (a) super.foo(a, b, c);}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  if (a)\n    FalconTest_A.superClass_.foo.apply(this, [ a, b, c] );\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  if (a)\n    RoyaleTest_A.superClass_.foo.apply(this, [ a, b, c] );\n}");
     }
     
     @Test
     public void testVisitLanguageIdentifierNode_SuperMethodCustomNamespace()
     {
-        IFunctionNode node = (IFunctionNode)getNode("import flash.utils.Proxy;import flash.utils.flash_proxy;use namespace flash_proxy;public class FalconTest_A extends Proxy { flash_proxy function foo(){if (a) super.setProperty(a, b);}}",
+        IFunctionNode node = (IFunctionNode)getNode("import flash.utils.Proxy;import flash.utils.flash_proxy;use namespace flash_proxy;public class RoyaleTest_A extends Proxy { flash_proxy function foo(){if (a) super.setProperty(a, b);}}",
         					IFunctionNode.class, WRAP_LEVEL_PACKAGE);
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n  if (a)\n    FalconTest_A.superClass_['http://www.adobe.com/2006/actionscript/flash/proxy::setProperty'].apply(this, [ a, b] );\n}");
+        assertOut("/**\n */\nRoyaleTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n  if (a)\n    RoyaleTest_A.superClass_['http://www.adobe.com/2006/actionscript/flash/proxy::setProperty'].apply(this, [ a, b] );\n}");
     }
 
     @Test
     public void testVisitLanguageIdentifierNode_SuperMethodAsFunctionReference()
     {
-        IFileNode node = (IFileNode)getNode("package { public class FalconTest_A extends Base { override public function foo() {var f:Function = super.foo;} } }\n" +
+        IFileNode node = (IFileNode)getNode("package { public class RoyaleTest_A extends Base { override public function foo() {var f:Function = super.foo;} } }\n" +
         		"class Base { public function foo(){} }", IFileNode.class, 0, false);
         IFunctionNode fnode = (IFunctionNode) findFirstDescendantOfType(
                 node, IFunctionNode.class);
@@ -145,13 +145,13 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         IClassDefinition def = classnode.getDefinition();
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitFunction(fnode);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f = org.apache.royale.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
+        assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f = org.apache.royale.utils.Language.closure(RoyaleTest_A.superClass_.foo, this, 'foo');\n}");
     }
     
     @Test
     public void testVisitLanguageIdentifierNode_SuperMethodAsVarFunctionReference()
     {
-    	IFileNode node = (IFileNode)getNode("package { public class FalconTest_A extends Base { override public function foo() {var f:Function; f = super.foo;} } }\n" +
+    	IFileNode node = (IFileNode)getNode("package { public class RoyaleTest_A extends Base { override public function foo() {var f:Function; f = super.foo;} } }\n" +
         		"class Base { public function foo(){} }", IFileNode.class, 0, false);
         IFunctionNode fnode = (IFunctionNode) findFirstDescendantOfType(
                 node, IFunctionNode.class);
@@ -160,13 +160,13 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         IClassDefinition def = classnode.getDefinition();
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitFunction(fnode);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f;\n  f = org.apache.royale.utils.Language.closure(FalconTest_A.superClass_.foo, this, 'foo');\n}");
+        assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function() {\n  var /** @type {Function} */ f;\n  f = org.apache.royale.utils.Language.closure(RoyaleTest_A.superClass_.foo, this, 'foo');\n}");
     }
     
     @Test
     public void testVisitLanguageIdentifierNode_SuperMethodInApply()
     {
-    	IFileNode node = (IFileNode)getNode("package { public class FalconTest_A extends Base { override public function foo() {super.foo.apply(this, [a, b, c]);} } }\n" +
+    	IFileNode node = (IFileNode)getNode("package { public class RoyaleTest_A extends Base { override public function foo() {super.foo.apply(this, [a, b, c]);} } }\n" +
         		"class Base { public function foo(){} }", IFileNode.class, 0, false);
         IFunctionNode fnode = (IFunctionNode) findFirstDescendantOfType(
                 node, IFunctionNode.class);
@@ -175,7 +175,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
         IClassDefinition def = classnode.getDefinition();
         ((JSRoyaleEmitter)asEmitter).getModel().setCurrentClass(def);
         asBlockWalker.visitFunction(fnode);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function() {\n  FalconTest_A.superClass_.foo.apply(this, [a, b, c]);\n}");
+        assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function() {\n  RoyaleTest_A.superClass_.foo.apply(this, [a, b, c]);\n}");
     }
     
     //----------------------------------
@@ -1025,9 +1025,9 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     @Test
     public void testClassCastOfGetter()
     {
-        IFunctionNode node = getMethod("function foo(){var foo:Object = FalconTest_A(bar).bar = '';}; public function get bar():Object { return this; };");
+        IFunctionNode node = getMethod("function foo(){var foo:Object = RoyaleTest_A(bar).bar = '';}; public function get bar():Object { return this; };");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  var /** @type {Object} */ foo = org.apache.royale.utils.Language.as(this.bar, FalconTest_A, true).bar = '';\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  var /** @type {Object} */ foo = org.apache.royale.utils.Language.as(this.bar, RoyaleTest_A, true).bar = '';\n}");
     }
 
     @Test
@@ -1035,7 +1035,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IFunctionNode node = getMethod("function foo(){bar(b).text = '';}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  bar(b).text = '';\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  bar(b).text = '';\n}");
     }
     
     @Test
@@ -1063,7 +1063,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     {
         IFunctionNode node = getMethod("function foo(b:Boolean):Boolean {var c:String; var d:String; if (!(b ? c : d)) { return b;}}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n */\nFalconTest_A.prototype.foo = function(b) {\n  var /** @type {string} */ c;\n  var /** @type {string} */ d;\n  if (!(b ? c : d)) {\n    return b;\n  }\n}");
+        assertOut("/**\n * @param {boolean} b\n * @return {boolean}\n */\nRoyaleTest_A.prototype.foo = function(b) {\n  var /** @type {string} */ c;\n  var /** @type {string} */ d;\n  if (!(b ? c : d)) {\n    return b;\n  }\n}");
     }
 
     @Override
@@ -1073,7 +1073,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
     	IFunctionNode node = (IFunctionNode) getNode("var a = function(){};",
                 IFunctionNode.class);
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        assertOut("RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
         		  "  var self = this;\n" +
         		  "  var /** @type {Function} */ __localFn0__ = function() {\n" +
         		  "  }\n" +
@@ -1089,7 +1089,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "var a:Object = function(foo:int, bar:String = 'goo'):int{return -1;};",
                 IFunctionNode.class);
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        assertOut("RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
       		  "  var self = this;\n" +
       		  "  var /** @type {Function} */ __localFn0__ = function(foo, bar) {\n" +
       		  "    bar = typeof bar !== 'undefined' ? bar : 'goo';\n" +
@@ -1107,7 +1107,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "addListener('foo', function(event:Object):void{doit();})",
                 IFunctionNode.class);
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        assertOut("RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
       		  "  var self = this;\n" +
       		  "  var /** @type {Function} */ __localFn0__ = function(event) {\n" +
       		  "    doit();\n" +
@@ -1123,7 +1123,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "var a:Object = {}; var b:Function = function(foo:Object) { foo.bar = 10 }; var c:Object = b(a);",
                 IFunctionNode.class);
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        assertOut("RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
         		  "  var self = this;\n" +
         		  "  var /** @type {Function} */ __localFn0__ = function(foo) {\n    foo.bar = 10;\n  }\n" +
         		  "  var /** @type {Object} */ a = {};\n" +
@@ -1138,7 +1138,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 "var a:Object = {}; function b(foo:Object) { foo.bar = 10 }; var c:Object = b(a);",
                 IFunctionNode.class);
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        assertOut("RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
         		  "  var self = this;\n" +
         		  "  function b(foo) {\n    foo.bar = 10;\n  };\n" +
         		  "  var /** @type {Object} */ a = {};\n" +
@@ -1153,7 +1153,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 IFunctionNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @export\n */\n" + 
-        		  "FalconTest_A.prototype.foo = function() {\n" +
+        		  "RoyaleTest_A.prototype.foo = function() {\n" +
         		  "  var self = this;\n" +
         		  "  function localFunction() {\n    org.apache.royale.utils.Language.trace(self.bar);\n  };\n" +
         		  "  localFunction();\n}");
@@ -1167,7 +1167,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
                 IFunctionNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitFunction(node);
         assertOut("/**\n * @export\n */\n" + 
-        		  "FalconTest_A.prototype.foo = function() {\n" +
+        		  "RoyaleTest_A.prototype.foo = function() {\n" +
         		  "  org.apache.royale.utils.Language.trace(this.bar);\n}");
     }
     
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
index 8e02f55..7525646 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
@@ -44,7 +44,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("var foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Test
@@ -52,7 +52,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("var foo:String = null;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {string}\n */\nFalconTest_A.prototype.foo = null");
+        assertOut("/**\n * @export\n * @type {string}\n */\nRoyaleTest_A.prototype.foo = null");
     }
 
     @Override
@@ -61,7 +61,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("var foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = 0");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0");
     }
 
     @Override
@@ -70,7 +70,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Test
@@ -78,7 +78,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("var foo:int = -420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = -420");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = -420");
     }
 
     @Test
@@ -96,7 +96,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("private var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @private\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -106,7 +106,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
         IVariableNode node = getField("mx_internal var foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -115,7 +115,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("protected var foo:Vector.<Foo>;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {Array}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @protected\n * @type {Array}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -124,7 +124,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("protected var foo:Vector.<Vector.<Vector.<Foo>>>;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {Array}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @protected\n * @type {Array}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -134,7 +134,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected var foo:Foo = new Foo('bar', 42);",
     			IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = new Foo('bar', 42);\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @type {Foo}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = new Foo('bar', 42);\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @type {Foo}\n */\nRoyaleTest_A.prototype.foo;");
     }
 
     @Test
@@ -142,7 +142,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static var foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {*}\n */\nFalconTest_A.foo");
+        assertOut("/**\n * @export\n * @type {*}\n */\nRoyaleTest_A.foo");
     }
 
     @Test
@@ -150,7 +150,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static var foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.foo = 0");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.foo = 0");
     }
 
     @Test
@@ -158,7 +158,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -167,7 +167,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected var foo:Array = [ 'foo' ]",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = ['foo'];\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @type {Array}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = ['foo'];\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @type {Array}\n */\nRoyaleTest_A.prototype.foo;");
     }
     
     @Test
@@ -176,7 +176,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected var foo:Object = { 'foo': 'bar' }",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = {'foo':'bar'};\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @type {Object}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = {'foo':'bar'};\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @type {Object}\n */\nRoyaleTest_A.prototype.foo;");
     }
     
     @Test
@@ -185,7 +185,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("import flash.utils.flash_proxy;use namespace flash_proxy;public static var foo:Object = initFoo(); flash_proxy static function initFoo():Object { return null; }",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n * @type {Object}\n */\nFalconTest_A.foo;\n\n\n/**\n * @return {Object}\n */\nFalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"] = function() {\n  return null;\n};\n\nFalconTest_A.foo = FalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/p [...]
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n * @type {Object}\n */\nRoyaleTest_A.foo;\n\n\n/**\n * @return {Object}\n */\nRoyaleTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"] = function() {\n  return null;\n};\n\nRoyaleTest_A.foo = RoyaleTest_A[\"http://www.adobe.com/2006/actionscript/flash/p [...]
     }
     
     @Test
@@ -194,7 +194,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("static public var foo:Object = { 'foo': 'bar' }",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @export\n * @type {Object}\n */\nFalconTest_A.foo = {'foo':'bar'};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @export\n * @type {Object}\n */\nRoyaleTest_A.foo = {'foo':'bar'};");
     }
     
     @Test
@@ -203,7 +203,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected var foo:Number = parseFloat('1E2')",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = parseFloat('1E2');\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = parseFloat('1E2');\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.foo;");
     }
     
     @Test
@@ -212,7 +212,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("private static var empty:Function = function():void {}",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @type {Function}\n */\nFalconTest_A.empty = function() {\n};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @type {Function}\n */\nRoyaleTest_A.empty = function() {\n};");
     }
     
     @Override
@@ -221,7 +221,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("protected var a:int = 4, b:int = 11, c:int = 42;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nFalconTest_A.prototype.c = 42");
+        assertOut("/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.a = 4;\n\n/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.b = 11;\n\n/**\n * @protected\n * @type {number}\n */\nRoyaleTest_A.prototype.c = 42");
     }
 
     //--------------------------------------------------------------------------
@@ -234,7 +234,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static const foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.foo");
+        assertOut("/**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo");
     }
 
     @Test
@@ -242,7 +242,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("const foo;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.prototype.foo");
+        assertOut("/**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo");
     }
 
     @Override
@@ -251,7 +251,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static const foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 0");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 0");
     }
 
     @Test
@@ -259,7 +259,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("const foo:int;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 0");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0");
     }
 
     @Override
@@ -268,7 +268,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -276,7 +276,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("static const foo:Number = parseFloat('1E2');");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = parseFloat('1E2')");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = parseFloat('1E2')");
     }
 
     @Test
@@ -284,7 +284,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Test
@@ -293,7 +293,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected const foo:Number = parseFloat('1E2');",
     			IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = parseFloat('1E2');\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = parseFloat('1E2');\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo;");
     }
     
     @Test
@@ -302,7 +302,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected const foo:Array = [ 'foo' ]",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = ['foo'];\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {Array}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = ['foo'];\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {Array}\n */\nRoyaleTest_A.prototype.foo;");
     }
     
     @Test
@@ -311,7 +311,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     	IClassNode node = (IClassNode) getNode("protected const foo:Object = { 'foo': 'bar' }",
         		IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n\nthis.foo = {'foo':'bar'};\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {Object}\n */\nFalconTest_A.prototype.foo;");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n\nthis.foo = {'foo':'bar'};\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @protected\n * @const\n * @type {Object}\n */\nRoyaleTest_A.prototype.foo;");
     }
 
     @Override
@@ -320,7 +320,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("private static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -328,7 +328,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
     {
         IVariableNode node = getField("private const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @private\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 
     @Override
@@ -338,7 +338,7 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
         IVariableNode node = getField("mx_internal static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420");
     }
 
     @Test
@@ -347,6 +347,6 @@ public class TestRoyaleFieldMembers extends TestGoogFieldMembers
         IVariableNode node = getField("mx_internal const foo:int = 420;");
         asBlockWalker.visitVariable(node);
         // (erikdebruin) we ignore custom namespaces completely (are there side effects I'm missing?)
-        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420");
+        assertOut("/**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420");
     }
 }
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
index 961bc29..8bb2efc 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java
@@ -63,7 +63,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
     {
         IFunctionNode node = getMethod("function a():void {  trace(arguments);}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.a = function() {\n  org.apache.royale.utils.Language.trace(arguments);\n}");
+        assertOut("RoyaleTest_A.prototype.a = function() {\n  org.apache.royale.utils.Language.trace(arguments);\n}");
     }
 
     @Test
@@ -453,7 +453,7 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses
         VariableNode node = (VariableNode)getNode("private static function get txtStr():String { return 'foo'; }; private function test() { var a:XML = <text><content>{txtStr}</content></text>;}",
         							 VariableNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitVariable(node);
-        assertOut("var /** @type {XML} */ a = new XML( '<text><content>' + FalconTest_A[\"txtStr\"] + '</content></text>')");
+        assertOut("var /** @type {XML} */ a = new XML( '<text><content>' + RoyaleTest_A[\"txtStr\"] + '</content></text>')");
     }
     
     @Test
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
index f56493d..e2151a3 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalConstants.java
@@ -43,7 +43,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
     {
         IVariableNode node = getField("var a:Number = Infinity;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.a = Infinity");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.a = Infinity");
     }
 
     @Override
@@ -52,7 +52,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
     {
         IVariableNode node = getField("var a:Number = -Infinity;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.a = -Infinity");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.a = -Infinity");
     }
 
     @Override
@@ -61,7 +61,7 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
     {
         IVariableNode node = getField("var a:Number = NaN;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.a = NaN");
+        assertOut("/**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.a = NaN");
     }
 
     @Override
@@ -70,6 +70,6 @@ public class TestRoyaleGlobalConstants extends TestGoogGlobalConstants
     {
         IVariableNode node = getField("var a:* = undefined;");
         asBlockWalker.visitVariable(node);
-        assertOut("/**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.a = undefined");
+        assertOut("/**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.a = undefined");
     }
 }
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
index 1e96ded..e7e215b 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleJSX.java
@@ -33,7 +33,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n}");
     }
 
     @Test
@@ -41,7 +41,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
     }
 
     @Test
@@ -49,7 +49,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div />}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
     }
 
     @Test
@@ -57,7 +57,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"foo\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -65,7 +65,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div\nid=\"foo\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -73,7 +73,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div\r\nid=\"foo\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -81,7 +81,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div\tid=\"foo\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -89,7 +89,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"foo\" className=\"bar\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo', 'className': 'bar' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo', 'className': 'bar' });\n}");
     }
 
     @Test
@@ -97,7 +97,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\'foo\'/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -105,7 +105,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"'\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': '\\\'' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': '\\\'' });\n}");
     }
 
     @Test
@@ -113,7 +113,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div data-prop=\"foo\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'data-prop': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'data-prop': 'foo' });\n}");
     }
 
     @Test
@@ -121,7 +121,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div className=\"foo bar\"/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'className': 'foo bar' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'className': 'foo bar' });\n}");
     }
 
     @Test
@@ -129,7 +129,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div className=\'foo bar\'/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'className': 'foo bar' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'className': 'foo bar' });\n}");
     }
 
     @Test
@@ -137,7 +137,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id={2}/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 2 });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 2 });\n}");
     }
 
     @Test
@@ -145,7 +145,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id={2 + 2}/>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 2 + 2 });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 2 + 2 });\n}");
     }
 
     @Test
@@ -153,7 +153,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div></div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null);\n}");
     }
 
     @Test
@@ -161,7 +161,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>Foo</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
     }
 
     @Test
@@ -170,7 +170,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, new lines are removed
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\nFoo\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
     }
 
     @Test
@@ -179,7 +179,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, spaces are only removed after a new line, so these are kept!
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>Foo   bar</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo   bar');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo   bar');\n}");
     }
 
     @Test
@@ -188,7 +188,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, spaces are only removed after a new line, so these are kept!
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>   Foo   </div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, '   Foo   ');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, '   Foo   ');\n}");
     }
 
     @Test
@@ -197,7 +197,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, new lines are removed
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\r\nFoo\r\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
     }
 
     @Test
@@ -206,7 +206,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, whitespace is removed after a new line, so the tab isn't kept
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\n\tFoo\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
     }
 
     @Test
@@ -215,7 +215,7 @@ public class TestRoyaleJSX extends ASTestBase
         //in JSX, whitespace is removed after a new line, so the spaces aren't kept
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\n    Foo\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo');\n}");
     }
 
     @Test
@@ -223,7 +223,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>{2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2);\n}");
     }
 
     @Test
@@ -231,7 +231,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>{2 + 2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2 + 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2 + 2);\n}");
     }
 
     @Test
@@ -239,7 +239,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>Foo {2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo ', 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 'Foo ', 2);\n}");
     }
 
     @Test
@@ -247,7 +247,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>{2} Foo</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2, ' Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null, 2, ' Foo');\n}");
     }
 
     @Test
@@ -255,7 +255,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"foo\"></div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' });\n}");
     }
 
     @Test
@@ -263,7 +263,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"foo\" className=\"bar\"></div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo', 'className': 'bar' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo', 'className': 'bar' });\n}");
     }
 
     @Test
@@ -271,7 +271,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div id=\"foo\">Foo</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' }, 'Foo');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', { 'id': 'foo' }, 'Foo');\n}");
     }
 
     @Test
@@ -279,7 +279,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div><button/></div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
     }
 
     @Test
@@ -287,7 +287,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>  \t<button/>   \t   </div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
     }
 
     @Test
@@ -295,7 +295,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\t<button/>   Hello</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello');\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello');\n}");
     }
 
     @Test
@@ -303,7 +303,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\t<button/>   Hello   {2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello   ', 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello   ', 2);\n}");
     }
 
     @Test
@@ -311,7 +311,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\t<button></button>   Hello   {2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello   ', 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   Hello   ', 2);\n}");
     }
 
     @Test
@@ -319,7 +319,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\t<button/>   {2}</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   ', 2);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null), '   ', 2);\n}");
     }
 
     @Test
@@ -327,7 +327,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\n<button/>\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
     }
 
     @Test
@@ -335,7 +335,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {return <div>\r\n\t<button/>\r\n</div>}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement('div', null,\n    React.createElement('button', null));\n}");
     }
 
     @Test
@@ -343,7 +343,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {\n  import flash.events.EventDispatcher;\n  return <EventDispatcher/>;\n}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, null);\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, null);\n}");
     }
 
     @Test
@@ -351,7 +351,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {\n  import flash.events.EventDispatcher;\n  return <EventDispatcher id=\"hello\"/>;\n}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { id: 'hello' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { id: 'hello' });\n}");
     }
 
     @Test
@@ -359,7 +359,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {\n  import flash.events.EventDispatcher;\n  return <EventDispatcher ref=\"hello\"/>;\n}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { 'ref': 'hello' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { 'ref': 'hello' });\n}");
     }
 
     @Test
@@ -367,7 +367,7 @@ public class TestRoyaleJSX extends ASTestBase
     {
         IFunctionNode node = getMethod("[JSX]\nfunction foo() {\n  import flash.events.EventDispatcher;\n  return <EventDispatcher key=\"hello\"/>;\n}");
         asBlockWalker.visitFunction(node);
-        assertOut("FalconTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { 'key': 'hello' });\n}");
+        assertOut("RoyaleTest_A.prototype.foo = function() {\n  return React.createElement(flash.events.EventDispatcher, { 'key': 'hello' });\n}");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
index 814b93d..d4fe796 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleMethodMembers.java
@@ -38,7 +38,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo():int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @return {number}\n */\nFalconTest_A.prototype.foo = function() {\n  return -1;\n}");
+        assertOut("/**\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function() {\n  return -1;\n}");
     }
 
     @Override
@@ -47,7 +47,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n  return -1;\n}");
+        assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n  return -1;\n}");
     }
 
     @Override
@@ -56,7 +56,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n  return -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n  return -1;\n}");
     }
 
     @Override
@@ -65,7 +65,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String = \"baz\"):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar) {\n  bar = typeof bar !== 'undefined' ? bar : \"baz\";\n  return -1;\n}");
+        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar) {\n  bar = typeof bar !== 'undefined' ? bar : \"baz\";\n  return -1;\n}");
     }
 
     @Override
@@ -74,15 +74,15 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String, baz:int = null):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     @Test
     public void testMethod_withDefaultParameterComplexTypeReturnType()
     {
-        IFunctionNode node = getMethodWithPackage("static const BAR:String = 'bar'; function foo(bar:String = FalconTest_A.BAR):int{  return -1;}");
+        IFunctionNode node = getMethodWithPackage("static const BAR:String = 'bar'; function foo(bar:String = RoyaleTest_A.BAR):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nfoo.bar.FalconTest_A.prototype.foo = function(bar) {\n  bar = typeof bar !== 'undefined' ? bar : foo.bar.FalconTest_A.BAR;\n  return -1;\n}");
+        assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nfoo.bar.RoyaleTest_A.prototype.foo = function(bar) {\n  bar = typeof bar !== 'undefined' ? bar : foo.bar.RoyaleTest_A.BAR;\n  return -1;\n}");
     }
 
     @Override
@@ -91,7 +91,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("function foo(bar:String, ...rest):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, rest) {\n  rest = Array.prototype.slice.call(arguments, 1);\n  return -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, rest) {\n  rest = Array.prototype.slice.call(arguments, 1);\n  return -1;\n}");
     }
 
     @Override
@@ -100,7 +100,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("import flash.utils.flash_proxy;flash_proxy function foo(bar:String, baz:int = null):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     //--------------------------------------------------------------------------
@@ -111,51 +111,51 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     @Test
     public void testConstructor_withThisInBody()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){this.foo();}; private function foo():String{return '';};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){this.foo();}; private function foo():String{return '';};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n  this.foo();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n  return '';\n};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n  this.foo();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function() {\n  return '';\n};");
     }
 
     @Test
     public void testConstructor_withImplicitThisInBody()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){foo();}; private function foo():String{return '';};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){foo();}; private function foo():String{return '';};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n  this.foo();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n  return '';\n};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n  this.foo();\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function() {\n  return '';\n};");
     }
 
     @Override
     @Test
     public void testMethod_withThisInBody()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private var baz:String; private function foo():String{return this.baz;};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){}; private var baz:String; private function foo():String{return this.baz;};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-         assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype.baz;\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n  return this.baz;\n};");
+         assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype.baz;\n\n\n/**\n * @private\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function() {\n  return this.baz;\n};");
     }
 
     @Test
     public void testMethod_withImplicitThisInBody()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private var baz:String; private function foo():String{return baz;};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){}; private var baz:String; private function foo():String{return baz;};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-         assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @type {string}\n */\nFalconTest_A.prototype.baz;\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n  return this.baz;\n};");
+         assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @type {string}\n */\nRoyaleTest_A.prototype.baz;\n\n\n/**\n * @private\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function() {\n  return this.baz;\n};");
     }
 
     @Override
     @Test
     public void testMethod_withThisInBodyComplex()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private function foo(value:int):String{return value;}; private function bar():String{if(true){while(i){return this.foo(42);}}};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){}; private function foo(value:int):String{return value;}; private function bar():String{if(true){while(i){return this.foo(42);}}};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nFalconTest_A.prototype.foo = function(value) {\n  return value;\n};\n\n\n/**\n * @private\n * @return {string}\n */\nFalconTest_A.prototype.bar = function() {\n  if (true) {\n    while (i) {\n      return this.foo(42);\n  [...]
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function(value) {\n  return value;\n};\n\n\n/**\n * @private\n * @return {string}\n */\nRoyaleTest_A.prototype.bar = function() {\n  if (true) {\n    while (i) {\n      return this.foo(42);\n  [...]
     }
 
     @Test
     public void testMethod_withImplicitThisInBodyComplex()
     {
-        IClassNode node = (IClassNode) getNode("public function FalconTest_A(){}; private function foo(value:int):String{return value;}; private function bar():void{if(true){while(i){foo(42);}}};", IClassNode.class, WRAP_LEVEL_CLASS);
+        IClassNode node = (IClassNode) getNode("public function RoyaleTest_A(){}; private function foo(value:int):String{return value;}; private function bar():void{if(true){while(i){foo(42);}}};", IClassNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nFalconTest_A.prototype.foo = function(value) {\n  return value;\n};\n\n\n/**\n * @private\n */\nFalconTest_A.prototype.bar = function() {\n  if (true) {\n    while (i) {\n      this.foo(42);\n    }\n  }\n};");
+        assertOut("/**\n * @constructor\n */\nRoyaleTest_A = function() {\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n/**\n * @private\n * @param {number} value\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function(value) {\n  return value;\n};\n\n\n/**\n * @private\n */\nRoyaleTest_A.prototype.bar = function() {\n  if (true) {\n    while (i) {\n      this.foo(42);\n    }\n  }\n};");
     }
 
     @Override
@@ -165,7 +165,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
         IFunctionNode node = getMethod("public function foo(bar:String, baz:int = null):int{  return -1;}");
         asBlockWalker.visitFunction(node);
         // we ignore the 'public' namespace completely
-        assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     @Override
@@ -177,7 +177,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
         // (erikdebruin) here we actually DO want to declare the method
         //               directly on the 'class' constructor instead of the
         //               prototype!
-        assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nRoyaleTest_A.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     @Override
@@ -186,7 +186,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("public override function foo(bar:String, baz:int = null):int{  return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     @Override
@@ -195,7 +195,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
+        assertOut("/**\n * @export\n * @override\n */\nRoyaleTest_A.prototype.foo = function(bar, baz) {\n  baz = typeof baz !== 'undefined' ? baz : null;\n  return -1;\n}");
     }
 
     @Test
@@ -203,7 +203,7 @@ public class TestRoyaleMethodMembers extends TestGoogMethodMembers
     {
         IFunctionNode node = getMethod("public function foo():String{const A:String = 'Hello World'; return A;}");
         asBlockWalker.visitFunction(node);
-        assertOut("/**\n * @export\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n  \n/**\n * @const\n * @type {string}\n */\nvar A = 'Hello World';\n  return A;\n}");
+        assertOut("/**\n * @export\n * @return {string}\n */\nRoyaleTest_A.prototype.foo = function() {\n  \n/**\n * @const\n * @type {string}\n */\nvar A = 'Hello World';\n  return A;\n}");
     }
 
     @Override
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
index a46d97a..0ca6e1e 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleStatements.java
@@ -55,7 +55,7 @@ public class TestRoyaleStatements extends TestGoogStatements
         ILiteralNode node = (ILiteralNode) getNode("static const myConst:int; function royaleTest_a():Object { return { myConst : myConst } }",
         		ILiteralNode.class, WRAP_LEVEL_CLASS);
         asBlockWalker.visitLiteral(node);
-        assertOut("{myConst:FalconTest_A.myConst}");
+        assertOut("{myConst:RoyaleTest_A.myConst}");
     }
     
     @Test
@@ -502,21 +502,21 @@ public class TestRoyaleStatements extends TestGoogStatements
                 IFileNode.class);
         asBlockWalker.visitFile(node);
         assertOutWithMetadata("/**\n" +
-        		              " * FalconTest_A\n" +
+        		              " * RoyaleTest_A\n" +
         		              " *\n" +
         		              " * @fileoverview\n" +
         		              " *\n" +
         		              " * @suppress {checkTypes|accessControls}\n" +
         		              " */\n" +
         		              "\n" +
-        		              "goog.provide('FalconTest_A');\n" +
+        		              "goog.provide('RoyaleTest_A');\n" +
         		              "\n\n\n" +
         		              "/**\n" +
         		              " * @constructor\n" +
         		              " */\n" +
-        		              "FalconTest_A = function() {\n" +
-        		              "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('FalconTest_A', FalconTest_A);\n\n\n" +
-        		              "FalconTest_A.prototype.royaleTest_a = function() {\n" +
+        		              "RoyaleTest_A = function() {\n" +
+        		              "};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n */\ngoog.exportSymbol('RoyaleTest_A', RoyaleTest_A);\n\n\n" +
+        		              "RoyaleTest_A.prototype.royaleTest_a = function() {\n" +
         		              "  var self = this;\n" +
         		              "  var /** @type {Function} */ __localFn0__ = function(foo, bar) {\n" +
             		          "    bar = typeof bar !== 'undefined' ? bar : 'goo';\n" +
@@ -584,7 +584,7 @@ public class TestRoyaleStatements extends TestGoogStatements
         		              " *\n" +
         		              " * @type {Object.<string, Array.<Object>>}\n" +
         		              " */\n" +
-        		              "FalconTest_A.prototype.ROYALE_CLASS_INFO = { names: [{ name: 'FalconTest_A', qName: 'FalconTest_A', kind: 'class' }] };\n" +
+        		              "RoyaleTest_A.prototype.ROYALE_CLASS_INFO = { names: [{ name: 'RoyaleTest_A', qName: 'RoyaleTest_A', kind: 'class' }] };\n" +
         		          		"\n" +
         		        		"\n" +
         		        		"\n" +
@@ -593,7 +593,7 @@ public class TestRoyaleStatements extends TestGoogStatements
         		        		" *\n" +
         		        		" * @return {Object.<string, Function>}\n" +
         		        		" */\n" +
-        		        		"FalconTest_A.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
+        		        		"RoyaleTest_A.prototype.ROYALE_REFLECTION_INFO = function () {\n" +
         		        		"return {\n" +
                                 "  variables: function () {return {};},\n" +
                                 "  accessors: function () {return {};},\n" +
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
index 545bbf5..45badb6 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/sourcemaps/TestSourceMapFieldMembers.java
@@ -32,7 +32,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("var foo;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.foo
+        ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
         assertMapping(node, 0, 4, 4, 0, 4, 26);  // foo
     }
 
@@ -41,7 +41,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("var foo:String = null;");
         asBlockWalker.visitVariable(node);
-        //**\n * @export\n * @type {string}\n */\nFalconTest_A.prototype.foo = null
+        //**\n * @export\n * @type {string}\n */\nRoyaleTest_A.prototype.foo = null
         assertMapping(node, 0, 4, 4, 0, 4, 26);  // foo
         assertMapping(node, 0, 14, 4, 26, 4, 29);  // =
         assertMapping(node, 0, 17, 4, 29, 4, 33);  // null
@@ -52,7 +52,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("var foo:int;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = 0
+        ///**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
         assertMapping(node, 0, 4, 4, 0, 4, 26);  // foo
     }
 
@@ -61,7 +61,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("var foo = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.foo = 420
+        ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
         assertMapping(node, 0, 4, 4, 0, 4, 26);  // foo
         assertMapping(node, 0, 7, 4, 26, 4, 29);  // =
         assertMapping(node, 0, 10, 4, 29, 4, 32);  // 420
@@ -72,7 +72,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420
+        ///**\n * @export\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
         assertMapping(node, 0, 4, 4, 0, 4, 26);  // foo
         assertMapping(node, 0, 11, 4, 26, 4, 29);  // =
         assertMapping(node, 0, 14, 4, 29, 4, 32);  // 420
@@ -83,7 +83,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static var foo;");
         asBlockWalker.visitVariable(node);
-        ////**\n * @export\n * @type {*}\n */\nFalconTest_A.foo
+        ////**\n * @export\n * @type {*}\n */\nRoyaleTest_A.foo
         assertMapping(node, 0, 11, 4, 0, 4, 16);  // foo
     }
 
@@ -92,7 +92,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static var foo:int;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {number}\n */\nFalconTest_A.foo = 0
+        ///**\n * @export\n * @type {number}\n */\nRoyaleTest_A.foo = 0
         assertMapping(node, 0, 11, 4, 0, 4, 16);  // foo
     }
 
@@ -101,7 +101,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static var foo = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {*}\n */\nFalconTest_A.foo = 420
+        ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.foo = 420
         assertMapping(node, 0, 11, 4, 0, 4, 16);   // foo
         assertMapping(node, 0, 14, 4, 16, 4, 19);  // =
         assertMapping(node, 0, 17, 4, 19, 4, 22);  // 420
@@ -112,7 +112,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static var foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @type {number}\n */\nFalconTest_A.foo = 420
+        ///**\n * @export\n * @type {number}\n */\nRoyaleTest_A.foo = 420
         assertMapping(node, 0, 11, 4, 0, 4, 16);  // foo
         assertMapping(node, 0, 18, 4, 16, 4, 19);  // =
         assertMapping(node, 0, 21, 4, 19, 4, 22);  // 420
@@ -123,7 +123,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("const foo;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.prototype.foo
+        ///**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
         assertMapping(node, 0, 6, 5, 0, 5, 26);  // foo
     }
 
@@ -132,7 +132,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("const foo:int;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 0
+        ///**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 0
         assertMapping(node, 0, 6, 5, 0, 5, 26);  // foo
     }
 
@@ -141,7 +141,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("const foo = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.prototype.foo = 420
+        ///**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.prototype.foo = 420
         assertMapping(node, 0, 6, 5, 0, 5, 26);  // foo
         assertMapping(node, 0, 9, 5, 26, 5, 29);  // =
         assertMapping(node, 0, 12, 5, 29, 5, 32);  // 420
@@ -152,7 +152,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.prototype.foo = 420
+        ///**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.prototype.foo = 420
         assertMapping(node, 0, 6, 5, 0, 5, 26);  // foo
         assertMapping(node, 0, 13, 5, 26, 5, 29);  // =
         assertMapping(node, 0, 16, 5, 29, 5, 32);  // 420
@@ -163,7 +163,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static const foo;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.foo
+        ///**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo
         assertMapping(node, 0, 13, 5, 0, 5, 16);  // foo
     }
 
@@ -172,7 +172,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static const foo:int;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 0
+        ///**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 0
         assertMapping(node, 0, 13, 5, 0, 5, 16);  // foo
     }
 
@@ -181,7 +181,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static const foo = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {*}\n */\nFalconTest_A.foo = 420
+        ///**\n * @export\n * @const\n * @type {*}\n */\nRoyaleTest_A.foo = 420
         assertMapping(node, 0, 13, 5, 0, 5, 16);  // foo
         assertMapping(node, 0, 16, 5, 16, 5, 19);  // =
         assertMapping(node, 0, 19, 5, 19, 5, 22);  // 420
@@ -192,7 +192,7 @@ public class TestSourceMapFieldMembers extends SourceMapTestBase
     {
         IVariableNode node = getField("static const foo:int = 420;");
         asBlockWalker.visitVariable(node);
-        ///**\n * @export\n * @const\n * @type {number}\n */\nFalconTest_A.foo = 420
+        ///**\n * @export\n * @const\n * @type {number}\n */\nRoyaleTest_A.foo = 420
         assertMapping(node, 0, 13, 5, 0, 5, 16);  // foo
         assertMapping(node, 0, 20, 5, 16, 5, 19);  // =
         assertMapping(node, 0, 23, 5, 19, 5, 22);  // 420
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
index e867305..7875c87 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/sourcemaps/TestSourceMapMXMLScript.java
@@ -44,7 +44,7 @@ public class TestSourceMapMXMLScript extends RoyaleSourceMapTestBase
         String definitionName = definition.getQualifiedName();
         assertTrue(definitionName.startsWith(getClass().getSimpleName()));
         int endColumn = definitionName.length() + 14;
-        ///**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.foo
+        ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
         assertMapping(node, 0, 4, 48, 0, 48, endColumn);  // foo
     }
 
@@ -62,7 +62,7 @@ public class TestSourceMapMXMLScript extends RoyaleSourceMapTestBase
         String definitionName = definition.getQualifiedName();
         assertTrue(definitionName.startsWith(getClass().getSimpleName()));
         int nameEndColumn = definitionName.length() + 14;
-        ///**\n * @export\n * @type {*}\n */\nFalconTest_A.prototype.foo
+        ///**\n * @export\n * @type {*}\n */\nRoyaleTest_A.prototype.foo
         assertMapping(node, 0, 9, 44, 0, 44, nameEndColumn);  // foo
         assertMapping(node, 0, 0, 44, nameEndColumn, 44, nameEndColumn + 11);  // = function
         assertMapping(node, 0, 12, 44, nameEndColumn + 11, 44, nameEndColumn + 12);  // (
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
index 32df58b..c8cb270 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/ASTestBase.java
@@ -106,7 +106,7 @@ public class ASTestBase extends TestBase
             code = "function royaleTest_a():void {" + code + "}";
 
         if (wrapLevel >= WRAP_LEVEL_CLASS)
-            code = "public class FalconTest_A {" + code + "}";
+            code = "public class RoyaleTest_A {" + code + "}";
 
         if (wrapLevel >= WRAP_LEVEL_PACKAGE)
             code = "package" + ((includePackage) ? " foo.bar" : "") + " {"
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 dc122a7..ec0dd5b 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
@@ -203,7 +203,7 @@ public class TestBase implements ITestBase
     			continue;
     		if (problem.toString().equals("No externally-visible definition with the name 'externals.as.classes.uint' was found."))
     			continue;
-    		if (problem.toString().equals("An externally-visible definition with the name 'FalconTest_A' was unexpectedly found."))
+    		if (problem.toString().equals("An externally-visible definition with the name 'RoyaleTest_A' was unexpectedly found."))
     			continue;
     		if (problem.toString().startsWith("No externally-visible definition with the name 'TestRoyaleGlobalFunctions"))
     			continue;
diff --git a/compiler-jx/src/test/resources/externals/app1/as_src/Main.as b/compiler-jx/src/test/resources/externals/app1/as_src/Main.as
index 17d7186..3e133cd 100644
--- a/compiler-jx/src/test/resources/externals/app1/as_src/Main.as
+++ b/compiler-jx/src/test/resources/externals/app1/as_src/Main.as
@@ -25,7 +25,7 @@ public class Main
 	{
 		var button:Element = document.createElement("button");
         button.onclick = function ():void {
-            alert("Hello browser from FalconJX!");
+            alert("Hello browser from Royale!");
         };
         button.textContent = "Say Hello";
         document.body.appendChild(button);
diff --git a/compiler-jx/src/test/resources/royale/projects/circular_proto/index_result.html b/compiler-jx/src/test/resources/royale/projects/circular_proto/index_result.html
index 80c7d8e..0497c15 100644
--- a/compiler-jx/src/test/resources/royale/projects/circular_proto/index_result.html
+++ b/compiler-jx/src/test/resources/royale/projects/circular_proto/index_result.html
@@ -24,7 +24,7 @@ limitations under the License.
 	<link rel="stylesheet" type="text/css" href="A.css">
 	<script type="text/javascript" src="./library/closure/goog/base.js"></script>
 	<script type="text/javascript">
-// generated by FalconJX
+// generated by Royale
 goog.addDependency('../../../A.js', ['A'], ['E']);
 goog.addDependency('../../../E.js', ['E'], ['C']);
 goog.addDependency('../../../F.js', ['F'], ['D']);
diff --git a/compiler-test-utils/build.xml b/compiler-test-utils/build.xml
index 8acad74..71a27f6 100644
--- a/compiler-test-utils/build.xml
+++ b/compiler-test-utils/build.xml
@@ -34,8 +34,6 @@
         <path location="${basedir}"/>
     </pathconvert>
     
-    <property name="FALCON_HOME" value="${basedir}/../compiler"/>
-    
     <!-- Properties can be overridden locally by loading a local.properties file -->
     <!-- Java 8 users probably need javadoc.params=-Xdoclint:none -->
     <property file="${compiler-test-utils}/local.properties"/>
diff --git a/compiler/README b/compiler/README
deleted file mode 100644
index 627c4ec..0000000
--- a/compiler/README
+++ /dev/null
@@ -1,109 +0,0 @@
-Apache Royale - Falcon Compiler
-=============================
-
-    Apache Royale is an application framework for easily building Flash-based applications 
-    for mobile devices, the browser and desktop.
-    
-    For detailed information about Apache Royale please visit 
-    http://royale.apache.org
-
-    Apache Royale is a large project with many pieces.  The framework is implemented
-    in ActionScript and the compiler is implemented in Java.  The Falcon Compiler is
-    a new compiler for ActionScript and MXML.
-
-Getting the latest sources via Git
-==================================
-
-    You can always get the latest source via Git using the following
-    command to clone Apache's royale-compiler repository:
-
-    git clone https://github.com/apache/royale-compiler.git
-
-    This command will create a royale-compiler directory inside the current directory.
-    
-Building The Apache Royale Falcon Compiler
-========================================
-
-    The Apache Royale Falcon Compiler requires some build tools which must be installed
-    prior to building and it depends on some external software which
-    are downloaded as part of the build process.  See the Software Dependencies
-    section for more information on the external software dependencies.
-        
-Install Prerequisites
----------------------
-
-    Before building the Falcon Compiler you must install the following software and set the
-    corresponding environment variables using absolute file paths.  Relative file paths
-    will result in build errors.
-	    
-    ==================================================================================
-    SOFTWARE                                    ENVIRONMENT VARIABLE (absolute paths)
-    ==================================================================================
-    
-    Java SDK 1.5 (0_13 or greater)              JAVA_HOME
-    or Java SDK 1.6 (*1)
-    
-    Ant 1.7.0 or greater (*1)                   ANT_HOME
-    
-    Cygwin, git bash 
-    or other unix-like shell
-    (if Windows)
-    
-    JFlex (*2)                                  JFLEX_JAR 
-    
-    ==================================================================================
-        
-    *1) The bin directories for ANT_HOME and JAVA_HOME should be added to your PATH.
-        
-        On Windows, set PATH to
-            
-            PATH=%PATH%;%ANT_HOME%\bin;%JAVA_HOME%\bin
-            
-        On the Mac (bash), set PATH to
-            
-            export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin"
-    
-    *2) JFlex can be downloaded from:
-                http://jflex.de/download.html
-        
-        Download the the package and expand it.  Set JFLEX_JAR to the absolute 
-        path of the JFlex.jar file.
-               
-
-Software Dependencies
----------------------
-
-    Apache Royale uses third-party code that will be downloaded as part of the Falcon
-    Compiler build.   
-    
-    The Apache Version 2.0 license is in the LICENSE file.  
-    
-    The following dependencies have licenses which are, or are compatible with, the Apache 
-    Version 2.0 license.  You will not be prompted to acknowledge the download.  The jars 
-    are installed in the lib folder.
-    
-        antlr - http://www.antlr.org/download/antlr-3.3-complete.jar
-        commons-cli - http://archive.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz
-        commons-io - http://archive.apache.org/dist/commons/io/binaries/commons-io-2.0.1-bin.tar.gz
-        guava - http://guava-libraries.googlecode.com/files/guava-r08.zip
- 
-    The following dependency has a license which considers reciprocal licenses so you 
-    will be prompted to acknowledge the license before the software is downloaded to your 
-    system. These files are also installed in the lib folder.
-        
-        JBurg - http://downloads.sourceforge.net/project/jburg/jburg-1.10.1.tar.gz
-            
-        This software is released under the Commons Public License:
-        <http://www.opensource.org/licenses/cpl1.0.php>
-            
-    The following dependency is in the public domain
-
-        lzma-sdk - http://downloads.sourceforge.net/project/sevenzip/LZMA%20SDK/lzma920.tar.bz2 
-        
-	A jar is created from the sources in this download.            
-       
-
-Thanks for using Apache Royale.
-
-                                          The Apache Royale Project
-                                          <http://royale.apache.org>
diff --git a/compiler/build.xml b/compiler/build.xml
index be3c863..59bcd4d 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -26,8 +26,7 @@
         PROPERTIES
 
     -->
-    <property name="FALCON_HOME" location="${basedir}"/>
-
+    
     <!-- The 'compiler' property is the absolute path, with forward slashes, -->
     <!-- to the 'compiler' directory that contains this file. -->
     <!-- All input paths are expressed as absolute paths starting with ${compiler}. -->
@@ -45,7 +44,7 @@
     <property name="javadoc.params" value="" />
     
     <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/lib directory -->
-    <!-- where a Falcon SDK is built -->
+    <!-- where a Royale SDK is built -->
     <!-- All output paths are expressed as absolute paths starting with ${sdk} -->
     <property name="sdk" value="${compiler}/lib"/>
 
@@ -698,9 +697,9 @@
 
     -->
 	
-	<target name="sdk" depends="jar" description="Builds a Falcon SDK"/>
+	<target name="sdk" depends="jar" description="Builds a Royale SDK"/>
 
-    <target name="main" depends="sdk" description="Default target - Builds a Falcon SDK">
+    <target name="main" depends="sdk" description="Default target - Builds a Royale SDK">
         <tstamp>
             <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa"/>
         </tstamp>
diff --git a/compiler/src/assembly/scripts/compc b/compiler/src/assembly/scripts/compc
index 8883487..bbbc77a 100755
--- a/compiler/src/assembly/scripts/compc
+++ b/compiler/src/assembly/scripts/compc
@@ -24,12 +24,12 @@
 # In Windows Command Prompt, use compc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Falcon codebase: $FALCON_HOME
+    echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
 if [ "x${FLEX_HOME}" = "x" ]
@@ -52,7 +52,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 	FLEX_HOME=`cygpath -m $FLEX_HOME`
 
 elif [ $OS = "Unix" ]; then
@@ -68,4 +68,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "${FALCON_HOME}/lib/compiler-compc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$ROYALE_COMPILER_HOME" -Dflexlib="$FLEX_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 6b233fd..46123be 100644
--- a/compiler/src/assembly/scripts/compc.bat
+++ b/compiler/src/assembly/scripts/compc.bat
@@ -24,9 +24,9 @@ rem
 
 setlocal
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%/frameworks" -jar "%FALCON_HOME%\lib\compiler-compc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%/frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-compc.jar" %*
 
diff --git a/compiler/src/assembly/scripts/fdb b/compiler/src/assembly/scripts/fdb
index c79ecfd..811635d 100755
--- a/compiler/src/assembly/scripts/fdb
+++ b/compiler/src/assembly/scripts/fdb
@@ -24,12 +24,12 @@
 # In Windows Command Prompt, use fasc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Falcon codebase: $FALCON_HOME
+    echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
 case `uname` in
@@ -44,7 +44,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -59,4 +59,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${FALCON_HOME}/lib/fdb.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${ROYALE_COMPILER_HOME}/lib/fdb.jar" "$@"
diff --git a/compiler/src/assembly/scripts/mxmlc b/compiler/src/assembly/scripts/mxmlc
index 2b5948d..7e819a9 100755
--- a/compiler/src/assembly/scripts/mxmlc
+++ b/compiler/src/assembly/scripts/mxmlc
@@ -24,12 +24,12 @@
 # In Windows Command Prompt, use mxmlc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Falcon codebase: $FALCON_HOME
+    echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
 if [ "x${FLEX_HOME}" = "x" ]
@@ -52,7 +52,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 	FLEX_HOME=`cygpath -m $FLEX_HOME`
 
 elif [ $OS = "Unix" ]; then
@@ -68,4 +68,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "${FALCON_HOME}/lib/compiler-mxmlc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$ROYALE_COMPILER_HOME" -Dflexlib="$FLEX_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 acadf7d..d46755b 100644
--- a/compiler/src/assembly/scripts/mxmlc.bat
+++ b/compiler/src/assembly/scripts/mxmlc.bat
@@ -24,10 +24,10 @@ rem
 
 setlocal
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\compiler-mxmlc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-mxmlc.jar" %*
 
 
diff --git a/compiler/src/assembly/scripts/optimizer b/compiler/src/assembly/scripts/optimizer
index eb8edb1..b7c68e7 100755
--- a/compiler/src/assembly/scripts/optimizer
+++ b/compiler/src/assembly/scripts/optimizer
@@ -24,12 +24,12 @@
 # OSX, Unix, or Cygwin. In Windows Command Prompt, use foptimizer.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Falcon codebase: $FALCON_HOME
+    echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
 case `uname` in
@@ -44,7 +44,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -59,4 +59,4 @@ fi
 
 VMARGS="-Xms32m -Xmx512m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${FALCON_HOME}/lib/compiler-optimizer.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${ROYALE_COMPILER_HOME}/lib/compiler-optimizer.jar" "$@"
diff --git a/compiler/src/assembly/scripts/swcdepends b/compiler/src/assembly/scripts/swcdepends
index 2d55227..2838227 100755
--- a/compiler/src/assembly/scripts/swcdepends
+++ b/compiler/src/assembly/scripts/swcdepends
@@ -24,12 +24,12 @@
 # In Windows Command Prompt, use fasc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Royale Compiler codebase: $FALCON_HOME
+    echo Using Royale Compiler codebase: $ROYALE_COMPILER_HOME
 fi
 
 if [ "x${ROYALE_HOME}" = "x" ]
@@ -52,7 +52,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_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 -Droyalelib="$ROYALE_HOME/frameworks" -jar "${FALCON_HOME}/lib/royale-swcdepends.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/royale-swcdepends.jar" "$@"
diff --git a/compiler/src/assembly/scripts/swcdepends.bat b/compiler/src/assembly/scripts/swcdepends.bat
index 0b97215..1f2d585 100644
--- a/compiler/src/assembly/scripts/swcdepends.bat
+++ b/compiler/src/assembly/scripts/swcdepends.bat
@@ -24,8 +24,8 @@ rem
 
 setlocal
 
-if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..) else echo Using Falcon codebase: %FALCON_HOME%
+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%
 
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%FALCON_HOME%\lib\royale-swcdepends.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%ROYALE_COMPILER_HOME%" -Dflexlib="%FLEX_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\royale-swcdepends.jar" %*
diff --git a/compiler/src/assembly/scripts/swfdump b/compiler/src/assembly/scripts/swfdump
index 35f24e5..e4d6364 100755
--- a/compiler/src/assembly/scripts/swfdump
+++ b/compiler/src/assembly/scripts/swfdump
@@ -24,12 +24,12 @@
 # In Windows Command Prompt, use fasc.bat instead.
 #
 
-if [ "x${FALCON_HOME}" = "x" ]
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
 then
     SCRIPT_HOME=`dirname "$0"`
-    FALCON_HOME=${SCRIPT_HOME}/..
+    ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
 else
-    echo Using Falcon codebase: $FALCON_HOME
+    echo Using Royale codebase: $ROYALE_COMPILER_HOME
 fi
 
 case `uname` in
@@ -44,7 +44,7 @@ D32=''
 
 if [ $OS = "Windows" ]; then
 
-	FALCON_HOME=`cygpath -m $FALCON_HOME`
+	ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
 
 elif [ $OS = "Unix" ]; then
 
@@ -59,4 +59,4 @@ fi
 
 VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${FALCON_HOME}/lib/compiler-swfdump.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -jar "${ROYALE_COMPILER_HOME}/lib/compiler-swfdump.jar" "$@"
diff --git a/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g b/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
index a545527..6a38b55 100644
--- a/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
+++ b/compiler/src/main/antlr/org/apache/royale/compiler/internal/parsing/as/ASParser.g
@@ -2016,7 +2016,7 @@ restrictedNamePart returns [IdentifierNode id]
     exception catch [NoViableAltException ex] { id = expectingIdentifier(ex); }
 
 /**
- * Keep legacy rule for Falcon-JS.
+ * Keep legacy rule for transpiling.
  */
 typedNameOrStar returns [ExpressionNodeBase n]
     :    n=type
diff --git a/compiler/src/main/java/org/apache/royale/compiler/asdoc/package.html b/compiler/src/main/java/org/apache/royale/compiler/asdoc/package.html
index b8dee32..e9d1e70 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/asdoc/package.html
+++ b/compiler/src/main/java/org/apache/royale/compiler/asdoc/package.html
@@ -24,7 +24,7 @@ This package contains interfaces related to ASDoc,
 the documentation system for AS and MXML APIs.
 
 <p>
-The ASDoc subsystem is not currently implemented in Falcon.
+The ASDoc subsystem is not currently implemented in Royale.
 These interfaces provide the basis for a future implementation,
 which would support the production of HTML ASDoc files,
 the production and use of DITA files inside SWCs,
diff --git a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
index 1edda0d..e6627fb 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/clients/FalconToolGroup.java
@@ -22,12 +22,12 @@ package org.apache.royale.compiler.clients;
 import org.apache.flex.tools.AbstractFlexToolGroup;
 
 /**
- * FlexToolGroup exposing the implementations of the Falcon compilers tools.
+ * FlexToolGroup exposing the implementations of the Royale compilers tools.
  */
-public class FalconToolGroup extends AbstractFlexToolGroup {
+public class RoyaleToolGroup extends AbstractFlexToolGroup {
 
-    public FalconToolGroup() {
-        super("Falcon");
+    public RoyaleToolGroup() {
+        super("Royale");
         addFlexTool(new COMPC());
         addFlexTool(new MXMLC());
         addFlexTool(new Optimizer());
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 ae704c4..aa90faa 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
@@ -669,7 +669,7 @@ public class Configurator implements ICompilerSettings, IConfigurator, ICompiler
     }
 
     /**
-     * Setup {@code -compatibility-version} level. Falcon only support Flex 3+.
+     * Setup {@code -compatibility-version} level. Royale only support Flex 3+.
      * @param project 
      */
     protected void setupCompatibilityVersion(RoyaleProject project)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/ABCGeneratingReducer.java b/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/ABCGeneratingReducer.java
index 8ede778..8a75b10 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/ABCGeneratingReducer.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/ABCGeneratingReducer.java
@@ -1589,7 +1589,7 @@ public class ABCGeneratingReducer
         currentScope.getMethodBodySemanticChecker().checkCompoundAssignment(iNode, member, assign_opcode);
 
         //  TODO: Depending on the resolution of ASC-4159 and 
-        //  the corresponding Falcon backwards compatibility
+        //  the corresponding Royale backwards compatibility
         //  issue, cache the stem expression in a local to avoid
         //  multiple evaluations.
         result.addAll(replicate(stem));
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
index 9da478f..9ebf0b9 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
@@ -545,7 +545,7 @@ public class FunctionDefinition extends ScopedDefinitionBase implements IFunctio
         return super.isTopLevelDefinition();
     }
 
-    // TODO Remove everything below here when Falcon has been integrated into Fb and Fc.
+    // TODO Remove everything below here when Royale has been integrated into Fb and Fc.
 
     @Override
     public boolean matches(DefinitionBase definition)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
index 1017d60..ea0bba4 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
@@ -186,7 +186,7 @@ public abstract class NamespaceDefinition extends DefinitionBase implements INam
      * <p>
      * The distinction between file private namespaces and regular private
      * namespaces is purely for the benefit of code model clients. Once we have
-     * implemented type analysis in Falcon, CM clients may not need this
+     * implemented type analysis in Royale, CM clients may not need this
      * distinction anymore.
      * 
      * @return A new file private namespace definition.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/VariableDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/VariableDefinition.java
index 6527c56..d350ec0 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/VariableDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/VariableDefinition.java
@@ -117,7 +117,7 @@ public class VariableDefinition extends DefinitionBase implements IVariableDefin
         return null;
     }
 
-    // TODO Remove everything below here when Falcon has been integrated into Fb and Fc.
+    // TODO Remove everything below here when Royale has been integrated into Fb and Fc.
 
     /**
      * Gets the {@link DependencyType} that should be used when resolving the
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
index 663c9ac..14885d6 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLData.java
@@ -709,7 +709,7 @@ public class MXMLData implements IMXMLData
      * 
      * @param offset test offset
      * @return unit that contains (or immediately follows) the offset A few
-     * subtleties: In Falcon we have endeavored to preserve the existing
+     * subtleties: In Royale we have endeavored to preserve the existing
      * definition of "nearest", so that for a given MXML file, royale will find
      * the same "nearest" unit.
      */
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLScopeBuilder.java b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
index 690d3db..4e452f5 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
@@ -399,7 +399,7 @@ public class MXMLScopeBuilder
         // actually turns out to be a property/style/event tag
         // once the MXML AST has been built, but in these cases
         // the spurious import will simply cause an ambiguous
-        // identifier problem in Falcon whereas the old compiler
+        // identifier problem in Royale whereas the old compiler
         // would have compiled the code without error.
         String qname = fileScope.resolveTagToQualifiedName(tag);
         if (qname != null)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/ASScope.java b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/ASScope.java
index 5e95e39..434a2d9 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/ASScope.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/ASScope.java
@@ -1025,7 +1025,7 @@ public abstract class ASScope extends ASScopeBase
 
     /**
      * This is the core <code>findproperty()</code> method. It implements the
-     * equivalent of the <code>findprop</code> AVM instruction in Falcon.
+     * equivalent of the <code>findprop</code> AVM instruction in Royale.
      * <p>
      * The algorithm searches up the scope chain, starting with this scope, for
      * definitions with the specified base name and namespace set.
@@ -1063,7 +1063,7 @@ public abstract class ASScope extends ASScopeBase
 
     /**
      * This is the implementation of the various <code>findproperty()</code> methods. It implements the
-     * equivalent of the <code>findprop</code> AVM instruction in Falcon.
+     * equivalent of the <code>findprop</code> AVM instruction in Royale.
      * <p>
      * The algorithm searches up the scope chain, starting with this scope, for
      * definitions with the specified base name.
@@ -1256,7 +1256,7 @@ public abstract class ASScope extends ASScopeBase
 
     /**
      * This is the core findproperty method. This method implements the
-     * equivalent of the findprop AVM instruction in Falcon.
+     * equivalent of the findprop AVM instruction in Royale.
      * 
      * @param project {@link ICompilerProject} whose symbol table is used to
      * resolve namespace references in the "use namespace" set this scope.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/LinkageChecker.java b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/LinkageChecker.java
index 36870d5..b418526 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/targets/LinkageChecker.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/targets/LinkageChecker.java
@@ -127,7 +127,7 @@ public class LinkageChecker
             {
                 // Don't allow embed units to be extern'd. Rely on the class
                 // containing the embed to either pull in or extern the embed.
-                // Falcon is different from the old compiler in that embed
+                // Royale is different from the old compiler in that embed
                 // compilation units generated from files in a SWC have
                 // their qname associated with the SWC. This led to 
                 // externing the embed compilation unit when the SWC was on
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 dab7318..dc16fc9 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
@@ -338,7 +338,7 @@ public abstract class RoyaleTarget
             infoEntries++;
         }
         
-        // mark this SWF as being built with Falcon
+        // mark this SWF as being built with Royale
         info.addInstruction(ABCConstants.OP_pushstring, "isMXMLC");
         info.addInstruction(ABCConstants.OP_pushfalse);
         infoEntries++;
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
index bd672cc..72f87ce 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLInstanceNode.java
@@ -215,7 +215,7 @@ class MXMLInstanceNode extends MXMLClassReferenceNodeBase implements IMXMLInstan
         if (value == null)
             value = "";
 
-        // Falcon trims this attribute even though the old compiler didn't.
+        // Royale trims this attribute even though the old compiler didn't.
         MXMLDialect mxmlDialect = builder.getMXMLDialect();
         value = mxmlDialect.trim(value);
 
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLReparentNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLReparentNode.java
index a2a0dad..b0e1c98 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLReparentNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLReparentNode.java
@@ -108,7 +108,7 @@ class MXMLReparentNode extends MXMLNodeBase implements IMXMLReparentNode
     {
         MXMLDialect mxmlDialect = builder.getMXMLDialect();
 
-        // Falcon trims this attribute even though the old compiler didn't.
+        // Royale trims this attribute even though the old compiler didn't.
         String value = attribute.getRawValue();
         value = mxmlDialect.trim(value);
 
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/units/ResourceBundleCompilationUnit.java b/compiler/src/main/java/org/apache/royale/compiler/internal/units/ResourceBundleCompilationUnit.java
index a6a39c4..c13129f 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/units/ResourceBundleCompilationUnit.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/units/ResourceBundleCompilationUnit.java
@@ -572,7 +572,7 @@ public class ResourceBundleCompilationUnit extends CompilationUnitBase
      *          
      *          override protected function getContent():Object { 
      *              return {
-     *                      "name": "Falcon",
+     *                      "name": "Royale",
      *                      "version": "1.0", 
      *                      "motto": "Awesome '{0}' ever.", 
      *                      "classref": org.apache.royale.foo 
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 cff9e2a..c07d291 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/package.html
+++ b/compiler/src/main/java/org/apache/royale/compiler/package.html
@@ -20,10 +20,10 @@
 <html>
 <body>
 
-This package and its subpackages contain the Falcon compiler.
+This package and its subpackages contain the Royale compiler.
 
 <p>
-The Falcon compiler compiles Flex code consisting of <code>.mxml</code>
+The Royale compiler compiles Flex 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>
@@ -44,8 +44,8 @@ and SWC formats. However, these support libraries are independent of the compile
 </p>
 
 <p>
-Falcon is a large body of code but it is organized around ten core concepts,
-with a subpackage for each one:
+The Royale Compiler is a large body of code but it is organized around ten core 
+concepts, with a subpackage for each one:
 </p>
 
 <table border="1" cellspacing="0" cellpadding="3">
diff --git a/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetProgressMonitor.java b/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetProgressMonitor.java
index 1751a80..90e3590 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetProgressMonitor.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/targets/ITargetProgressMonitor.java
@@ -20,7 +20,7 @@
 package org.apache.royale.compiler.targets;
 
 /**
- * Interface that clients of Falcon can implement to receive progress
+ * Interface that clients of Royale can implement to receive progress
  * information as an ITarget compiles.
  * <p>
  * The same ITargetProgressMonitor instance may be added to any number of
diff --git a/compiler/src/main/java/org/apache/royale/compiler/workspaces/IWorkspaceProfilingDelegate.java b/compiler/src/main/java/org/apache/royale/compiler/workspaces/IWorkspaceProfilingDelegate.java
index c3ebb4c..e3bda44 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/workspaces/IWorkspaceProfilingDelegate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/workspaces/IWorkspaceProfilingDelegate.java
@@ -22,7 +22,7 @@ package org.apache.royale.compiler.workspaces;
 import org.apache.royale.compiler.units.ICompilationUnit;
 
 /**
- * Interface that clients of Falcon can implement to record profile data about
+ * Interface that clients of Royale can implement to record profile data about
  * what operation are executed on what compilation units and how long those
  * operations took.
  * <p>
diff --git a/compiler/src/main/java/org/apache/royale/compiler/workspaces/package.html b/compiler/src/main/java/org/apache/royale/compiler/workspaces/package.html
index 5216c68..f4e9232 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/workspaces/package.html
+++ b/compiler/src/main/java/org/apache/royale/compiler/workspaces/package.html
@@ -24,8 +24,8 @@ This package contains classes and interface related to <i>workspaces</i>,
 which cache project-independent information.
 
 <p>
-A <i>workspace</i> is the highest-level concept of the Falcon compiler.
-To use Falcon APIs, you start with a workspace and use it to create
+A <i>workspace</i> is the highest-level concept of the Royale compiler.
+To use Royale APIs, you start with a workspace and use it to create
 one or more projects.
 Information which is not specific to a particular project
 gets stored in the workspace, where it can be accessed by any project.
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 bcf373b..5d56842 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
@@ -312,8 +312,8 @@ public class StAXCatalogWriter implements ICatalogXMLConstants
     {
         xmlWriter.writeStartElement(TAG_FEATURES);
         {
-            // Like the pre-Falcon compiler,
-            // Falcon unconditionally writes out script dependencies.
+            // Like the pre-Royale compiler,
+            // Royale unconditionally writes out script dependencies.
             xmlWriter.writeEmptyElement(TAG_FEATURE_SCRIPT_DEPS);
             
             if (!swc.getComponents().isEmpty())
diff --git a/compiler/src/main/java/org/apache/royale/utils/ArgumentUtil.java b/compiler/src/main/java/org/apache/royale/utils/ArgumentUtil.java
index eaaffcd..fdd9de8 100644
--- a/compiler/src/main/java/org/apache/royale/utils/ArgumentUtil.java
+++ b/compiler/src/main/java/org/apache/royale/utils/ArgumentUtil.java
@@ -29,7 +29,7 @@ import java.util.Collection;
 
 public class ArgumentUtil {
 
-    // workaround for Falcon bug.
+    // workaround for Royale bug.
     // Input files with relative paths confuse the algorithm that extracts the root class name.
     public static String[] fixArgs(final String[] args) {
         String[] newArgs = args;
diff --git a/compiler/src/main/jburg/org/apache/royale/compiler/internal/as/codegen/CmcPatterns.jbg b/compiler/src/main/jburg/org/apache/royale/compiler/internal/as/codegen/CmcPatterns.jbg
index 0a7105d..b463099 100644
--- a/compiler/src/main/jburg/org/apache/royale/compiler/internal/as/codegen/CmcPatterns.jbg
+++ b/compiler/src/main/jburg/org/apache/royale/compiler/internal/as/codegen/CmcPatterns.jbg
@@ -18,7 +18,7 @@
  */
 
 /*
- *  Tree parsing patterns for the ASTs generated by the Falcon parser.
+ *  Tree parsing patterns for the ASTs generated by the Royale parser.
  */
 
 /*
diff --git a/compiler/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon b/compiler/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon
index f906c80..06c43b7 100644
--- a/compiler/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon
+++ b/compiler/src/main/jflex/org/apache/royale/compiler/internal/parsing/as/skeleton.falcon
@@ -238,7 +238,7 @@
     return zzMarkedPos-zzStartRead;
   }
   
-  //////////////////////Start Falcon additions///////////////////////////////
+  //////////////////////Start Royale additions///////////////////////////////
   
   /**
    * returns the start of the current read
@@ -288,7 +288,7 @@
     zzMarkedPos = zzStartRead + 1;
   }
 
-//////////////////////End Falcon additions///////////////////////////////
+//////////////////////End Royale additions///////////////////////////////
 
   /**
    * Reports an error that occured while scanning.
diff --git a/compiler/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup b/compiler/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup
index d66144d..293cf04 100644
--- a/compiler/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup
+++ b/compiler/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup
@@ -14,4 +14,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-org.apache.royale.compiler.clients.FalconToolGroup
\ No newline at end of file
+org.apache.royale.compiler.clients.RoyaleToolGroup
\ No newline at end of file
diff --git a/compiler/src/main/resources/downloads.xml b/compiler/src/main/resources/downloads.xml
index 03b10a5..68ac274 100644
--- a/compiler/src/main/resources/downloads.xml
+++ b/compiler/src/main/resources/downloads.xml
@@ -39,20 +39,20 @@
        risk around caching bad downloads and/or needing to
        clean up the cache -->
 
-  <property name="FALCON_HOME" location="${basedir}/../../.."/>
+  <property name="ROYALE_COMPILER_HOME" location="${basedir}/../../.."/>
 
-  <property name="lib.dir" value="${FALCON_HOME}/lib"/>
-  <property name="external.lib.dir" value="${FALCON_HOME}/lib/external"/>
-  <property name="download.dir" value="${FALCON_HOME}/in"/>
+  <property name="lib.dir" value="${ROYALE_COMPILER_HOME}/lib"/>
+  <property name="external.lib.dir" value="${ROYALE_COMPILER_HOME}/lib/external"/>
+  <property name="download.dir" value="${ROYALE_COMPILER_HOME}/in"/>
 
-  <property file="${FALCON_HOME}/local.properties"/>
+  <property file="${ROYALE_COMPILER_HOME}/local.properties"/>
 
   <property name="maven.search.url" value="https://repo1.maven.org/maven2"/>
 
-  <property file="${FALCON_HOME}/env.properties"/>
+  <property file="${ROYALE_COMPILER_HOME}/env.properties"/>
   <property environment="env"/>
-  <property file="${FALCON_HOME}/local.properties"/>
-  <property file="${FALCON_HOME}/build.properties"/>
+  <property file="${ROYALE_COMPILER_HOME}/local.properties"/>
+  <property file="${ROYALE_COMPILER_HOME}/build.properties"/>
 
 
   <!--
@@ -493,19 +493,19 @@
     </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>
 
 
diff --git a/compiler/src/main/resources/overview.html b/compiler/src/main/resources/overview.html
index 7005279..3765fd0 100644
--- a/compiler/src/main/resources/overview.html
+++ b/compiler/src/main/resources/overview.html
@@ -20,7 +20,7 @@
 <html>
 <body>
 
-This is the documentation for the Falcon compiler and its supporting libraries.
+This is the documentation for the Royale compiler and its supporting libraries.
 <p>
 The code is organized into six top-level packages:
 <p>
@@ -31,7 +31,7 @@ The code is organized into six top-level packages:
   	</tr>
 	<tr>
     	<td><code>org.apache.royale.compiler</code></td>
-    	<td>The Falcon compiler</td>
+    	<td>The Royale compiler</td>
   	</tr>
 	<tr>
     	<td><code>org.apache.royale.swc</code></td>
diff --git a/debugger/src/main/jburg/flash/tools/debugger/expression/CmcPatterns.jbg b/debugger/src/main/jburg/flash/tools/debugger/expression/CmcPatterns.jbg
index 0a7105d..81407c3 100644
--- a/debugger/src/main/jburg/flash/tools/debugger/expression/CmcPatterns.jbg
+++ b/debugger/src/main/jburg/flash/tools/debugger/expression/CmcPatterns.jbg
@@ -18,7 +18,7 @@
  */
 
 /*
- *  Tree parsing patterns for the ASTs generated by the Falcon parser.
+ *  Tree parsing patterns for the ASTs generated by the Royale Compiler parser.
  */
 
 /*
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index f1f112c..6e74cec 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -46,7 +46,7 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
 
     <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler directory -->
-    <!-- where a Falcon SDK is built -->
+    <!-- where a Royale SDK is built -->
     <!-- All output paths are expressed as absolute paths starting with ${sdk} -->
     <property name="sdk" value="${compiler}"/>
 
@@ -228,9 +228,9 @@
     <target name="jar" depends="downloads, oem.jar, compc.jar"
     	    description="Creates JAR files"/>
 	    	
-	<target name="sdk" depends="jar" description="Builds a Falcon SDK"/>
+	<target name="sdk" depends="jar" description="Builds a Royale SDK"/>
 
-    <target name="main" depends="sdk" description="Default target - Builds a Falcon SDK and builds Falcon Javadoc">
+    <target name="main" depends="sdk" description="Default target - Builds a Royale SDK and builds Royale Javadoc">
         <tstamp>
             <format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa"/>
         </tstamp>
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
deleted file mode 100644
index e65c449..0000000
--- a/installer.properties/en_US.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-##
-##  Licensed to the Apache Software Foundation (ASF) under one or more
-##  contributor license agreements.  See the NOTICE file distributed with
-##  this work for additional information regarding copyright ownership.
-##  The ASF licenses this file to You 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.
-##
-################################################################################
-
-
-download.compiler.deps=Downloading Falcon library dependencies...
-download.compiler.jx.deps=Downloading FalconJX library dependencies...
\ No newline at end of file
diff --git a/installer.xml b/installer.xml
deleted file mode 100644
index 09d852e..0000000
--- a/installer.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You 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.
-
--->
-
-<project name="royale_compiler_install" default="overlay" basedir=".">
-
-	<!-- this script supports the usingDownloadCache property and
-	     downloadCacheFolder property to cache downloads in the
-		 folder specified by downloadCacheFolder.  This can make
-		 a huge difference in future runs although there is some
-		 risk around caching bad downloads and/or needing to
-		 clean up the cache -->
-		 
-    <property name="COMPILER_HOME" location="${basedir}"/>
-    
-    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
-    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
-    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
-    <condition property="local.d32" value="-d32">
-        <and>
-            <os family="windows"/>
-            <equals arg1="${sun.arch.data.model}" arg2="64"/>
-            <equals arg1="${os.arch}" arg2="x86_64"/>
-            <equals arg1="${ant.java.version}" arg2="1.6"/>
-        </and>
-    </condition>
-
-    <property file="${COMPILER_HOME}/env.properties"/>
-    <property environment="env"/>
-    <property file="${COMPILER_HOME}/local.properties"/>
-    <property file="${COMPILER_HOME}/build.properties"/>
-    <property file="${COMPILER_HOME}/installer.properties/${bundle}.properties"/>
-    <property file="${COMPILER_HOME}/installer.properties/en_US.properties"/>
-
-    <!-- assumes Royale Compiler expanded two levels deep in a Royale SDK folder -->
-    <condition property="ROYALE_HOME" value="${basedir}/../.." >
-        <available file="${basedir}/../../lib/mxmlc.jar" />
-    </condition>
-    <!-- assumes Royale Compiler expanded into the temp folder in a Royale SDK folder -->
-    <condition property="ROYALE_HOME" value="${basedir}/.." >
-        <available file="${basedir}/../lib/mxmlc.jar" />
-    </condition>
-    <!-- assumes Royale Compiler expanded into the temp folder in a Royale SDK folder -->
-    <condition property="install.jx" value="true" >
-        <available file="${basedir}/compiler-jx" type="dir" />
-    </condition>
-    
-    <fail message="ROYALE_HOME not specified. Environment variable not used." >
-        <condition>
-            <not>
-                <isset property="ROYALE_HOME" />
-            </not>
-        </condition>
-    </fail>
-    
-    <condition property="platform" value="mac">
-        <os family="mac" />
-    </condition>
-    <condition property="platform" value="windows">
-        <os family="windows" />
-    </condition>
-    <condition property="platform" value="linux">
-        <os family="unix" />
-    </condition>
-    <condition property="isMac" value="mac">
-        <os family="mac" />
-    </condition>
-    <condition property="isWindows" value="windows">
-        <os family="windows" />
-    </condition>
-    <condition property="isLinux" value="linux">
-        <os family="unix" />
-    </condition>
-    
-    <target name="overlay" depends="movefiles,download,copyfiles,copy.jx.lib,download.jx,copyfiles.jx" description="Places Royale Compiler files in an SDK folder">
-        <echo>Royale Compiler installed in ${ROYALE_HOME}</echo>
-    </target>
-    
-    <target name="download" description="download compiler dependencies">
-        <echo>${download.compiler.deps}</echo>
-        <property name="COMPILER_HOME" value="${ROYALE_HOME}" />
-        <ant dir="${basedir}/compiler/src/main/resources" antfile="downloads.xml"/>
-    </target>
-    
-    <target name="download.jx" if="install.jx" description="download Royale Transpiler dependencies">
-        <echo>${download.compiler.jx.deps}</echo>
-        <property name="TRANSPILER_HOME" value="${ROYALE_HOME}/js" />
-        <ant dir="${basedir}/compiler-jx/src/main/resources" antfile="downloads.xml"/>
-    </target>
-    
-    <target name="copy.jx.lib" if="install.jx" description="copy our bundled GCC before running download.jx so we don't download GCC">
-        <property name="TRANSPILER_HOME" value="${ROYALE_HOME}/js" />
-        <mkdir dir="${ROYALE_HOME}/js/lib/google/closure-compiler" />
-    </target>
-    
-    <target name="movefiles" description="move SDK files into -legacy folders" unless="royale">
-        <mkdir dir="${ROYALE_HOME}/lib-legacy" />
-        <move todir="${ROYALE_HOME}/lib-legacy" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${ROYALE_HOME}/lib">
-                <include name="**/*"/>
-            </fileset>
-        </move>
-    </target>
-    
-    <target name="copyfiles" description="copy Royale Compiler files into SDK" >
-        <!-- If sdk.branch is set to binary distro royaleTasks is in a different place. -->
-        <copy todir="${ROYALE_HOME}/ant/lib" failOnError="false" overwrite="false">
-            <fileset dir="${COMPILER_HOME}/compiler/lib">
-                <include name="royaleTasks.jar"/>
-            </fileset>
-        </copy>
-        <antcall target="bin-legacy" />
-        <copy todir="${ROYALE_HOME}/bin" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${COMPILER_HOME}/compiler/src/assembly/scripts">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-        <copy todir="${ROYALE_HOME}/lib" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${COMPILER_HOME}/compiler/lib">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-        <copy todir="${ROYALE_HOME}/lib" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${COMPILER_HOME}/lib">
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="bin-legacy" unless="royale">
-        <mkdir dir="${ROYALE_HOME}/bin-legacy" />
-        <move todir="${ROYALE_HOME}/bin-legacy" overwrite="true" includeEmptyDirs="false">
-            <fileset dir="${ROYALE_HOME}/bin">
-                <include name="**/*"/>
-            </fileset>
-        </move>
-    </target>
-    
-    <target name="copyfiles.jx" if="install.jx" description="copy Royale Transpiler files into SDK" >
-        <mkdir dir="${ROYALE_HOME}/js/bin" />
-        <mkdir dir="${ROYALE_HOME}/js/lib" />
-        <mkdir dir="${ROYALE_HOME}/js/libs" />
-        <copy todir="${ROYALE_HOME}/js/lib" failOnError="false" overwrite="true">
-            <fileset dir="${COMPILER_HOME}/js/lib">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-        <copy todir="${ROYALE_HOME}/js/libs" failOnError="false" overwrite="true">
-            <fileset dir="${COMPILER_HOME}/js/libs">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-        <!-- royale-asjs has custom files
-        <copy todir="${ROYALE_HOME}/js/bin" failOnError="false" overwrite="true">
-            <fileset dir="${COMPILER_HOME}/js/bin">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-        -->
-        <mkdir dir="${ROYALE_HOME}/royale-typedefs" />
-        <copy todir="${ROYALE_HOME}/royale-typedefs" failOnError="false" overwrite="true">
-            <fileset dir="${COMPILER_HOME}/royale-typedefs">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-    </target>
-
-</project>
diff --git a/royale-ant-tasks/build.xml b/royale-ant-tasks/build.xml
index 7baac0c..ae109f0 100644
--- a/royale-ant-tasks/build.xml
+++ b/royale-ant-tasks/build.xml
@@ -44,7 +44,7 @@
     <property name="javadoc.params" value="" />
     
     <!-- The 'sdk' property is the absolute path, with forward slashes, to the compiler/lib directory -->
-    <!-- where a Falcon SDK is built -->
+    <!-- where a Royale SDK is built -->
     <!-- All output paths are expressed as absolute paths starting with ${sdk} -->
     <property name="sdk" value="${royaletasks}/../compiler-jx/lib"/>
     <property name="compiler" value="${royaletasks}/../compiler-jx"/>
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 f20fecf..23de529 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
@@ -232,14 +232,16 @@ public abstract class FlexTask extends Java
      */
     public final void execute() throws BuildException
     {
-        String royaleHomeProperty = getProject().getProperty("FLEX_HOME");
+        String royaleHomeProperty = getProject().getProperty("ROYALE_HOME");
+        if (royaleHomeProperty == null)
+            royaleHomeProperty = getProject().getProperty("FLEX_HOME");
 
         if (royaleHomeProperty == null)
-            throw new BuildException("FLEX_HOME must be set to use the Flex Ant Tasks");
+            throw new BuildException("ROYALE_HOME or FLEX_HOME must be set to use the Flex Ant Tasks");
 		
-        String royaleHomeProperty = getProject().getProperty("FALCONJX_HOME");
-        if (royaleHomeProperty == null)
-            throw new BuildException("FALCONJX_HOME must be set to use the Flex Ant Tasks");
+        String compilerHomeProperty = getProject().getProperty("ROYALE_COMPILER_HOME");
+        if (compilerHomeProperty == null)
+            throw new BuildException("ROYALE_COMPILER_HOME must be set to use the Flex Ant Tasks");
 				
         System.setProperty("FLEX_HOME", royaleHomeProperty);
         String royalelibProperty = royaleHomeProperty.concat("/frameworks/");
@@ -361,7 +363,7 @@ public abstract class FlexTask extends Java
         }
         catch (ClassNotFoundException ignoredClassNotFoundException)
         {
-            String royaleHomeProperty = getProject().getProperty("FALCONJX_HOME");
+            String royaleHomeProperty = getProject().getProperty("ROYALE_COMPILER_HOME");
 
             if (royaleHomeProperty != null)
             {
@@ -402,13 +404,13 @@ public abstract class FlexTask extends Java
                 }
                 else
                 {
-                    throw new BuildException("FALCON_HOME does not exist.", getLocation());
+                    throw new BuildException("ROYALE_COMPILER_HOME does not exist.", getLocation());
                 }
             }
             else
             {
                 throw new BuildException("The class, " + className +
-                                         ", must be in the classpath or the FALCONJX_HOME property must be set.",
+                                         ", must be in the classpath or the ROYALE_COMPILER_HOME property must be set.",
                                          getLocation());
             }
         }
diff --git a/royale-ant-tasks/src/test/build.xml b/royale-ant-tasks/src/test/build.xml
index 2021333..d0ba5d3 100644
--- a/royale-ant-tasks/src/test/build.xml
+++ b/royale-ant-tasks/src/test/build.xml
@@ -69,10 +69,10 @@
     
     <target name="ant.tests">
         <property name="FLEX_HOME" value="${flexsdk}"/>
-        <property name="FALCONJX_HOME" value="${royale}"/>
+        <property name="ROYALE_COMPILER_HOME" value="${royale}"/>
         <echo message="GOOG_HOME: ${GOOG_HOME}"/>
         <echo>FLEX_HOME=${flexsdk}</echo>
-        <echo>FALCONJX_HOME=${FALCONJX_HOME}</echo>
+        <echo>ROYALE_COMPILER_HOME=${ROYALE_COMPILER_HOME}</echo>
         <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
         <mxmlc file="${royaletasks.tests}/as/Hello.as"
             output="${royaletasks}/target/junit/Hello.swf"
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
index e983270..dc46ef1 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseCompileMojo.java
@@ -27,7 +27,7 @@ public abstract class BaseCompileMojo extends BaseMojo {
 
     @Override
     protected String getToolGroupName() {
-        return "Falcon";
+        return "Royale";
     }
 
     @Override
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
index 1c095b3..1a5d34f 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompileTypedefsMojo.java
@@ -46,7 +46,7 @@ public class CompileTypedefsMojo
 
     @Override
     protected String getToolGroupName() {
-        return "Falcon";
+        return "Royale";
     }
 
     @Override

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

Mime
View raw message