--- a/compiler/Make.proto	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/Make.proto	Thu Oct 30 21:22:38 2014 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: jv_dart_compiler.
+# automagically generated from the projectDefinition: ctu_dart_compiler.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -43,7 +43,7 @@
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
 LOCALDEFINES=
 
-LIBNAME=libjv_dart_compiler
+LIBNAME=libctu_dart_compiler
 STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
 
 
@@ -74,7 +74,7 @@
 # copy state changes. Together with --guessVersion it ensures that package
 # definition class always contains correct binary revision string.
 ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
-jv_dart_compiler.$(O): $(shell hg root)/.hg/dirstate
+ctu_dart_compiler.$(O): $(shell hg root)/.hg/dirstate
 endif
 
 
@@ -120,10 +120,10 @@
 $(OUTDIR)Dart__ParserError.$(O) Dart__ParserError.$(H): Dart__ParserError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Dart__ScannerBase.$(O) Dart__ScannerBase.$(H): Dart__ScannerBase.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Dart__ScannerTests.$(O) Dart__ScannerTests.$(H): Dart__ScannerTests.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)jv_dart_compiler.$(O) jv_dart_compiler.$(H): jv_dart_compiler.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__Scanner.$(O) Dart__Scanner.$(H): Dart__Scanner.st $(INCLUDE_TOP)/jv/dart/compiler/Dart__ScannerBase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__ScannerError.$(O) Dart__ScannerError.$(H): Dart__ScannerError.st $(INCLUDE_TOP)/jv/dart/compiler/Dart__ParserError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__SyntaxError.$(O) Dart__SyntaxError.$(H): Dart__SyntaxError.st $(INCLUDE_TOP)/jv/dart/compiler/Dart__ParserError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)ctu_dart_compiler.$(O) ctu_dart_compiler.$(H): ctu_dart_compiler.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__Scanner.$(O) Dart__Scanner.$(H): Dart__Scanner.st $(INCLUDE_TOP)/ctu/dart/compiler/Dart__ScannerBase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__ScannerError.$(O) Dart__ScannerError.$(H): Dart__ScannerError.st $(INCLUDE_TOP)/ctu/dart/compiler/Dart__ParserError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__SyntaxError.$(O) Dart__SyntaxError.$(H): Dart__SyntaxError.st $(INCLUDE_TOP)/ctu/dart/compiler/Dart__ParserError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 

--- a/compiler/Make.spec	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/Make.spec	Thu Oct 30 21:22:38 2014 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: jv_dart_compiler.
+# automagically generated from the projectDefinition: ctu_dart_compiler.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -12,7 +12,7 @@
 # Do NOT CHANGE THESE DEFINITIONS
 # (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
 #  to find the source code of a class and to find the library for a package)
-MODULE=jv
+MODULE=ctu
 MODULE_DIR=dart/compiler
 PACKAGE=$(MODULE):$(MODULE_DIR)
 
@@ -50,7 +50,7 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
-	jv_dart_compiler \
+	ctu_dart_compiler \
 	Dart::ScannerBase \
 	Dart::Parser \
 	Dart::Scanner \
@@ -63,7 +63,7 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR)jv_dart_compiler.$(O) \
+    $(OUTDIR)ctu_dart_compiler.$(O) \
     $(OUTDIR)Dart__ScannerBase.$(O) \
     $(OUTDIR)Dart__Parser.$(O) \
     $(OUTDIR)Dart__Scanner.$(O) \

--- a/compiler/README.md	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/README.md	Thu Oct 30 21:22:38 2014 +0000
@@ -1,3 +1,3 @@
-Package jv:dart:compiler contains Dart language compiler. 
+Package ctu:dart:compiler contains Dart language compiler. 
 
 

--- a/compiler/bc.mak	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/bc.mak	Thu Oct 30 21:22:38 2014 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: jv_dart_compiler.
+# automagically generated from the projectDefinition: ctu_dart_compiler.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -29,7 +29,7 @@
 
 !INCLUDE Make.spec
 
-LIBNAME=libjv_dart_compiler
+LIBNAME=libctu_dart_compiler
 RESFILES=compiler.res
 
 
@@ -67,10 +67,10 @@
 $(OUTDIR)Dart__ParserError.$(O) Dart__ParserError.$(H): Dart__ParserError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Dart__ScannerBase.$(O) Dart__ScannerBase.$(H): Dart__ScannerBase.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Dart__ScannerTests.$(O) Dart__ScannerTests.$(H): Dart__ScannerTests.st $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)jv_dart_compiler.$(O) jv_dart_compiler.$(H): jv_dart_compiler.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__Scanner.$(O) Dart__Scanner.$(H): Dart__Scanner.st $(INCLUDE_TOP)\jv\dart\compiler\Dart__ScannerBase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__ScannerError.$(O) Dart__ScannerError.$(H): Dart__ScannerError.st $(INCLUDE_TOP)\jv\dart\compiler\Dart__ParserError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Dart__SyntaxError.$(O) Dart__SyntaxError.$(H): Dart__SyntaxError.st $(INCLUDE_TOP)\jv\dart\compiler\Dart__ParserError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)ctu_dart_compiler.$(O) ctu_dart_compiler.$(H): ctu_dart_compiler.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__Scanner.$(O) Dart__Scanner.$(H): Dart__Scanner.st $(INCLUDE_TOP)\ctu\dart\compiler\Dart__ScannerBase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__ScannerError.$(O) Dart__ScannerError.$(H): Dart__ScannerError.st $(INCLUDE_TOP)\ctu\dart\compiler\Dart__ParserError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Dart__SyntaxError.$(O) Dart__SyntaxError.$(H): Dart__SyntaxError.st $(INCLUDE_TOP)\ctu\dart\compiler\Dart__ParserError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
@@ -80,5 +80,5 @@
 # copy state changes. Together with --guessVersion it ensures that package
 # definition class always contains correct binary revision string.
 !IFDEF HGROOT
-$(OUTDIR)jv_dart_compiler.$(O): $(HGROOT)\.hg\dirstate
+$(OUTDIR)ctu_dart_compiler.$(O): $(HGROOT)\.hg\dirstate
 !ENDIF

--- a/compiler/compiler.rc	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/compiler.rc	Thu Oct 30 21:22:38 2014 +0000
@@ -1,6 +1,6 @@
 //
 // DO NOT EDIT
-// automagically generated from the projectDefinition: jv_dart_compiler.
+// automagically generated from the projectDefinition: ctu_dart_compiler.
 //
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION     6,2,32767,32767

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compiler/ctu_dart_compiler.st	Thu Oct 30 21:22:38 2014 +0000
@@ -0,0 +1,109 @@
+"{ Package: 'jv:dart/compiler' }"
+
+LibraryDefinition subclass:#ctu_dart_compiler
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'* Projects & Packages *'
+!
+
+
+!ctu_dart_compiler class methodsFor:'description'!
+
+excludedFromPreRequisites
+    "list all packages which should be ignored in the automatic
+     preRequisites scan. See #preRequisites for more."
+
+    ^ #(
+    )
+!
+
+preRequisites
+    "list all required packages.
+     This list can be maintained manually or (better) generated and
+     updated by scanning the superclass hierarchies and looking for
+     global variable accesses. (the browser has a menu function for that)
+     Howevery, often too much is found, and you may want to explicitely
+     exclude individual packages in the #excludedFromPrerequisites method."
+
+    ^ #(
+        #'stx:libbasic'    "LibraryDefinition - superclass of jv_dart "
+    )
+! !
+
+!ctu_dart_compiler class methodsFor:'description - contents'!
+
+classNamesAndAttributes
+    "lists the classes which are to be included in the project.
+     Each entry in the list may be: a single class-name (symbol),
+     or an array-literal consisting of class name and attributes.
+     Attributes are: #autoload or #<os> where os is one of win32, unix,..."
+
+    ^ #(
+        "<className> or (<className> attributes...) in load order"
+        #'ctu_dart_compiler'
+        #'Dart::ScannerBase'
+        #'Dart::Parser'
+        #'Dart::Scanner'
+        #'Dart::ScannerTests'
+        #'Dart::ParserError'
+        #'Dart::SyntaxError'
+        #'Dart::ScannerError'
+        (#'Dart::ParserTests' autoload)
+    )
+!
+
+extensionMethodNames
+    "lists the extension methods which are to be included in the project.
+     Entries are 2-element array literals, consisting of class-name and selector."
+
+    ^ #(
+    )
+! !
+
+!ctu_dart_compiler class methodsFor:'description - project information'!
+
+applicationIconFileName
+    "Return the name (without suffix) of an icon-file (the app's icon); will be included in the rc-resource file"
+
+    ^ nil
+    "/ ^ self applicationName
+!
+
+companyName
+    "Return a companyname which will appear in <lib>.rc"
+
+    ^ 'My Company'
+!
+
+description
+    "Return a description string which will appear in vc.def / bc.def"
+
+    ^ 'Class Library'
+!
+
+legalCopyright
+    "Return a copyright string which will appear in <lib>.rc"
+
+    ^ 'My CopyRight or CopyLeft'
+!
+
+productInstallDirBaseName
+    "Returns a default installDir which will appear in <app>.nsi.
+     This is usually not the one you want to keep"
+
+    ^ (self package asCollectionOfSubstringsSeparatedByAny:':/') last
+!
+
+productName
+    "Return a product name which will appear in <lib>.rc"
+
+    ^ 'ProductName'
+! !
+
+!ctu_dart_compiler class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !

--- a/compiler/jv_dart_compiler.st	Fri Jan 11 15:53:03 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-"{ Package: 'jv:dart/compiler' }"
-
-LibraryDefinition subclass:#jv_dart_compiler
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	category:'* Projects & Packages *'
-!
-
-
-!jv_dart_compiler class methodsFor:'description'!
-
-excludedFromPreRequisites
-    "list all packages which should be ignored in the automatic
-     preRequisites scan. See #preRequisites for more."
-
-    ^ #(
-    )
-!
-
-preRequisites
-    "list all required packages.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies and looking for
-     global variable accesses. (the browser has a menu function for that)
-     Howevery, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPrerequisites method."
-
-    ^ #(
-        #'stx:libbasic'    "LibraryDefinition - superclass of jv_dart "
-    )
-! !
-
-!jv_dart_compiler class methodsFor:'description - contents'!
-
-classNamesAndAttributes
-    "lists the classes which are to be included in the project.
-     Each entry in the list may be: a single class-name (symbol),
-     or an array-literal consisting of class name and attributes.
-     Attributes are: #autoload or #<os> where os is one of win32, unix,..."
-
-    ^ #(
-        "<className> or (<className> attributes...) in load order"
-        #'jv_dart_compiler'
-        #'Dart::ScannerBase'
-        #'Dart::Parser'
-        #'Dart::Scanner'
-        #'Dart::ScannerTests'
-        #'Dart::ParserError'
-        #'Dart::SyntaxError'
-        #'Dart::ScannerError'
-        (#'Dart::ParserTests' autoload)
-    )
-!
-
-extensionMethodNames
-    "lists the extension methods which are to be included in the project.
-     Entries are 2-element array literals, consisting of class-name and selector."
-
-    ^ #(
-    )
-! !
-
-!jv_dart_compiler class methodsFor:'description - project information'!
-
-applicationIconFileName
-    "Return the name (without suffix) of an icon-file (the app's icon); will be included in the rc-resource file"
-
-    ^ nil
-    "/ ^ self applicationName
-!
-
-companyName
-    "Return a companyname which will appear in <lib>.rc"
-
-    ^ 'My Company'
-!
-
-description
-    "Return a description string which will appear in vc.def / bc.def"
-
-    ^ 'Class Library'
-!
-
-legalCopyright
-    "Return a copyright string which will appear in <lib>.rc"
-
-    ^ 'My CopyRight or CopyLeft'
-!
-
-productInstallDirBaseName
-    "Returns a default installDir which will appear in <app>.nsi.
-     This is usually not the one you want to keep"
-
-    ^ (self package asCollectionOfSubstringsSeparatedByAny:':/') last
-!
-
-productName
-    "Return a product name which will appear in <lib>.rc"
-
-    ^ 'ProductName'
-! !
-
-!jv_dart_compiler class methodsFor:'documentation'!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
-! !

--- a/compiler/libInit.cc	Fri Jan 11 15:53:03 2013 +0000
+++ b/compiler/libInit.cc	Thu Oct 30 21:22:38 2014 +0000
@@ -2,7 +2,7 @@
  * $Header$
  *
  * DO NOT EDIT
- * automagically generated from the projectDefinition: jv_dart_compiler.
+ * automagically generated from the projectDefinition: ctu_dart_compiler.
  */
 #define __INDIRECTVMINITCALLS__
 #include <stc.h>
@@ -12,26 +12,26 @@
 #endif
 
 #if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
-DLL_EXPORT void _libjv_dart_compiler_Init() INIT_TEXT_SECTION;
-// DLL_EXPORT void _libjv_dart_compiler_InitDefinition() INIT_TEXT_SECTION;
+DLL_EXPORT void _libctu_dart_compiler_Init() INIT_TEXT_SECTION;
+// DLL_EXPORT void _libctu_dart_compiler_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-// void _libjv_dart_compiler_InitDefinition(pass, __pRT__, snd)
+// void _libctu_dart_compiler_InitDefinition(pass, __pRT__, snd)
 // OBJ snd; struct __vmData__ *__pRT__; {
-// __BEGIN_PACKAGE2__("libjv_dart_compiler__DFN", _libjv_dart_compiler_InitDefinition, "jv:dart/compiler");
-// _jv_137dart_137compiler_Init(pass,__pRT__,snd);
+// __BEGIN_PACKAGE2__("libctu_dart_compiler__DFN", _libctu_dart_compiler_InitDefinition, "jv:dart/compiler");
+// _ctu_137dart_137compiler_Init(pass,__pRT__,snd);
 
 // __END_PACKAGE__();
 // }
 
-void _libjv_dart_compiler_Init(pass, __pRT__, snd)
+void _libctu_dart_compiler_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_dart_compiler", _libjv_dart_compiler_Init, "jv:dart/compiler");
+__BEGIN_PACKAGE2__("libctu_dart_compiler", _libctu_dart_compiler_Init, "jv:dart/compiler");
 _Dart__Parser_Init(pass,__pRT__,snd);
 _Dart__ParserError_Init(pass,__pRT__,snd);
 _Dart__ScannerBase_Init(pass,__pRT__,snd);
 _Dart__ScannerTests_Init(pass,__pRT__,snd);
-_jv_137dart_137compiler_Init(pass,__pRT__,snd);
+_ctu_137dart_137compiler_Init(pass,__pRT__,snd);
 _Dart__Scanner_Init(pass,__pRT__,snd);
 _Dart__ScannerError_Init(pass,__pRT__,snd);
 _Dart__SyntaxError_Init(pass,__pRT__,snd);