diff --git a/Directory.Build.props b/Directory.Build.props
index c586f9977..90141f6c6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,9 +3,9 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
 
-    <Version>0.9.4</Version>
-    <AssemblyVersion>0.9.4.0</AssemblyVersion>
-    <FileVersion>0.9.4.0</FileVersion>
+    <Version>0.9.5</Version>
+    <AssemblyVersion>0.9.5.0</AssemblyVersion>
+    <FileVersion>0.9.5.0</FileVersion>
     <Authors>Danielku15</Authors>
     <Company>CoderLine</Company>
     <Product>AlphaTab</Product>
diff --git a/Documentation/input/examples/general/tracks.cshtml b/Documentation/input/examples/general/tracks.cshtml
index aebeb3c8f..57a142ebe 100644
--- a/Documentation/input/examples/general/tracks.cshtml
+++ b/Documentation/input/examples/general/tracks.cshtml
@@ -38,7 +38,7 @@ Order: 1
     </div>
     <div class="tab-pane example" id="all">
         <div class="html">
-            <div id="alphaTabAll" data-file="@Context.GetLink("/assets/files/TwoTracks")" data-tracks="all"></div>
+            <div id="alphaTabAll" data-file="@Context.GetLink("/assets/files/TwoTracks.gp")" data-tracks="all"></div>
         </div>
         <div class="js">
             <script type="text/x-alphatab">
diff --git a/Documentation/input/features/layouts.cshtml b/Documentation/input/features/layouts.cshtml
index 58e87064b..40fc7e660 100644
--- a/Documentation/input/features/layouts.cshtml
+++ b/Documentation/input/features/layouts.cshtml
@@ -88,7 +88,7 @@ Order: 1
 	This is another layout type available. All bars are aligned horizontally.
 </p>
 
-<div id="alphaTabHorizontal" data-file="@Context.GetLink("/assets/files/features/Skillet.gp5")"></div>
+<div id="alphaTabHorizontal" data-file="@Context.GetLink("/assets/files/features/Skillet.gp5")" style="overflow: auto"></div>
 <script type="text/javascript">
 	$('#alphaTabHorizontal').alphaTab({
 		layout: {
diff --git a/Documentation/input/reference/api/islooping.cshtml b/Documentation/input/reference/api/islooping.cshtml
index f8762b671..3043608cc 100644
--- a/Documentation/input/reference/api/islooping.cshtml
+++ b/Documentation/input/reference/api/islooping.cshtml
@@ -1,5 +1,5 @@
 Title: IsLooping
-JsName: get_IsLooping;set_IsLooping
+JsName: isLooping
 jQueryName: alphaTab('looping')
 Category: Properties - Player
 Description: Whether the playback should automatically restart after it finished
@@ -42,7 +42,7 @@ api.IsLooping = true;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_IsLooping(true);
+api.isLooping = true;
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/isreadyforplayback.cshtml b/Documentation/input/reference/api/isreadyforplayback.cshtml
index 4d26303fc..f9134773c 100644
--- a/Documentation/input/reference/api/isreadyforplayback.cshtml
+++ b/Documentation/input/reference/api/isreadyforplayback.cshtml
@@ -1,5 +1,5 @@
 Title: IsReadyForPlayback
-JsName: get_IsReadyForPlayback;get_IsReadyForPlayback
+JsName: isReadyForPlayback
 jQueryName: alphaTab('isReadyForPlayback')
 Category: Properties - Player
 Description: Whether the player is ready for starting the playback.
@@ -40,7 +40,7 @@ if(api.IsReadyForPlayback) api.Play();
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-if(api.get_IsReadyForPlayback()) api.play();
+if(api.isReadyForPlayback)) api.play();
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/mastervolume.cshtml b/Documentation/input/reference/api/mastervolume.cshtml
index 4abcc24c0..ea8a6497d 100644
--- a/Documentation/input/reference/api/mastervolume.cshtml
+++ b/Documentation/input/reference/api/mastervolume.cshtml
@@ -1,5 +1,5 @@
 Title: MasterVolume
-JsName: get_MasterVolume;set_MasterVolume
+JsName: masterVolume
 jQueryName: alphaTab('masterVolume')
 Category: Properties - Player
 Description: The current master volume as percentage
@@ -43,7 +43,7 @@ api.MasterVolume = 0.5f;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_MasterVolume(0.5);
+api.masterVolume = 0.5;
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/metronomevolume.cshtml b/Documentation/input/reference/api/metronomevolume.cshtml
index b2c733c1e..605ab2422 100644
--- a/Documentation/input/reference/api/metronomevolume.cshtml
+++ b/Documentation/input/reference/api/metronomevolume.cshtml
@@ -1,5 +1,5 @@
 Title: MetronomeValue
-JsName: get_MetronomeValue;set_MetronomeValue
+JsName: metronomeValue
 jQueryName: alphaTab('metronomeValue')
 Category: Properties - Player
 Description: The metronome volume as percentage
@@ -43,7 +43,7 @@ api.MetronomeValue = 0.5f;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_MetronomeValue(0.5);
+api.metronomeValue = 0.5;
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/playbackrange.cshtml b/Documentation/input/reference/api/playbackrange.cshtml
index 330dc6a1c..db4e4709c 100644
--- a/Documentation/input/reference/api/playbackrange.cshtml
+++ b/Documentation/input/reference/api/playbackrange.cshtml
@@ -1,5 +1,5 @@
 Title: PlaybackRange
-JsName: get_PlaybackRange;set_PlaybackRange
+JsName: playbackRange
 jQueryName: alphaTab('playbackRange')
 Category: Properties - Player
 Description: The range of the song that should be played
@@ -78,7 +78,7 @@ api.PlaybackRange = new PlaybackRange { StartTick = 1000, EndTick = 50000 };
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_PlaybackRange({ startTick: 1000, endTick: 50000 });
+api.playbackRange = { startTick: 1000, endTick: 50000 };
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/playbackspeed.cshtml b/Documentation/input/reference/api/playbackspeed.cshtml
index 783d87c62..4511fada7 100644
--- a/Documentation/input/reference/api/playbackspeed.cshtml
+++ b/Documentation/input/reference/api/playbackspeed.cshtml
@@ -1,5 +1,5 @@
 Title: PlaybackSpeed
-JsName: get_PlaybackSpeed;set_PlaybackSpeed
+JsName: playbackSpeed
 jQueryName: alphaTab('playbackSpeed')
 Category: Properties - Player
 Description: The current playback speed as percentage
@@ -43,7 +43,7 @@ api.PlaybackSpeed = 0.5f;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_PlaybackSpeed(0.5);
+api.playbackSpeed(0.5);
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/playerfinished.cshtml b/Documentation/input/reference/api/playerfinished.cshtml
index 4d488fdd2..60a64e7ae 100644
--- a/Documentation/input/reference/api/playerfinished.cshtml
+++ b/Documentation/input/reference/api/playerfinished.cshtml
@@ -1,5 +1,5 @@
 Title: PlayerFinished
-JsName: add_PlayerFinished();remove_PlayerFinished()
+JsName: addPlayerFinished();removePlayerFinished()
 DomName: alphaTab.finished
 Category: Events - Player
 Description: This event is fired when the playback of the whole song finished.
@@ -50,12 +50,12 @@ api.Play();
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_Finished(function(args) {
+api.addFinished(function(args) {
     // speed trainer
-    api.set_PlaybackSpeed(Math.min(1.0, api.get_PlaybackSpeed() + 0.1));
+    api.playbackSpeed = Math.min(1.0, api.playbackSpeed + 0.1);
 });
-api.set_IsLooping(true);
-api.set_PlaybackSpeed(0.5);
+api.isLooping = true;
+api.playbackSpeed = 0.5;
 api.play()
 </code>
 </pre>
@@ -81,13 +81,13 @@ at.alphaTab('play');
 var at = document.querySelector('#alphaTab');
 var api = null;
 at.addEventListener('alphaTab.finished', function(e) {
-    api.set_PlaybackSpeed(Math.min(1.0, api.PlaybackSpeed + 0.1));
+    api.playbackSpeed = Math.min(1.0, api.playbackSpeed + 0.1);
 }, false);
 
 
 api = new alphaTab.platform.javaScript.AlphaTabApi(at);
-api.set_IsLooping(true);
-api.set_PlaybackSpeed(0.5);
+api.isLooping = true;
+api.playbackSpeed = 0.5;
 api.play()
 </code>
 </pre>
\ No newline at end of file
diff --git a/Documentation/input/reference/api/playerstate.cshtml b/Documentation/input/reference/api/playerstate.cshtml
index 2a0e54412..3e29da54a 100644
--- a/Documentation/input/reference/api/playerstate.cshtml
+++ b/Documentation/input/reference/api/playerstate.cshtml
@@ -1,5 +1,5 @@
 Title: PlayerState
-JsName: get_PlayerState;get_PlayerState
+JsName: playerState
 jQueryName: alphaTab('playerState')
 Category: Properties - Player
 Description: The current player state
@@ -42,7 +42,7 @@ if(api.PlayerState != PlayerState.Playing) api.Play();
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-if(api.get_PlayerState() != 1) api.play();
+if(api.playerState != 1) api.play();
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/tickposition.cshtml b/Documentation/input/reference/api/tickposition.cshtml
index 5dca5e283..b294732dd 100644
--- a/Documentation/input/reference/api/tickposition.cshtml
+++ b/Documentation/input/reference/api/tickposition.cshtml
@@ -1,5 +1,5 @@
 Title: TickPosition
-JsName: get_TickPosition;set_TickPosition
+JsName: tickPosition
 jQueryName: alphaTab('tickPosition')
 Category: Properties - Player
 Description: The position within the song in midi ticks
@@ -39,7 +39,7 @@ api.TickPosition = 4000;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_TickPosition(4000);
+api.tickPosition = 4000;
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/api/timeposition.cshtml b/Documentation/input/reference/api/timeposition.cshtml
index 2bab91833..18431c946 100644
--- a/Documentation/input/reference/api/timeposition.cshtml
+++ b/Documentation/input/reference/api/timeposition.cshtml
@@ -1,5 +1,5 @@
 Title: TimePosition
-JsName: get_TimePosition;set_TimePosition
+JsName: timePosition
 jQueryName: alphaTab('timePosition')
 Category: Properties - Player
 Description: The position within the song in milliseconds
@@ -39,7 +39,7 @@ api.TimePosition = 4000;
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.set_TimePosition(4000);
+api.timePosition = 4000;
 </code>
 </pre>
 
diff --git a/Documentation/input/reference/events/error.cshtml b/Documentation/input/reference/events/error.cshtml
index 94dfa1383..48546a5ad 100644
--- a/Documentation/input/reference/events/error.cshtml
+++ b/Documentation/input/reference/events/error.cshtml
@@ -1,5 +1,5 @@
 Title: Error
-JsName: add_Error();remove_Error()
+JsName: addError();removeError()
 DomName: alphaTab.error
 Category: Events - Core
 Description: This event is fired when an error within alphatab occurred.
@@ -77,7 +77,7 @@ api.Error += (type, details) =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_Error(function(type, details) {
+api.addError(function(type, details) {
     displayError(type, details);
 });
 </code>
diff --git a/Documentation/input/reference/events/loaded.cshtml b/Documentation/input/reference/events/loaded.cshtml
index 593ad48f3..fb08502bb 100644
--- a/Documentation/input/reference/events/loaded.cshtml
+++ b/Documentation/input/reference/events/loaded.cshtml
@@ -1,5 +1,5 @@
 Title: Loaded
-JsName: add_Loaded();remove_Loaded()
+JsName: addLoaded();removeLoaded()
 DomName: alphaTab.loaded
 Category: Events - Core
 Description: This event is fired whenever a new song is loaded
@@ -65,7 +65,7 @@ api.Loaded += score =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_Loaded(function(score) {
+api.addLoaded(function(score) {
     updateSongInformationInUi(score);
 });
 </code>
diff --git a/Documentation/input/reference/events/midiloaded.cshtml b/Documentation/input/reference/events/midiloaded.cshtml
index 531fb6bf3..fcca5432c 100644
--- a/Documentation/input/reference/events/midiloaded.cshtml
+++ b/Documentation/input/reference/events/midiloaded.cshtml
@@ -1,5 +1,5 @@
 Title: MidiLoaded
-JsName: add_MidiLoaded();remove_MidiLoaded()
+JsName: addMidiLoaded();removeMidiLoaded()
 DomName: alphaTab.midiFileLoaded
 Category: Events - Player
 Description: This event is fired when the Midi file needed for playback was loaded.
@@ -46,7 +46,7 @@ api.MidiLoaded += () =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_MidiLoaded(function(score) {
+api.addMidiLoaded(function(score) {
     hideGeneratingAudioIndicator();
 });
 </code>
diff --git a/Documentation/input/reference/events/playerpositionchanged.cshtml b/Documentation/input/reference/events/playerpositionchanged.cshtml
index 7194d0a99..0cc2b4ce2 100644
--- a/Documentation/input/reference/events/playerpositionchanged.cshtml
+++ b/Documentation/input/reference/events/playerpositionchanged.cshtml
@@ -1,5 +1,5 @@
 Title: PlayerPositionChanged
-JsName: add_PlayerPositionChanged();remove_PlayerPositionChanged()
+JsName: addPlayerPositionChanged();removePlayerPositionChanged()
 DomName: alphaTab.positionChanged
 Category: Events - Player
 Description: This event is fired when the playback state changed.
@@ -118,7 +118,7 @@ api.PlayerPositionChanged += args =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_PlayerPositionChanged(function(args) {
+api.addPlayerPositionChanged(function(args) {
     updatePlayerPosition(args);
 });
 </code>
diff --git a/Documentation/input/reference/events/playerstatechanged.cshtml b/Documentation/input/reference/events/playerstatechanged.cshtml
index 843c6f8ba..ed97c328e 100644
--- a/Documentation/input/reference/events/playerstatechanged.cshtml
+++ b/Documentation/input/reference/events/playerstatechanged.cshtml
@@ -1,5 +1,5 @@
 Title: PlayerStateChanged
-JsName: add_PlayerStateChanged();remove_PlayerStateChanged()
+JsName: addPlayerStateChanged();removePlayerStateChanged()
 DomName: alphaTab.playerStateChanged
 Category: Events - Player
 Description: This event is fired when the playback state changed.
@@ -110,7 +110,7 @@ api.PlayerStateChanged += args =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_PlayerStateChanged(function(args) {
+api.addPlayerStateChanged(function(args) {
     updatePlayerControls(args.State, args.Stopped);
 });
 </code>
diff --git a/Documentation/input/reference/events/postrenderfinished.cshtml b/Documentation/input/reference/events/postrenderfinished.cshtml
index 288dc70e0..e4fdbbf21 100644
--- a/Documentation/input/reference/events/postrenderfinished.cshtml
+++ b/Documentation/input/reference/events/postrenderfinished.cshtml
@@ -1,5 +1,5 @@
 Title: PostRenderFinished
-JsName: add_PostRenderFinished();remove_PostRenderFinished()
+JsName: addPostRenderFinished();removePostRenderFinished()
 DomName: alphaTab.postRenderFinished
 Category: Events - Core
 Description: This event is fired when the rendering of the whole music sheet is finished, and all handlers of RenderFinished ran.
@@ -47,7 +47,7 @@ api.PostRenderFinished += () =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_PostRenderFinished(function() {
+api.addPostRenderFinished(function() {
     hideLoadingIndicator();
 });  
 </code>
diff --git a/Documentation/input/reference/events/readyforplayback.cshtml b/Documentation/input/reference/events/readyforplayback.cshtml
index 90b535f4a..ba6cba121 100644
--- a/Documentation/input/reference/events/readyforplayback.cshtml
+++ b/Documentation/input/reference/events/readyforplayback.cshtml
@@ -1,5 +1,5 @@
 Title: ReadyForPlayback
-JsName: add_ReadyForPlayback();remove_ReadyForPlayback()
+JsName: addReadyForPlayback();removeReadyForPlayback()
 DomName: alphaTab.playerReady
 Category: Events - Player
 Description: This event is fired when all required data for playback is loaded and ready.
@@ -47,7 +47,7 @@ api.ReadyForPlayback += () =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_ReadyForPlayback(function(score) {
+api.addReadyForPlayback(function(score) {
     enablePlayerControls();
 });
 </code>
diff --git a/Documentation/input/reference/events/renderfinished.cshtml b/Documentation/input/reference/events/renderfinished.cshtml
index 207208499..0671c8c9b 100644
--- a/Documentation/input/reference/events/renderfinished.cshtml
+++ b/Documentation/input/reference/events/renderfinished.cshtml
@@ -1,5 +1,5 @@
 Title: RenderFinished
-JsName: add_RenderFinished();remove_RenderFinished()
+JsName: addRenderFinished();removeRenderFinished()
 DomName: alphaTab.rendered
 Category: Events - Core
 Description: This event is fired when the rendering of the whole music sheet is finished.
@@ -46,7 +46,7 @@ api.RenderFinished += () =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_RenderFinished(function() {
+api.addRenderFinished(function() {
     updateProgressBar("Finishing");
 });  
 </code>
diff --git a/Documentation/input/reference/events/resize.cshtml b/Documentation/input/reference/events/resize.cshtml
index 67b10f379..528d8002f 100644
--- a/Documentation/input/reference/events/resize.cshtml
+++ b/Documentation/input/reference/events/resize.cshtml
@@ -1,5 +1,5 @@
 Title: Resize
-JsName: add_Resize();remove_Resize()
+JsName: addResize();removeResize()
 DomName: alphaTab.resize
 Category: Events - Core
 Description: This event is fired when alphaTab was resized and is about to rerender the music notation.
@@ -112,7 +112,7 @@ api.Resize += args =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_Resize(function(args) {
+api.addResize(function(args) {
     args.Settings.Scale = args.NewWidth > 1300 
         ? 1.5f 
         : (args.NewWidth > 800) ? 1.3f : 1;
diff --git a/Documentation/input/reference/events/soundfontloaded.cshtml b/Documentation/input/reference/events/soundfontloaded.cshtml
index f0cd1a213..f6ff802f5 100644
--- a/Documentation/input/reference/events/soundfontloaded.cshtml
+++ b/Documentation/input/reference/events/soundfontloaded.cshtml
@@ -1,5 +1,5 @@
 Title: SoundFontLoaded
-JsName: add_SoundFontLoaded();remove_SoundFontLoaded()
+JsName: addSoundFontLoaded();removeSoundFontLoaded()
 DomName: alphaTab.soundFontLoaded
 Category: Events - Player
 Description: This event is fired when the SoundFont needed for playback was loaded.
@@ -46,7 +46,7 @@ api.SoundFontLoaded += () =>
 <pre>
 <code class="language-javascript line-numbers">
 var api = new alphaTab.platform.javaScript.AlphaTabApi(document.querySelector('#alphaTab'));
-api.add_SoundFontLoaded(function(score) {
+api.addSoundFontLoaded(function(score) {
     hideSoundFontLoadingIndicator();
 });
 </code>
diff --git a/Phase/Compiler/Phase.Translator.dll b/Phase/Compiler/Phase.Translator.dll
index ecb883426..c429828fc 100644
Binary files a/Phase/Compiler/Phase.Translator.dll and b/Phase/Compiler/Phase.Translator.dll differ
diff --git a/Phase/Compiler/Phase.Translator.pdb b/Phase/Compiler/Phase.Translator.pdb
index dc748c28b..afeab1b80 100644
Binary files a/Phase/Compiler/Phase.Translator.pdb and b/Phase/Compiler/Phase.Translator.pdb differ
diff --git a/Phase/Mscorlib/system/Boolean.hx b/Phase/Mscorlib/system/Boolean.hx
index 515d3e9a3..76fd6fc39 100644
--- a/Phase/Mscorlib/system/Boolean.hx
+++ b/Phase/Mscorlib/system/Boolean.hx
@@ -4,8 +4,8 @@ abstract Boolean(Bool) from Bool to Bool
 {
 	public inline function new(v:Bool) this = v;
 	
-	public inline function ToHaxeBool() : Bool return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeBool() : Bool return this;
+	public inline function toString() : system.CsString return Std.string(this);
 
 	@:op(!A) public inline function not() : system.Boolean return !this;
 	
diff --git a/Phase/Mscorlib/system/Byte.hx b/Phase/Mscorlib/system/Byte.hx
index 76a0c07d8..088660c6c 100644
--- a/Phase/Mscorlib/system/Byte.hx
+++ b/Phase/Mscorlib/system/Byte.hx
@@ -3,25 +3,25 @@ package system;
 
 abstract Byte(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToUInt8(i);
+	public inline function new(i:Int) this = system.Convert.toUInt8(i);
 	
-	public inline function ToHaxeInt(): Int return this;	
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;	
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Byte(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Byte(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Byte(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Byte(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Byte(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Byte(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Byte(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Byte(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Byte(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Byte(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Byte(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Byte(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Byte(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Byte(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Byte(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Byte(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Byte(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Byte(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Byte(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Byte(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Byte(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Byte(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Byte(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Byte(this);
 	
-	public inline function GetHashCode() : system.Int32 return this;	
+	public inline function getHashCode() : system.Int32 return this;	
 	
 	@:op(-A) public inline function neg() : system.Int32 return -this;
 
@@ -51,9 +51,9 @@ abstract Byte(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.Byte, rhs : system.Double) : system.Double;	
 
 	
-    @:op(A / B) public static inline function div0(lhs : system.Byte, rhs : system.Byte) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.Byte, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Byte) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.Byte, rhs : system.Byte) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.Byte, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Byte) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.Byte, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.Byte) : system.Double;
 	
@@ -106,8 +106,8 @@ abstract Byte(Int) from Int
     @:op(A + B) public static function add13(lhs : system.Byte, rhs : system.UInt64) : system.UInt64;	
 	@:op(A + B) public static function add14(lhs : system.Byte, rhs : system.Single) : system.Single;
     @:op(A + B) public static function add15(lhs : system.Byte, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.Byte, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Byte, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Byte, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Byte, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub0(lhs : system.Byte, rhs : system.Byte) : system.Int32;
diff --git a/Phase/Mscorlib/system/ByteArray.hx b/Phase/Mscorlib/system/ByteArray.hx
index 9cdb174a0..79c2b1de2 100644
--- a/Phase/Mscorlib/system/ByteArray.hx
+++ b/Phase/Mscorlib/system/ByteArray.hx
@@ -2,23 +2,23 @@ package system;
 
 abstract ByteArray(js.html.Uint8Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Uint8Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Uint8Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Byte>):ByteArray return cast new js.html.Uint8Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Byte>):ByteArray return cast new js.html.Uint8Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Byte>):ByteArray return cast new js.html.Uint8Array(untyped a.toHaxeArray());
 	@:from public static inline function fromArrayBuffer(a:js.html.ArrayBuffer):ByteArray return cast new js.html.Uint8Array(a);
 	
 	public inline function toUint8Array():js.html.Uint8Array return this;
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Byte return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Byte):Byte return this[index.ToHaxeInt()] = val.ToHaxeInt();
+	@:op([]) public inline function get(index:Int32):Byte return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Byte):Byte return this[index.toHaxeInt()] = val.toHaxeInt();
 	
 	public inline function iterator() : Iterator<Byte> return new ByteArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Byte> return new ByteArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Byte> return new ByteArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new ByteArray(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/ByteArrayEnumerable.hx b/Phase/Mscorlib/system/ByteArrayEnumerable.hx
index c1fe87ce8..bff315453 100644
--- a/Phase/Mscorlib/system/ByteArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/ByteArrayEnumerable.hx
@@ -11,7 +11,7 @@ class ByteArrayEnumerable implements IEnumerable<Byte>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Byte>
+	public function getEnumerator() : IEnumerator<Byte>
 	{
 		return new ByteArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/ByteArrayEnumerator.hx b/Phase/Mscorlib/system/ByteArrayEnumerator.hx
index ce3026f0b..8a4fea724 100644
--- a/Phase/Mscorlib/system/ByteArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/ByteArrayEnumerator.hx
@@ -13,16 +13,16 @@ class ByteArrayEnumerator implements IEnumerator<Byte>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Byte;
-	public function get_Current() : Byte return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Byte;
+	public function get_current() : Byte return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Char.hx b/Phase/Mscorlib/system/Char.hx
index eb930b188..b14f4974a 100644
--- a/Phase/Mscorlib/system/Char.hx
+++ b/Phase/Mscorlib/system/Char.hx
@@ -2,28 +2,28 @@ package system;
 
 abstract Char(Int) from Int
 {
-	public inline function new(v:Int) this = system.Convert.ToUInt16(v);
+	public inline function new(v:Int) this = system.Convert.toUInt16(v);
 	
 	@:from public static inline function fromCode(i:Int) : Char return new Char(i);
 	public static inline function fromString(i:String) : Char return new Char(i.charCodeAt(0));
 
-	public inline function ToHaxeInt(): Int return this;	
-	public inline function ToString() : system.CsString return String.fromCharCode(this);
+	public inline function toHaxeInt(): Int return this;	
+	public inline function toString() : system.CsString return String.fromCharCode(this);
 			
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Char(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Char(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Char(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Char(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Char(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Char(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Char(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Char(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Char(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Char(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Char(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Char(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Char(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Char(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Char(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Char(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Char(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Char(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Char(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Char(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Char(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Char(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Char(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Char(this);
 
-	public inline function GetHashCode() : system.Int32 return this | (this << 16);	
+	public inline function getHashCode() : system.Int32 return this | (this << 16);	
 	
 	@:op(-A) public inline function neg() : system.Int32 return -this;
 
@@ -53,8 +53,8 @@ abstract Char(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.Char, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div1(lhs : system.Char, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Char) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.Char, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Char) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.Char, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.Char) : system.Double;
 	
@@ -105,8 +105,8 @@ abstract Char(Int) from Int
     @:op(A + B) public static function add13(lhs : system.Char, rhs : system.UInt64) : system.UInt64;	
     @:op(A + B) public static function add14(lhs : system.Char, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.Char, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.Char, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Char, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Char, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Char, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub1(lhs : system.Char, rhs : Int) : system.Int32;
@@ -172,8 +172,8 @@ abstract Char(Int) from Int
     @:op(A > B) public static function gt14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A > B) public static function gt15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 	
-	@:op(A > B) public static inline function gt16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() > rhs.charCodeAt(0);
-    @:op(A > B) public static inline function gt17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() > rhs.get_Chars(0);
+	@:op(A > B) public static inline function gt16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() > rhs.charCodeAt(0);
+    @:op(A > B) public static inline function gt17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() > rhs.get_chars(0);
 	
 
 	
@@ -194,8 +194,8 @@ abstract Char(Int) from Int
     @:op(A < B) public static function lt14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A < B) public static function lt15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 
-	@:op(A < B) public static inline function lt16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() < rhs.charCodeAt(0);
-    @:op(A < B) public static inline function lt17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() < rhs.get_Chars(0);
+	@:op(A < B) public static inline function lt16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() < rhs.charCodeAt(0);
+    @:op(A < B) public static inline function lt17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() < rhs.get_chars(0);
 	
     @:op(A >= B) public static function gte1(lhs : system.Char, rhs : Int) : system.Boolean;
     @:op(A >= B) public static function gte2(lhs : Int, rhs : system.Char) : system.Boolean;
@@ -214,8 +214,8 @@ abstract Char(Int) from Int
     @:op(A >= B) public static function gte14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A >= B) public static function gte15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 			
-	@:op(A >= B) public static inline function gte16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() >= rhs.charCodeAt(0);
-    @:op(A >= B) public static inline function gte17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() >= rhs.get_Chars(0);
+	@:op(A >= B) public static inline function gte16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() >= rhs.charCodeAt(0);
+    @:op(A >= B) public static inline function gte17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() >= rhs.get_chars(0);
 
 
 	
@@ -236,8 +236,8 @@ abstract Char(Int) from Int
     @:op(A <= B) public static function lte14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A <= B) public static function lte15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 		
-	@:op(A <= B) public static inline function lte16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() <= rhs.charCodeAt(0);
-    @:op(A <= B) public static inline function lte17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() <= rhs.get_Chars(0);
+	@:op(A <= B) public static inline function lte16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() <= rhs.charCodeAt(0);
+    @:op(A <= B) public static inline function lte17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() <= rhs.get_chars(0);
 	
 	
     @:op(A == B) public static function eq1(lhs : system.Char, rhs : Int) : system.Boolean;
@@ -257,8 +257,8 @@ abstract Char(Int) from Int
     @:op(A == B) public static function eq14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A == B) public static function eq15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 	
-    @:op(A == B) public static inline function eq16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() == rhs.charCodeAt(0);
-    @:op(A == B) public static inline function eq17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() == rhs.get_Chars(0);
+    @:op(A == B) public static inline function eq16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() == rhs.charCodeAt(0);
+    @:op(A == B) public static inline function eq17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() == rhs.get_chars(0);
 
 	
     @:op(A != B) public static function neq1(lhs : system.Char, rhs : Int) : system.Boolean;
@@ -278,8 +278,8 @@ abstract Char(Int) from Int
     @:op(A != B) public static function neq14(lhs : system.Char, rhs : system.Single) : system.Boolean;	
     @:op(A != B) public static function neq15(lhs : system.Char, rhs : system.Double) : system.Boolean;	
 	
-	@:op(A != B) public static inline function neq16(lhs : system.Char, rhs : String) : system.Boolean return lhs.ToHaxeInt() != rhs.charCodeAt(0);
-    @:op(A != B) public static inline function neq17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.ToHaxeInt() != rhs.get_Chars(0);
+	@:op(A != B) public static inline function neq16(lhs : system.Char, rhs : String) : system.Boolean return lhs.toHaxeInt() != rhs.charCodeAt(0);
+    @:op(A != B) public static inline function neq17(lhs : system.Char, rhs : system.CsString) : system.Boolean return lhs.toHaxeInt() != rhs.get_chars(0);
 	
 
     @:op(A & B) public static function and1(lhs : system.Char, rhs : Int) : system.Int32;
diff --git a/Phase/Mscorlib/system/CharArray.hx b/Phase/Mscorlib/system/CharArray.hx
index 8c9c96637..f2b95d184 100644
--- a/Phase/Mscorlib/system/CharArray.hx
+++ b/Phase/Mscorlib/system/CharArray.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract CharArray(js.html.Uint16Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Uint16Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Uint16Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Char>):CharArray return cast new js.html.Uint16Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Char>):CharArray return cast new js.html.Uint16Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Char>):CharArray return cast new js.html.Uint16Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Char return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Char):Char return this[index.ToHaxeInt()] = val.ToHaxeInt();
+	@:op([]) public inline function get(index:Int32):Char return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Char):Char return this[index.toHaxeInt()] = val.toHaxeInt();
 	
 	public inline function iterator() : Iterator<Char> return new CharArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Char> return new CharArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Char> return new CharArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new CharArray(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/CharArrayEnumerable.hx b/Phase/Mscorlib/system/CharArrayEnumerable.hx
index 29ba7547a..d0e72b805 100644
--- a/Phase/Mscorlib/system/CharArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/CharArrayEnumerable.hx
@@ -11,7 +11,7 @@ class CharArrayEnumerable implements IEnumerable<Char>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Char>
+	public function getEnumerator() : IEnumerator<Char>
 	{
 		return new CharArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/CharArrayEnumerator.hx b/Phase/Mscorlib/system/CharArrayEnumerator.hx
index 1d55a679a..75bca22fb 100644
--- a/Phase/Mscorlib/system/CharArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/CharArrayEnumerator.hx
@@ -13,16 +13,16 @@ class CharArrayEnumerator implements IEnumerator<Char>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Char;
-	public function get_Current() : Char return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Char;
+	public function get_current() : Char return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Convert.hx b/Phase/Mscorlib/system/Convert.hx
index 5b39f3510..0ea53dd21 100644
--- a/Phase/Mscorlib/system/Convert.hx
+++ b/Phase/Mscorlib/system/Convert.hx
@@ -22,189 +22,189 @@ class Convert
 	private static var _float32Buffer = new Float32Array(_conversionBuffer);
 	private static var _float64Buffer = new Float64Array(_conversionBuffer);
 	
-	public static function ToInt8(v:Int) : Int
+	public static function toInt8(v:Int) : Int
 	{
 		_int32Buffer[0] = v;
 		return _int8Buffer[0];
 	}
-	public static function ToUInt8(v:Int) : Int 
+	public static function toUInt8(v:Int) : Int 
 	{
 		_int32Buffer[0] = v;
 		return _uint8Buffer[0];
 	}
-	public static function ToInt16(v:Int) : Int
+	public static function toInt16(v:Int) : Int
 	{
 		_int32Buffer[0] = v;
 		return _int16Buffer[0];
 	}
-	public static function ToUInt16(v:Int) : Int 
+	public static function toUInt16(v:Int) : Int 
 	{
 		_int32Buffer[0] = v;
 		return _uint16Buffer[0];
 	}
-	public static function ToUInt32(v:Int) : Int 
+	public static function toUInt32(v:Int) : Int 
 	{
 		_int32Buffer[0] = v;
 		return _uint32Buffer[0];
 	}
-	public static function ToInt64(v:Int) : Int 
+	public static function toInt64(v:Int) : Int 
 	{
 		return v;
 	}
-	public static function ToUInt64(v:Int) : Int 
+	public static function toUInt64(v:Int) : Int 
 	{
-		return ToUInt32(v);
+		return toUInt32(v);
 	}
-	public static function ToInt32(v:Int) : Int 
+	public static function toInt32(v:Int) : Int 
 	{
 		_uint32Buffer[0] = v;
 		return _int32Buffer[0];
 	}		
 
-	public static function ToHashCode_Single(v:system.Single) : system.Int32
+	public static function toHashCode_Single(v:system.Single) : system.Int32
 	{
-		_float32Buffer[0] = v.ToHaxeFloat();
+		_float32Buffer[0] = v.toHaxeFloat();
 		return _int32Buffer[0];
 	}
 
-	public static function ToHashCode_Double(v:system.Double) : system.Int32
+	public static function toHashCode_Double(v:system.Double) : system.Int32
 	{
-		_float64Buffer[0] = v.ToHaxeFloat();
+		_float64Buffer[0] = v.toHaxeFloat();
 		return _int32Buffer[0] ^ _int32Buffer[1];
 	}
 		
-	public static inline function ToBoolean_Byte(v:system.Byte) : system.Boolean
+	public static inline function toBoolean_Byte(v:system.Byte) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Byte(v:system.Byte) : system.Char
+	public static inline function toChar_Byte(v:system.Byte) : system.Char
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToSByte_Byte(v:system.Byte) : system.SByte 
+	public static inline function toSByte_Byte(v:system.Byte) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_Byte(v:system.Byte) : system.Byte 
+	public static inline function toByte_Byte(v:system.Byte) : system.Byte 
 	{
 		return v;
 	}
-	public static inline function ToInt16_Byte(v:system.Byte) : system.Int16
+	public static inline function toInt16_Byte(v:system.Byte) : system.Int16
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt16_Byte(v:system.Byte) : system.UInt16 
+	public static inline function toUInt16_Byte(v:system.Byte) : system.UInt16 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToInt32_Byte(v:system.Byte) : system.Int32 
+	public static inline function toInt32_Byte(v:system.Byte) : system.Int32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt32_Byte(v:system.Byte) : system.UInt32 
+	public static inline function toUInt32_Byte(v:system.Byte) : system.UInt32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToInt64_Byte(v:system.Byte) : system.Int64 
+	public static inline function toInt64_Byte(v:system.Byte) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_Byte(v:system.Byte) : system.UInt64
+	public static inline function toUInt64_Byte(v:system.Byte) : system.UInt64
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToSingle_Byte(v:system.Byte) : system.Single 
+	public static inline function toSingle_Byte(v:system.Byte) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_Byte(v:system.Byte) : system.Double
+	public static inline function toDouble_Byte(v:system.Byte) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 	
 	
-	public static inline function ToBoolean_Char(v:system.Char) : system.Boolean
+	public static inline function toBoolean_Char(v:system.Char) : system.Boolean
 	{
 		throw new InvalidCastException("cannot cast system.Char to system.Boolean");
 	}
-	public static inline function ToChar_Char(v:system.Char) : system.Char 
+	public static inline function toChar_Char(v:system.Char) : system.Char 
 	{
 		return v;
 	}
-	public static inline function ToByte_Char(v:system.Char) : system.Byte 
+	public static inline function toByte_Char(v:system.Char) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToSByte_Char(v:system.Char) : system.SByte 
+	public static inline function toSByte_Char(v:system.Char) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_Char(v:system.Char) : system.Int16
+	public static inline function toInt16_Char(v:system.Char) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_Char(v:system.Char) : system.UInt16 
+	public static inline function toUInt16_Char(v:system.Char) : system.UInt16 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToInt32_Char(v:system.Char) : system.Int32 
+	public static inline function toInt32_Char(v:system.Char) : system.Int32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt32_Char(v:system.Char) : system.UInt32 
+	public static inline function toUInt32_Char(v:system.Char) : system.UInt32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToInt64_Char(v:system.Char) : system.Int64 
+	public static inline function toInt64_Char(v:system.Char) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_Char(v:system.Char) : system.UInt64
+	public static inline function toUInt64_Char(v:system.Char) : system.UInt64
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static function ToSingle_Char(v:system.Byte) : system.Single 
+	public static function toSingle_Char(v:system.Byte) : system.Single 
 	{
 		throw new InvalidCastException("cannot cast system.Char to system.Single");
 	}
-	public static function ToDouble_Char(v:system.Byte) : system.Double
+	public static function toDouble_Char(v:system.Byte) : system.Double
 	{
 		throw new InvalidCastException("cannot cast system.Char to system.Double");
 	}
 	
 	
-	public static inline function ToBoolean_Double(v:system.Double) : system.Boolean
+	public static inline function toBoolean_Double(v:system.Double) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Double(v:system.Double) : system.Char 
+	public static inline function toChar_Double(v:system.Double) : system.Char 
 	{
 		throw new InvalidCastException("cannot cast system.Double to system.Char");
 	}
-	public static inline function ToByte_Double(v:system.Double) : system.Byte 
+	public static inline function toByte_Double(v:system.Double) : system.Byte 
 	{
-		return ToUInt8(ToInt32_Double(v).ToHaxeInt());
+		return toUInt8(toInt32_Double(v).toHaxeInt());
 	}
-	public static inline function ToSByte_Double(v:system.Double) : system.SByte 
+	public static inline function toSByte_Double(v:system.Double) : system.SByte 
 	{
-		return ToInt8(ToInt32_Double(v).ToHaxeInt());
+		return toInt8(toInt32_Double(v).toHaxeInt());
 	}
-	public static inline function ToInt16_Double(v:system.Double) : system.Int16
+	public static inline function toInt16_Double(v:system.Double) : system.Int16
 	{
-		return ToInt16(ToInt32_Double(v).ToHaxeInt());
+		return toInt16(toInt32_Double(v).toHaxeInt());
 	}
-	public static inline function ToUInt16_Double(v:system.Double) : system.UInt16 
+	public static inline function toUInt16_Double(v:system.Double) : system.UInt16 
 	{
-		return ToUInt16(ToInt32_Double(v).ToHaxeInt());
+		return toUInt16(toInt32_Double(v).toHaxeInt());
 	}
-	public static function ToInt32_Double(v:system.Double) : system.Int32 
+	public static function toInt32_Double(v:system.Double) : system.Int32 
 	{
 		if (v >= 0)
 		{
 			if (v < 2147483647.5)
 			{
-				return Std.int(v.ToHaxeFloat());
-				//var result = Std.int(v.ToHaxeFloat());
+				return Std.int(v.toHaxeFloat());
+				//var result = Std.int(v.toHaxeFloat());
 				//var dif = v - result;
 				//if (dif > 0.5 || dif == 0.5 && (result & 1) != 0) result++;
 				//return result;
@@ -214,436 +214,436 @@ class Convert
 		{
 			if (v >= -2147483648.5)
 			{
-				return Std.int(v.ToHaxeFloat());
-				// var result = Std.int(v.ToHaxeFloat());
+				return Std.int(v.toHaxeFloat());
+				// var result = Std.int(v.toHaxeFloat());
 				// var dif = v - result;
 				// if (dif < -0.5 || dif == -0.5 && (result & 1) != 0) result--;
 				// return result;
 			}
 		}
-		return Std.int(v.ToHaxeFloat());
+		return Std.int(v.toHaxeFloat());
 		// throw new OverflowException("Value was either too large or too small for a Int32.");
 	}
-	public static inline function ToUInt32_Double(v:system.Double) : system.UInt32 
+	public static inline function toUInt32_Double(v:system.Double) : system.UInt32 
 	{
-		return ToUInt32(ToInt32_Double(v).ToHaxeInt());
+		return toUInt32(toInt32_Double(v).toHaxeInt());
 	}
-	public static inline function ToInt64_Double(v:system.Double) : system.Int64 
+	public static inline function toInt64_Double(v:system.Double) : system.Int64 
 	{
 		// TODO: ensure that upper bits are not lost
-		return Std.int(v.ToHaxeFloat());
+		return Std.int(v.toHaxeFloat());
 	}
-	public static inline function ToUInt64_Double(v:system.Double) : system.UInt64
+	public static inline function toUInt64_Double(v:system.Double) : system.UInt64
 	{
-		return ToInt64(ToInt64_Double(v).ToHaxeInt());
+		return toInt64(toInt64_Double(v).toHaxeInt());
 	}
-	public static inline function ToSingle_Double(v:system.Double) : system.Single 
+	public static inline function toSingle_Double(v:system.Double) : system.Single 
 	{
 		// TODO: double to float truncation
-		return v.ToHaxeFloat();
+		return v.toHaxeFloat();
 	}
-	public static inline function ToDouble_Double(v:system.Double) : system.Double 
+	public static inline function toDouble_Double(v:system.Double) : system.Double 
 	{
 		return v;		
 	}
 	
 	
-	public static inline function ToBoolean_Int16(v:system.Int16) : system.Boolean
+	public static inline function toBoolean_Int16(v:system.Int16) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Int16(v:system.Int16) : system.Char
+	public static inline function toChar_Int16(v:system.Int16) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_Int16(v:system.Int16) : system.SByte 
+	public static inline function toSByte_Int16(v:system.Int16) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_Int16(v:system.Int16) : system.Byte 
+	public static inline function toByte_Int16(v:system.Int16) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_Int16(v:system.Int16) : system.Int16
+	public static inline function toInt16_Int16(v:system.Int16) : system.Int16
 	{
 		return v;
 	}
-	public static inline function ToUInt16_Int16(v:system.Int16) : system.UInt16 
+	public static inline function toUInt16_Int16(v:system.Int16) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_Int16(v:system.Int16) : system.Int32 
+	public static inline function toInt32_Int16(v:system.Int16) : system.Int32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt32_Int16(v:system.Int16) : system.UInt32 
+	public static inline function toUInt32_Int16(v:system.Int16) : system.UInt32 
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToInt64_Int16(v:system.Int16) : system.Int64 
+	public static inline function toInt64_Int16(v:system.Int16) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_Int16(v:system.Int16) : system.UInt64
+	public static inline function toUInt64_Int16(v:system.Int16) : system.UInt64
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToSingle_Int16(v:system.Int16) : system.Single 
+	public static inline function toSingle_Int16(v:system.Int16) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_Int16(v:system.Int16) : system.Double
+	public static inline function toDouble_Int16(v:system.Int16) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 	
 
-	public static inline function ToBoolean_Int32(v:system.Int32) : system.Boolean
+	public static inline function toBoolean_Int32(v:system.Int32) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Int32(v:system.Int32) : system.Char
+	public static inline function toChar_Int32(v:system.Int32) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_Int32(v:system.Int32) : system.SByte 
+	public static inline function toSByte_Int32(v:system.Int32) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_Int32(v:system.Int32) : system.Byte 
+	public static inline function toByte_Int32(v:system.Int32) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_Int32(v:system.Int32) : system.Int16
+	public static inline function toInt16_Int32(v:system.Int32) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_Int32(v:system.Int32) : system.UInt16 
+	public static inline function toUInt16_Int32(v:system.Int32) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_Int32(v:system.Int32) : system.Int32 
+	public static inline function toInt32_Int32(v:system.Int32) : system.Int32 
 	{
 		return v;
 	}
-	public static inline function ToUInt32_Int32(v:system.Int32) : system.UInt32 
+	public static inline function toUInt32_Int32(v:system.Int32) : system.UInt32 
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToInt64_Int32(v:system.Int32) : system.Int64 
+	public static inline function toInt64_Int32(v:system.Int32) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_Int32(v:system.Int32) : system.UInt64
+	public static inline function toUInt64_Int32(v:system.Int32) : system.UInt64
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToSingle_Int32(v:system.Int32) : system.Single 
+	public static inline function toSingle_Int32(v:system.Int32) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_Int32(v:system.Int32) : system.Double
+	public static inline function toDouble_Int32(v:system.Int32) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 	
 
-	public static inline function ToBoolean_Int64(v:system.Int64) : system.Boolean
+	public static inline function toBoolean_Int64(v:system.Int64) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Int64(v:system.Int64) : system.Char
+	public static inline function toChar_Int64(v:system.Int64) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_Int64(v:system.Int64) : system.SByte 
+	public static inline function toSByte_Int64(v:system.Int64) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_Int64(v:system.Int64) : system.Byte 
+	public static inline function toByte_Int64(v:system.Int64) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_Int64(v:system.Int64) : system.Int16
+	public static inline function toInt16_Int64(v:system.Int64) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_Int64(v:system.Int64) : system.UInt16 
+	public static inline function toUInt16_Int64(v:system.Int64) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_Int64(v:system.Int64) : system.Int32 
+	public static inline function toInt32_Int64(v:system.Int64) : system.Int32 
 	{
-		return ToInt32(v.ToHaxeInt());
+		return toInt32(v.toHaxeInt());
 	}
-	public static inline function ToUInt32_Int64(v:system.Int64) : system.UInt32 
+	public static inline function toUInt32_Int64(v:system.Int64) : system.UInt32 
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToInt64_Int64(v:system.Int64) : system.Int64 
+	public static inline function toInt64_Int64(v:system.Int64) : system.Int64 
 	{
 		return v;
 	}
-	public static inline function ToUInt64_Int64(v:system.Int64) : system.UInt64
+	public static inline function toUInt64_Int64(v:system.Int64) : system.UInt64
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToSingle_Int64(v:system.Int64) : system.Single 
+	public static inline function toSingle_Int64(v:system.Int64) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_Int64(v:system.Int64) : system.Double
+	public static inline function toDouble_Int64(v:system.Int64) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 
 
-	public static inline function ToBoolean_SByte(v:system.SByte) : system.Boolean
+	public static inline function toBoolean_SByte(v:system.SByte) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_SByte(v:system.SByte) : system.Char
+	public static inline function toChar_SByte(v:system.SByte) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_SByte(v:system.SByte) : system.SByte 
+	public static inline function toSByte_SByte(v:system.SByte) : system.SByte 
 	{
 		return v;
 	}
-	public static inline function ToByte_SByte(v:system.SByte) : system.Byte 
+	public static inline function toByte_SByte(v:system.SByte) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_SByte(v:system.SByte) : system.Int16
+	public static inline function toInt16_SByte(v:system.SByte) : system.Int16
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt16_SByte(v:system.SByte) : system.UInt16 
+	public static inline function toUInt16_SByte(v:system.SByte) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_SByte(v:system.SByte) : system.Int32 
+	public static inline function toInt32_SByte(v:system.SByte) : system.Int32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt32_SByte(v:system.SByte) : system.UInt32 
+	public static inline function toUInt32_SByte(v:system.SByte) : system.UInt32 
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToInt64_SByte(v:system.SByte) : system.Int64 
+	public static inline function toInt64_SByte(v:system.SByte) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_SByte(v:system.SByte) : system.UInt64
+	public static inline function toUInt64_SByte(v:system.SByte) : system.UInt64
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToSingle_SByte(v:system.SByte) : system.Single 
+	public static inline function toSingle_SByte(v:system.SByte) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_SByte(v:system.SByte) : system.Double
+	public static inline function toDouble_SByte(v:system.SByte) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 	
-	public static inline function ToBoolean_Single(v:system.Single) : system.Boolean
+	public static inline function toBoolean_Single(v:system.Single) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_Single(v:system.Single) : system.Char 
+	public static inline function toChar_Single(v:system.Single) : system.Char 
 	{
 		throw new InvalidCastException("cannot cast system.Single to system.Char");
 	}
-	public static inline function ToByte_Single(v:system.Single) : system.Byte 
+	public static inline function toByte_Single(v:system.Single) : system.Byte 
 	{
-		return ToUInt8(ToInt32_Single(v).ToHaxeInt());
+		return toUInt8(toInt32_Single(v).toHaxeInt());
 	}
-	public static inline function ToSByte_Single(v:system.Single) : system.SByte 
+	public static inline function toSByte_Single(v:system.Single) : system.SByte 
 	{
-		return ToInt8(ToInt32_Single(v).ToHaxeInt());
+		return toInt8(toInt32_Single(v).toHaxeInt());
 	}
-	public static inline function ToInt16_Single(v:system.Single) : system.Int16
+	public static inline function toInt16_Single(v:system.Single) : system.Int16
 	{
-		return ToInt16(ToInt32_Single(v).ToHaxeInt());
+		return toInt16(toInt32_Single(v).toHaxeInt());
 	}
-	public static inline function ToUInt16_Single(v:system.Single) : system.UInt16 
+	public static inline function toUInt16_Single(v:system.Single) : system.UInt16 
 	{
-		return ToUInt16(ToInt32_Single(v).ToHaxeInt());
+		return toUInt16(toInt32_Single(v).toHaxeInt());
 	}
-	public static function ToInt32_Single(v:system.Single) : system.Int32 
+	public static function toInt32_Single(v:system.Single) : system.Int32 
 	{
-		return ToInt32_Double(v);
+		return toInt32_Double(v);
 	}
-	public static inline function ToUInt32_Single(v:system.Single) : system.UInt32 
+	public static inline function toUInt32_Single(v:system.Single) : system.UInt32 
 	{
-		return ToUInt32(ToInt32_Single(v).ToHaxeInt());
+		return toUInt32(toInt32_Single(v).toHaxeInt());
 	}
-	public static inline function ToInt64_Single(v:system.Single) : system.Int64 
+	public static inline function toInt64_Single(v:system.Single) : system.Int64 
 	{
 		// TODO: ensure that upper bits are not lost
-		return Std.int(v.ToHaxeFloat());
+		return Std.int(v.toHaxeFloat());
 	}
-	public static inline function ToUInt64_Single(v:system.Single) : system.UInt64
+	public static inline function toUInt64_Single(v:system.Single) : system.UInt64
 	{
-		return ToInt64(ToInt64_Single(v).ToHaxeInt());
+		return toInt64(toInt64_Single(v).toHaxeInt());
 	}
-	public static inline function ToSingle_Single(v:system.Single) : system.Single 
+	public static inline function toSingle_Single(v:system.Single) : system.Single 
 	{
 		return v;
 	}
-	public static inline function ToDouble_Single(v:system.Single) : system.Double 
+	public static inline function toDouble_Single(v:system.Single) : system.Double 
 	{
-		return v.ToHaxeFloat();
+		return v.toHaxeFloat();
 	}
 	
 		
-	public static inline function ToBoolean_UInt16(v:system.UInt16) : system.Boolean
+	public static inline function toBoolean_UInt16(v:system.UInt16) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_UInt16(v:system.UInt16) : system.Char
+	public static inline function toChar_UInt16(v:system.UInt16) : system.Char
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToSByte_UInt16(v:system.UInt16) : system.SByte 
+	public static inline function toSByte_UInt16(v:system.UInt16) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_UInt16(v:system.UInt16) : system.Byte 
+	public static inline function toByte_UInt16(v:system.UInt16) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_UInt16(v:system.UInt16) : system.Int16
+	public static inline function toInt16_UInt16(v:system.UInt16) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_UInt16(v:system.UInt16) : system.UInt16 
+	public static inline function toUInt16_UInt16(v:system.UInt16) : system.UInt16 
 	{
 		return v;
 	}
-	public static inline function ToInt32_UInt16(v:system.UInt16) : system.Int32 
+	public static inline function toInt32_UInt16(v:system.UInt16) : system.Int32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt32_UInt16(v:system.UInt16) : system.UInt32 
+	public static inline function toUInt32_UInt16(v:system.UInt16) : system.UInt32 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToInt64_UInt16(v:system.UInt16) : system.Int64 
+	public static inline function toInt64_UInt16(v:system.UInt16) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_UInt16(v:system.UInt16) : system.UInt64
+	public static inline function toUInt64_UInt16(v:system.UInt16) : system.UInt64
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToSingle_UInt16(v:system.UInt16) : system.Single 
+	public static inline function toSingle_UInt16(v:system.UInt16) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_UInt16(v:system.UInt16) : system.Double
+	public static inline function toDouble_UInt16(v:system.UInt16) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 
 		
-	public static inline function ToBoolean_UInt32(v:system.UInt32) : system.Boolean
+	public static inline function toBoolean_UInt32(v:system.UInt32) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_UInt32(v:system.UInt32) : system.Char
+	public static inline function toChar_UInt32(v:system.UInt32) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_UInt32(v:system.UInt32) : system.SByte 
+	public static inline function toSByte_UInt32(v:system.UInt32) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_UInt32(v:system.UInt32) : system.Byte 
+	public static inline function toByte_UInt32(v:system.UInt32) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_UInt32(v:system.UInt32) : system.Int16
+	public static inline function toInt16_UInt32(v:system.UInt32) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_UInt32(v:system.UInt32) : system.UInt16 
+	public static inline function toUInt16_UInt32(v:system.UInt32) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_UInt32(v:system.UInt32) : system.Int32 
+	public static inline function toInt32_UInt32(v:system.UInt32) : system.Int32 
 	{
-		return ToInt32(v.ToHaxeInt());
+		return toInt32(v.toHaxeInt());
 	}
-	public static inline function ToUInt32_UInt32(v:system.UInt32) : system.UInt32 
+	public static inline function toUInt32_UInt32(v:system.UInt32) : system.UInt32 
 	{
 		return v;
 	}
-	public static inline function ToInt64_UInt32(v:system.UInt32) : system.Int64 
+	public static inline function toInt64_UInt32(v:system.UInt32) : system.Int64 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToUInt64_UInt32(v:system.UInt32) : system.UInt64
+	public static inline function toUInt64_UInt32(v:system.UInt32) : system.UInt64
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToSingle_UInt32(v:system.UInt32) : system.Single 
+	public static inline function toSingle_UInt32(v:system.UInt32) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_UInt32(v:system.UInt32) : system.Double
+	public static inline function toDouble_UInt32(v:system.UInt32) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 	
 		
-	public static inline function ToBoolean_UInt64(v:system.UInt64) : system.Boolean
+	public static inline function toBoolean_UInt64(v:system.UInt64) : system.Boolean
 	{
 		return v != 0;
 	}
-	public static inline function ToChar_UInt64(v:system.UInt64) : system.Char
+	public static inline function toChar_UInt64(v:system.UInt64) : system.Char
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToSByte_UInt64(v:system.UInt64) : system.SByte 
+	public static inline function toSByte_UInt64(v:system.UInt64) : system.SByte 
 	{
-		return ToInt8(v.ToHaxeInt());
+		return toInt8(v.toHaxeInt());
 	}
-	public static inline function ToByte_UInt64(v:system.UInt64) : system.Byte 
+	public static inline function toByte_UInt64(v:system.UInt64) : system.Byte 
 	{
-		return ToUInt8(v.ToHaxeInt());
+		return toUInt8(v.toHaxeInt());
 	}
-	public static inline function ToInt16_UInt64(v:system.UInt64) : system.Int16
+	public static inline function toInt16_UInt64(v:system.UInt64) : system.Int16
 	{
-		return ToInt16(v.ToHaxeInt());
+		return toInt16(v.toHaxeInt());
 	}
-	public static inline function ToUInt16_UInt64(v:system.UInt64) : system.UInt16 
+	public static inline function toUInt16_UInt64(v:system.UInt64) : system.UInt16 
 	{
-		return ToUInt16(v.ToHaxeInt());
+		return toUInt16(v.toHaxeInt());
 	}
-	public static inline function ToInt32_UInt64(v:system.UInt64) : system.Int32 
+	public static inline function toInt32_UInt64(v:system.UInt64) : system.Int32 
 	{
-		return ToInt32(v.ToHaxeInt());
+		return toInt32(v.toHaxeInt());
 	}
-	public static inline function ToUInt32_UInt64(v:system.UInt64) : system.UInt32 
+	public static inline function toUInt32_UInt64(v:system.UInt64) : system.UInt32 
 	{
-		return ToUInt32(v.ToHaxeInt());
+		return toUInt32(v.toHaxeInt());
 	}
-	public static inline function ToInt64_UInt64(v:system.UInt64) : system.Int64 
+	public static inline function toInt64_UInt64(v:system.UInt64) : system.Int64 
 	{
-		return ToInt32(v.ToHaxeInt());
+		return toInt32(v.toHaxeInt());
 	}
-	public static inline function ToUInt64_UInt64(v:system.UInt64) : system.UInt64
+	public static inline function toUInt64_UInt64(v:system.UInt64) : system.UInt64
 	{
 		return v;
 	}
-	public static inline function ToSingle_UInt64(v:system.UInt64) : system.Single 
+	public static inline function toSingle_UInt64(v:system.UInt64) : system.Single 
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
-	public static inline function ToDouble_UInt64(v:system.UInt64) : system.Double
+	public static inline function toDouble_UInt64(v:system.UInt64) : system.Double
 	{
-		return v.ToHaxeInt();
+		return v.toHaxeInt();
 	}
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/CsMath.hx b/Phase/Mscorlib/system/CsMath.hx
index 7adc8b880..ddf6adabb 100644
--- a/Phase/Mscorlib/system/CsMath.hx
+++ b/Phase/Mscorlib/system/CsMath.hx
@@ -2,35 +2,35 @@ package system;
 
 class CsMath 
 {
-	public static inline function Min_Byte_Byte(a:Byte, b:Byte) : Byte return untyped Math.min(a.ToHaxeInt(), b.ToHaxeInt());
-	public static inline function Min_Int32_Int32(a:Int32, b:Int32) : Int32 return untyped Math.min(a.ToHaxeInt(), b.ToHaxeInt());
-	public static inline function Min_Double_Double(a:Double, b:Double) : Double return untyped Math.min(a.ToHaxeFloat(), b.ToHaxeFloat());
-	public static inline function Max_Int32_Int32(a:Int32, b:Int32) : Int32 return untyped Math.max(a.ToHaxeInt(), b.ToHaxeInt());
-	public static inline function Max_Byte_Byte(a:Byte, b:Byte) : Byte return untyped Math.max(a.ToHaxeInt(), b.ToHaxeInt());
-	public static inline function Min_Int64_Int64(a:system.Int64, b:system.Int64) : system.Int64 return a.ToHaxeInt() < b.ToHaxeInt() ? a : b;
-	public static inline function Max_Single_Single(a:Single, b:Single) : Single return Math.max(a.ToHaxeFloat(), b.ToHaxeFloat());
-	public static inline function Max_Double_Double(a:Double, b:Double) : Double return Math.max(a.ToHaxeFloat(), b.ToHaxeFloat());
-	public static inline function Min_Single_Single(a:Single, b:Single) : Single return Math.min(a.ToHaxeFloat(), b.ToHaxeFloat());
-	public static inline function Abs_Single(a:Single) : Single return Math.abs(a.ToHaxeFloat());
-	public static inline function Abs_Int32(a:Int32) : Int32 return untyped Math.abs(a.ToHaxeInt());
-	public static inline function Round_Double(a:Double) : Double return Math.round(a.ToHaxeFloat());
-	public static inline function Round_Single(a:Single) : Single return Math.round(a.ToHaxeFloat());
-	public static inline function Sin(a:Double) : Double return Math.sin(a.ToHaxeFloat());
-	public static inline function Cos(a:Double) : Double return Math.cos(a.ToHaxeFloat());
-	public static inline function Tan(a:Double) : Double return Math.tan(a.ToHaxeFloat());
-	public static inline function Pow(v:Double, exp:Double) : Double return Math.pow(v.ToHaxeFloat(), exp.ToHaxeFloat());
-	public static inline function Ceiling_Single(v:Single) : Single return Math.ceil(v.ToHaxeFloat());
-	public static inline function Ceiling_Double(v:Double) : Double return Math.ceil(v.ToHaxeFloat());
-	public static inline function Floor_Single(v:Single) : Single return Math.floor(v.ToHaxeFloat());
-	public static inline function Floor_Double(v:Double) : Double return Math.floor(v.ToHaxeFloat());
-	public static inline function Sign_Single(v:Single) : Single return Math.floor(v.ToHaxeFloat());
-	public static inline function Sign_Double(v:Double) : system.Int32 return if( v < 0 ) -1 else if (v > 0) 1 else 0;
-	public static inline function Log_Double(a:Double) : system.Double return Math.log(a.ToHaxeFloat());
-	public static inline function Log_Double_Double(a:Double, newBase:Double) : system.Double return Math.log(a.ToHaxeFloat()) / Math.log(newBase.ToHaxeFloat());
-	public static inline function Log10(a:Double) : system.Double return Log_Double_Double(a, 10);
-	public static inline function Abs_Double(v:Double) : Double return Math.abs(v.ToHaxeFloat());
-	public static inline function Sqrt(v:Double) : Double return Math.sqrt(v.ToHaxeFloat());
-	public static inline function Exp(v:Double) : Double return Math.exp(v.ToHaxeFloat());
-	public static inline function Asin(v:Double) : Double return Math.asin(v.ToHaxeFloat());
+	public static inline function min_Byte_Byte(a:Byte, b:Byte) : Byte return untyped Math.min(a.toHaxeInt(), b.toHaxeInt());
+	public static inline function min_Int32_Int32(a:Int32, b:Int32) : Int32 return untyped Math.min(a.toHaxeInt(), b.toHaxeInt());
+	public static inline function min_Double_Double(a:Double, b:Double) : Double return untyped Math.min(a.toHaxeFloat(), b.toHaxeFloat());
+	public static inline function max_Int32_Int32(a:Int32, b:Int32) : Int32 return untyped Math.max(a.toHaxeInt(), b.toHaxeInt());
+	public static inline function max_Byte_Byte(a:Byte, b:Byte) : Byte return untyped Math.max(a.toHaxeInt(), b.toHaxeInt());
+	public static inline function min_Int64_Int64(a:system.Int64, b:system.Int64) : system.Int64 return a.toHaxeInt() < b.toHaxeInt() ? a : b;
+	public static inline function max_Single_Single(a:Single, b:Single) : Single return Math.max(a.toHaxeFloat(), b.toHaxeFloat());
+	public static inline function max_Double_Double(a:Double, b:Double) : Double return Math.max(a.toHaxeFloat(), b.toHaxeFloat());
+	public static inline function min_Single_Single(a:Single, b:Single) : Single return Math.min(a.toHaxeFloat(), b.toHaxeFloat());
+	public static inline function abs_Single(a:Single) : Single return Math.abs(a.toHaxeFloat());
+	public static inline function abs_Int32(a:Int32) : Int32 return untyped Math.abs(a.toHaxeInt());
+	public static inline function round_Double(a:Double) : Double return Math.round(a.toHaxeFloat());
+	public static inline function round_Single(a:Single) : Single return Math.round(a.toHaxeFloat());
+	public static inline function sin(a:Double) : Double return Math.sin(a.toHaxeFloat());
+	public static inline function cos(a:Double) : Double return Math.cos(a.toHaxeFloat());
+	public static inline function tan(a:Double) : Double return Math.tan(a.toHaxeFloat());
+	public static inline function pow(v:Double, exp:Double) : Double return Math.pow(v.toHaxeFloat(), exp.toHaxeFloat());
+	public static inline function ceiling_Single(v:Single) : Single return Math.ceil(v.toHaxeFloat());
+	public static inline function ceiling_Double(v:Double) : Double return Math.ceil(v.toHaxeFloat());
+	public static inline function floor_Single(v:Single) : Single return Math.floor(v.toHaxeFloat());
+	public static inline function floor_Double(v:Double) : Double return Math.floor(v.toHaxeFloat());
+	public static inline function sign_Single(v:Single) : Single return Math.floor(v.toHaxeFloat());
+	public static inline function sign_Double(v:Double) : system.Int32 return if( v < 0 ) -1 else if (v > 0) 1 else 0;
+	public static inline function log_Double(a:Double) : system.Double return Math.log(a.toHaxeFloat());
+	public static inline function log_Double_Double(a:Double, newBase:Double) : system.Double return Math.log(a.toHaxeFloat()) / Math.log(newBase.toHaxeFloat());
+	public static inline function log10(a:Double) : system.Double return log_Double_Double(a, 10);
+	public static inline function abs_Double(v:Double) : Double return Math.abs(v.toHaxeFloat());
+	public static inline function sqrt(v:Double) : Double return Math.sqrt(v.toHaxeFloat());
+	public static inline function exp(v:Double) : Double return Math.exp(v.toHaxeFloat());
+	public static inline function asin(v:Double) : Double return Math.asin(v.toHaxeFloat());
 
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/CsString.hx b/Phase/Mscorlib/system/CsString.hx
index a2692d320..cc6ab031c 100644
--- a/Phase/Mscorlib/system/CsString.hx
+++ b/Phase/Mscorlib/system/CsString.hx
@@ -4,24 +4,25 @@ abstract CsString(String) from String to String
 {
 	public inline function new(s:String) this = s;	
 	
-	public inline function ToHaxeString(): String return this;
+	public inline function toHaxeString(): String return this;
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() :Int32 return this.length;
-	public inline function get_Chars(i:Int32) : Char return Char.fromCode(this.charCodeAt(i.ToHaxeInt()));
+	public var length(get, never):Int32;
+	public inline function get_length() :Int32 return this.length;
+	public inline function get_chars(i:Int32) : Char return Char.fromCode(this.charCodeAt(i.toHaxeInt()));
+	public inline function get(i:Int32) : Char return Char.fromCode(this.charCodeAt(i.toHaxeInt()));
 	
-	public inline function Substring_Int32(start:Int32) : CsString return this.substr(start.ToHaxeInt());
-	public inline function Substring_Int32_Int32(start:Int32, length:Int32) : CsString return this.substr(start.ToHaxeInt(), length.ToHaxeInt());
-	public inline function Replace_CsString_CsString(from:CsString, with :CsString) : CsString return StringTools.replace(this, from.ToHaxeString(), with.ToHaxeString() );
-	public inline function IndexOf_Char(ch:Char) : Int32 return this.indexOf(ch.ToString());
-	public inline function IndexOf_CsString(ch:CsString) : Int32 return this.indexOf(ch.ToHaxeString());
-	public inline function LastIndexOf_Char(ch:Char) : Int32 return this.lastIndexOf(ch.ToString());
-	public inline function LastIndexOf_CsString(ch:CsString) : Int32 return this.lastIndexOf(ch.ToHaxeString());
-	public inline function EndsWith_CsString(end:CsString) : Boolean return StringTools.endsWith(this, end.ToHaxeString());
-	public inline function Contains(s:CsString) : Boolean return this.indexOf(s.ToHaxeString()) != -1;
-	public inline function Trim() : CsString return StringTools.trim(this);
+	public inline function substring_Int32(start:Int32) : CsString return this.substr(start.toHaxeInt());
+	public inline function substring_Int32_Int32(start:Int32, length:Int32) : CsString return this.substr(start.toHaxeInt(), length.toHaxeInt());
+	public inline function replace_CsString_CsString(from:CsString, with :CsString) : CsString return StringTools.replace(this, from.toHaxeString(), with.toHaxeString() );
+	public inline function indexOf_Char(ch:Char) : Int32 return this.indexOf(ch.toString());
+	public inline function indexOf_CsString(ch:CsString) : Int32 return this.indexOf(ch.toHaxeString());
+	public inline function lastIndexOf_Char(ch:Char) : Int32 return this.lastIndexOf(ch.toString());
+	public inline function lastIndexOf_CsString(ch:CsString) : Int32 return this.lastIndexOf(ch.toHaxeString());
+	public inline function endsWith_CsString(end:CsString) : Boolean return StringTools.endsWith(this, end.toHaxeString());
+	public inline function contains(s:CsString) : Boolean return this.indexOf(s.toHaxeString()) != -1;
+	public inline function trim() : CsString return StringTools.trim(this);
 	
-	public function Split_CharArray(chars:Array<Int32>) : Array<CsString>
+	public function split_CharArray(chars:Array<Int32>) : Array<CsString>
 	{
 		var strings = new Array<CsString>();
 		var startPos = 0;
@@ -49,16 +50,16 @@ abstract CsString(String) from String to String
 		return strings;
 	}
 	
-	public static inline function IsNullOrEmpty(s:CsString) : Boolean return (s == null || s.Length == 0);
-	public static inline function IsNullOrWhiteSpace(s:CsString) : Boolean return (s == null || s.Trim().Length == 0);
-	public static inline function FromCharCode(s:Int32) : CsString return String.fromCharCode(s.ToHaxeInt());
-	public static function Format(format:CsString, args:FixedArray<Any>) : CsString
+	public static inline function isNullOrEmpty(s:CsString) : Boolean return (s == null || s.length == 0);
+	public static inline function isNullOrWhiteSpace(s:CsString) : Boolean return (s == null || s.trim().length == 0);
+	public static inline function fromCharCode(s:Int32) : CsString return String.fromCharCode(s.toHaxeInt());
+	public static function format(format:CsString, args:FixedArray<Any>) : CsString
 	{
 		var sb = new StringBuf();
 		
 		// based on https://github.com/dotnet/coreclr/blob/master/src/mscorlib/shared/System/Text/StringBuilder.cs#L1362
 		var pos : Int32 = 0; 
-		var len : Int32 = format.Length;
+		var len : Int32 = format.length;
 		var ch : Char = 0;
 		var unescapedItemFormat:StringBuf = null;
 		
@@ -66,14 +67,14 @@ abstract CsString(String) from String to String
 		{
 			while(pos < len)
 			{
-				ch = format.get_Chars(pos);
+				ch = format.get_chars(pos);
 				pos++;
 				
 				// Is it a closing brace?
 				if(ch == "}")
 				{
 					// Check next character (if there is one) to see if it is escaped. eg }}
-					if(pos < len && format.get_Chars(pos) == "}")
+					if(pos < len && format.get_chars(pos) == "}")
 					{
 						pos++;
 					}
@@ -88,7 +89,7 @@ abstract CsString(String) from String to String
 				if(ch == "{")
 				{
 					// Check next character (if there is one) to see if it is escaped. eg {{
-					if(pos < len && format.get_Chars(pos) == "{")
+					if(pos < len && format.get_chars(pos) == "{")
 					{
 						pos++;
 					}
@@ -100,7 +101,7 @@ abstract CsString(String) from String to String
 					}
 				}
 				// If it neither then treat the character as just text.
-				sb.addChar(ch.ToHaxeInt());
+				sb.addChar(ch.toHaxeInt());
 			}
 			
 			//
@@ -116,7 +117,7 @@ abstract CsString(String) from String to String
 			pos++;
 			// If reached end of text then error (Unexpected end of text)
 			// or character is not a digit then error (Unexpected Character)
-			if (pos == len || (ch = format.get_Chars(pos)) < '0' || ch > '9') 
+			if (pos == len || (ch = format.get_chars(pos)) < '0' || ch > '9') 
 			{
 				throw new FormatException().FormatException_CsString("invalid format");
 			}
@@ -131,18 +132,18 @@ abstract CsString(String) from String to String
 				{
 					throw new FormatException().FormatException_CsString("invalid format");
 				}
-				ch = format.get_Chars(pos);
+				ch = format.get_chars(pos);
 				// so long as character is digit and value of the index is less than 1000000 ( index limit )
 			} while (ch >= '0' && ch <= '9' && index < 1000000);
 
 			// If value of index is not within the range of the arguments passed in then error (Index out of range)
-			if (index >= args.Length)
+			if (index >= args.length)
 			{
 				throw new FormatException().FormatException_CsString("format specifiers out of range");
 			}
 			
 			// Consume optional whitespace.
-			while (pos < len && (ch = format.get_Chars(pos)) == ' ') pos++;
+			while (pos < len && (ch = format.get_chars(pos)) == ' ') pos++;
 			// End of parsing index parameter.
 
 			//
@@ -157,13 +158,13 @@ abstract CsString(String) from String to String
 				pos++;
 
 				// Consume Optional whitespace
-				while (pos < len && format.get_Chars(pos) == ' ') pos++;
+				while (pos < len && format.get_chars(pos) == ' ') pos++;
 
 				// If reached the end of the text then error (Unexpected end of text)
 				if (pos == len) throw new FormatException().FormatException_CsString("invalid format");
 
 				// Is there a minus sign?
-				ch = format.get_Chars(pos);
+				ch = format.get_chars(pos);
 				if (ch == '-')
 				{
 					// Yes, then alignment is left justified.
@@ -171,7 +172,7 @@ abstract CsString(String) from String to String
 					pos++;
 					// If reached end of text then error (Unexpected end of text)
 					if (pos == len) throw new FormatException().FormatException_CsString("invalid format");
-					ch = format.get_Chars(pos);
+					ch = format.get_chars(pos);
 				}
 				
 				// If current character is not a digit then error (Unexpected character)
@@ -183,14 +184,14 @@ abstract CsString(String) from String to String
 					pos++;
 					// If reached end of text then error. (Unexpected end of text)
 					if (pos == len) throw new FormatException().FormatException_CsString("invalid format");
-					ch = format.get_Chars(pos);
+					ch = format.get_chars(pos);
 					// So long a current character is a digit and the value of width is less than 100000 ( width limit )
 				} while (ch >= '0' && ch <= '9' && width < 100000);
 				// end of parsing Argument Alignment
 			}
 			
 			// Consume optional whitespace
-			while (pos < len && (ch = format.get_Chars(pos)) == ' ') pos++;
+			while (pos < len && (ch = format.get_chars(pos)) == ' ') pos++;
 			
 			//
 			// Start of parsing of optional formatting parameter.
@@ -208,7 +209,7 @@ abstract CsString(String) from String to String
 				{
 					// If reached end of text then error. (Unexpected end of text)
 					if (pos == len) throw new FormatException().FormatException_CsString("invalid format");
-					ch = format.get_Chars(pos);
+					ch = format.get_chars(pos);
 					pos++;
 
 					// Is character a opening or closing brace?
@@ -217,7 +218,7 @@ abstract CsString(String) from String to String
 						if (ch == '{')
 						{
 							// Yes, is next character also a opening brace, then treat as escaped. eg {{
-							if (pos < len && format.get_Chars(pos) == '{')
+							if (pos < len && format.get_chars(pos) == '{')
 								pos++;
 							else
 								// Error Argument Holes can not be nested.
@@ -226,7 +227,7 @@ abstract CsString(String) from String to String
 						else
 						{
 							// Yes, is next character also a closing brace, then treat as escaped. eg }}
-							if (pos < len && format.get_Chars(pos) == '}')
+							if (pos < len && format.get_chars(pos) == '}')
 								pos++;
 							else
 							{
@@ -242,7 +243,7 @@ abstract CsString(String) from String to String
 						{
 							unescapedItemFormat = new StringBuf();
 						}
-						unescapedItemFormat.addSub(format, startPos.ToHaxeInt(), (pos - startPos - 1).ToHaxeInt());
+						unescapedItemFormat.addSub(format, startPos.toHaxeInt(), (pos - startPos - 1).toHaxeInt());
 						startPos = pos;
 					}
 				}
@@ -251,12 +252,12 @@ abstract CsString(String) from String to String
 				{
 					if (startPos != pos)
 					{
-						itemFormat = format.Substring_Int32_Int32(startPos, pos - startPos);
+						itemFormat = format.substring_Int32_Int32(startPos, pos - startPos);
 					}
 				}
 				else
 				{
-					unescapedItemFormat.addSub(format, startPos.ToHaxeInt(), (pos - startPos).ToHaxeInt());
+					unescapedItemFormat.addSub(format, startPos.toHaxeInt(), (pos - startPos).toHaxeInt());
 					itemFormat = unescapedItemFormat.toString();
 					unescapedItemFormat = new StringBuf();
 				}
@@ -276,47 +277,47 @@ abstract CsString(String) from String to String
 
 		return sb.toString();
 	}
-	public static function Format_CsString_Object(format:CsString, arg:system.Object) : CsString
+	public static function format_CsString_Object(format:CsString, arg:system.Object) : CsString
 	{
-		return Format(format, [arg]);
+		return CsString.format(format, [arg]);
 	}
-	public static function Format_CsString_ObjectArray(format:CsString, args:system.FixedArray<system.Object>) : CsString
+	public static function format_CsString_ObjectArray(format:CsString, args:system.FixedArray<system.Object>) : CsString
 	{
-		return Format(format, args);
+		return CsString.format(format, args);
 	}
-	public static function Join_CsString_IEnumerable_T1<T>(separator:CsString, v:system.collections.generic.IEnumerable<T>) : CsString
+	public static function join_CsString_IEnumerable_T1<T>(separator:CsString, v:system.collections.generic.IEnumerable<T>) : CsString
 	{
 		var s = "";
 
-		var enumerator = v.GetEnumerator();
+		var enumerator = v.getEnumerator();
 		var first = true;
-		while(enumerator.MoveNext())
+		while(enumerator.moveNext())
 		{
 			if(!first) s += separator;
-			s += Std.string(enumerator.Current);
+			s += Std.string(enumerator.current);
 			first = false;
 		}
 		
 		return s;
 	}
 	
-	public static function Join_CsString_IEnumerable_CsString<T>(separator:CsString, v:system.collections.generic.IEnumerable<CsString>) : CsString
+	public static function join_CsString_IEnumerable_CsString<T>(separator:CsString, v:system.collections.generic.IEnumerable<CsString>) : CsString
 	{
 		var s = "";
 
-		var enumerator = v.GetEnumerator();
+		var enumerator = v.getEnumerator();
 		var first = true;
-		while(enumerator.MoveNext())
+		while(enumerator.moveNext())
 		{
 			if(!first) s += separator;
-			s += enumerator.Current;
+			s += enumerator.current;
 			first = false;
 		}
 		
 		return s;
 	}
 
-	public static function Join_CsString_CsStringArray(separator:CsString, args: system.FixedArray<CsString> ) : CsString
+	public static function join_CsString_CsStringArray(separator:CsString, args: system.FixedArray<CsString> ) : CsString
 	{
 		var s = "";
 
@@ -331,30 +332,30 @@ abstract CsString(String) from String to String
 		return s;
 	}
 
-	public inline function StartsWith_CsString(s:CsString) : Boolean return StringTools.startsWith(this, s); 
+	public inline function startsWith_CsString(s:CsString) : Boolean return StringTools.startsWith(this, s); 
 	
-	public inline function ToLower() :CsString return this.toLowerCase();
-	public inline function ToUpper() :CsString return this.toUpperCase();
+	public inline function toLower() :CsString return this.toLowerCase();
+	public inline function toUpper() :CsString return this.toUpperCase();
 	
-	@:op(A + B) public static inline function add1(lhs : system.CsString, rhs : String) : system.CsString return lhs.ToHaxeString() + rhs;
-	@:op(A + B) public static inline function add2(lhs : String, rhs : system.CsString) : system.CsString return lhs + rhs.ToHaxeString();
+	@:op(A + B) public static inline function add1(lhs : system.CsString, rhs : String) : system.CsString return lhs.toHaxeString() + rhs;
+	@:op(A + B) public static inline function add2(lhs : String, rhs : system.CsString) : system.CsString return lhs + rhs.toHaxeString();
 	
-	@:op(A + B) public static inline function add3(lhs : system.CsString, rhs : Int) : system.CsString return lhs.ToHaxeString() + Std.string(rhs);
-	@:op(A + B) public static inline function add4(lhs : Int, rhs : system.CsString) : system.CsString return Std.string(lhs) + rhs.ToHaxeString();
+	@:op(A + B) public static inline function add3(lhs : system.CsString, rhs : Int) : system.CsString return lhs.toHaxeString() + Std.string(rhs);
+	@:op(A + B) public static inline function add4(lhs : Int, rhs : system.CsString) : system.CsString return Std.string(lhs) + rhs.toHaxeString();
 	
 	@:op(A + B) public static inline function add5(lhs : system.CsString, rhs : Float) : system.CsString return lhs + Std.string(rhs);
 	@:op(A + B) public static inline function add6(lhs : Float, rhs : system.CsString) : system.CsString return Std.string(lhs) + rhs;
 
-	@:op(A + B) public static inline function add7(lhs : system.CsString, rhs : system.Char) : system.CsString return lhs + rhs.ToString();
-	@:op(A + B) public static inline function add8(lhs : system.CsString, rhs : system.Byte) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add9(lhs : system.CsString, rhs : system.Int16) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add10(lhs : system.CsString, rhs : system.Int32) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add11(lhs : system.CsString, rhs : system.Int64) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add12(lhs : system.CsString, rhs : system.SByte) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add13(lhs : system.CsString, rhs : system.UInt16) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add14(lhs : system.CsString, rhs : system.UInt32) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add15(lhs : system.CsString, rhs : system.UInt64) : system.CsString return lhs + rhs.ToString();
-	@:op(A + B) public static inline function add16(lhs : system.CsString, rhs : system.Single) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add17(lhs : system.CsString, rhs : system.Double) : system.CsString return lhs + rhs.ToString();
-    @:op(A + B) public static inline function add18(lhs : system.CsString, rhs : system.CsString) : system.CsString return lhs.ToHaxeString() + rhs.ToHaxeString();
+	@:op(A + B) public static inline function add7(lhs : system.CsString, rhs : system.Char) : system.CsString return lhs + rhs.toString();
+	@:op(A + B) public static inline function add8(lhs : system.CsString, rhs : system.Byte) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add9(lhs : system.CsString, rhs : system.Int16) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add10(lhs : system.CsString, rhs : system.Int32) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add11(lhs : system.CsString, rhs : system.Int64) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add12(lhs : system.CsString, rhs : system.SByte) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add13(lhs : system.CsString, rhs : system.UInt16) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add14(lhs : system.CsString, rhs : system.UInt32) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add15(lhs : system.CsString, rhs : system.UInt64) : system.CsString return lhs + rhs.toString();
+	@:op(A + B) public static inline function add16(lhs : system.CsString, rhs : system.Single) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add17(lhs : system.CsString, rhs : system.Double) : system.CsString return lhs + rhs.toString();
+    @:op(A + B) public static inline function add18(lhs : system.CsString, rhs : system.CsString) : system.CsString return lhs.toHaxeString() + rhs.toHaxeString();
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/CsType.hx b/Phase/Mscorlib/system/CsType.hx
index c2f4c9f1d..41a362853 100644
--- a/Phase/Mscorlib/system/CsType.hx
+++ b/Phase/Mscorlib/system/CsType.hx
@@ -4,8 +4,8 @@ abstract CsType<T>(Class<T>) from Class<T> to Class<T>
 {
 	public function new(cls : Class<T>) this = cls;
 	
-	public var Name(get,never):CsString;
-	public function get_Name() : CsString 
+	public var name(get,never):CsString;
+	public function get_name() : CsString 
 	{
 		var fullName = Type.getClassName(this);
 		var i = fullName.lastIndexOf(".");
diff --git a/Phase/Mscorlib/system/Double.hx b/Phase/Mscorlib/system/Double.hx
index 874ad5758..379533c51 100644
--- a/Phase/Mscorlib/system/Double.hx
+++ b/Phase/Mscorlib/system/Double.hx
@@ -4,38 +4,38 @@ abstract Double(Float) from Float from Int
 {
 	public inline function new(i:Float) this = i;
 	
-	@:from public static inline function FromInt(i:Int) : Double return new Double(i);
-	@:from public static inline function FromByte(i:system.Byte) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromInt16(i:system.Int16) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromInt32(i:system.Int32) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromInt64(i:system.Int64) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromSByte(i:system.Byte) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromUInt16(i:system.UInt16) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromUInt32(i:system.UInt32) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromUInt64(i:system.UInt64) : Double return new Double(i.ToHaxeInt());
-	@:from public static inline function FromSingle(i:Single) : Double return new Double(i.ToHaxeFloat());
+	@:from public static inline function fromInt(i:Int) : Double return new Double(i);
+	@:from public static inline function fromByte(i:system.Byte) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromInt16(i:system.Int16) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromInt32(i:system.Int32) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromInt64(i:system.Int64) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromSByte(i:system.Byte) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromUInt16(i:system.UInt16) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromUInt32(i:system.UInt32) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromUInt64(i:system.UInt64) : Double return new Double(i.toHaxeInt());
+	@:from public static inline function fromSingle(i:Single) : Double return new Double(i.toHaxeFloat());
 
-	public inline function ToHaxeFloat(): Float return this;
-	public inline function ToString() : system.CsString return Std.string(this);
-	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Double(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Double(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Double(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Double(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Double(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Double(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Double(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Double(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Double(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Double(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Double(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Double(this);
-	
-	public function GetHashCode() : system.Int32 return system.Convert.ToHashCode_Double(this);
+	public inline function toHaxeFloat(): Float return this;
+	public inline function toString() : system.CsString return Std.string(this);
+	
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Double(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Double(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Double(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Double(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Double(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Double(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Double(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Double(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Double(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Double(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Double(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Double(this);
+	
+	public function getHashCode() : system.Int32 return system.Convert.toHashCode_Double(this);
 		
 	public static var NaN(get, never) : system.Double;
 	public static inline function get_NaN() : system.Double return Math.NaN;
-	public static inline function IsNaN(v:system.Double) : system.Boolean return Math.isNaN(v.ToHaxeFloat());
+	public static inline function isNaN(v:system.Double) : system.Boolean return Math.isNaN(v.toHaxeFloat());
 	
 	@:op(-A) public inline function neg() : system.Double return -this;
 
diff --git a/Phase/Mscorlib/system/DoubleArray.hx b/Phase/Mscorlib/system/DoubleArray.hx
index c62ebea12..4774eff14 100644
--- a/Phase/Mscorlib/system/DoubleArray.hx
+++ b/Phase/Mscorlib/system/DoubleArray.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract DoubleArray(js.html.Float64Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Float64Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Float64Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Double>):DoubleArray return cast new js.html.Float64Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Double>):DoubleArray return cast new js.html.Float64Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Double>):DoubleArray return cast new js.html.Float64Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Double return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Double):Double return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):Double return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Double):Double return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<Double> return new DoubleArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Double> return new DoubleArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Double> return new DoubleArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new DoubleArray(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/DoubleArrayEnumerable.hx b/Phase/Mscorlib/system/DoubleArrayEnumerable.hx
index 7dd81b61a..dbb273a16 100644
--- a/Phase/Mscorlib/system/DoubleArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/DoubleArrayEnumerable.hx
@@ -11,7 +11,7 @@ class DoubleArrayEnumerable implements IEnumerable<Double>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Double>
+	public function getEnumerator() : IEnumerator<Double>
 	{
 		return new DoubleArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/DoubleArrayEnumerator.hx b/Phase/Mscorlib/system/DoubleArrayEnumerator.hx
index d12225c69..eb0bc5269 100644
--- a/Phase/Mscorlib/system/DoubleArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/DoubleArrayEnumerator.hx
@@ -13,16 +13,16 @@ class DoubleArrayEnumerator implements IEnumerator<Double>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Double;
-	public function get_Current() : Double return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Double;
+	public function get_current() : Double return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/EventAction.hx b/Phase/Mscorlib/system/EventAction.hx
index 42cd36ba2..d3de2a0ac 100644
--- a/Phase/Mscorlib/system/EventAction.hx
+++ b/Phase/Mscorlib/system/EventAction.hx
@@ -4,9 +4,9 @@ abstract EventAction(Array<Void->Void>)
 {
 	public inline function new(v:Void->Void) this = v == null ? null : [v];
 	
-	@:to public inline function ToLambda() : Void->Void return Invoke;
+	@:to public inline function toLambda() : Void->Void return invoke;
 	
-	public inline function ToArray() return this;
+	public inline function toArray() return this;
 	@:op(A + B) public static function add(lhs : EventAction, rhs : Void->Void) : EventAction
 	{
 		if(lhs == null)
@@ -15,14 +15,14 @@ abstract EventAction(Array<Void->Void>)
 		}
 		else
 		{
-			lhs.ToArray().push(rhs);
+			lhs.toArray().push(rhs);
 		}	
 		return lhs;
 	}
 	
     @:op(A - B) public static function sub(lhs : EventAction, rhs : Void->Void) : EventAction
 	{
-		var raw = lhs.ToArray();
+		var raw = lhs.toArray();
 		var index = raw.indexOf(rhs);
 		if(index != -1)
 		{
@@ -35,7 +35,7 @@ abstract EventAction(Array<Void->Void>)
 		return lhs;
 	}
 	
-	public function Invoke() : Void
+	public function invoke() : Void
 	{
 		if(this == null) return;
 		for (x in this)
diff --git a/Phase/Mscorlib/system/EventAction1.hx b/Phase/Mscorlib/system/EventAction1.hx
index 86a0dc4ec..5e30b0879 100644
--- a/Phase/Mscorlib/system/EventAction1.hx
+++ b/Phase/Mscorlib/system/EventAction1.hx
@@ -5,9 +5,9 @@ abstract EventAction1<T1>(Array<T1->Void>)
 	public inline function new(v:T1->Void) this = v == null ? null : [v];
 	
 	
-	@:to public inline function ToLambda() : T1->Void return Invoke;
+	@:to public inline function toLambda() : T1->Void return invoke;
 	
-	public inline function ToArray() return this;
+	public inline function toArray() return this;
 	@:op(A + B) public static function add<T1>(lhs : EventAction1<T1>, rhs : T1->Void) : EventAction1<T1>
 	{
 		if(lhs == null)
@@ -16,14 +16,14 @@ abstract EventAction1<T1>(Array<T1->Void>)
 		}
 		else
 		{
-			lhs.ToArray().push(rhs);
+			lhs.toArray().push(rhs);
 		}	
 		return lhs;
 	}
 	
     @:op(A - B) public static function sub<T1>(lhs : EventAction1<T1>, rhs : T1->Void) : EventAction1<T1>
 	{
-		var raw = lhs.ToArray();
+		var raw = lhs.toArray();
 		var index = raw.indexOf(rhs);
 		if(index != -1)
 		{
@@ -37,7 +37,7 @@ abstract EventAction1<T1>(Array<T1->Void>)
 	}
 	
 	
-	public function Invoke(p:T1) : Void
+	public function invoke(p:T1) : Void
 	{
 		if(this == null) return;
 		for (x in this)
diff --git a/Phase/Mscorlib/system/EventAction2.hx b/Phase/Mscorlib/system/EventAction2.hx
index dfa5dde32..d3ab57fc0 100644
--- a/Phase/Mscorlib/system/EventAction2.hx
+++ b/Phase/Mscorlib/system/EventAction2.hx
@@ -4,9 +4,9 @@ abstract EventAction2<T1, T2>(Array<T1->T2->Void>)
 {
 	public inline function new(v:T1->T2->Void) this = v == null ? null : [v];
 		
-	@:to public inline function ToLambda() : T1->T2->Void return Invoke;
+	@:to public inline function toLambda() : T1->T2->Void return invoke;
 	
-	public inline function ToArray() return this;
+	public inline function toArray() return this;
 	@:op(A + B) public static function add<T1, T2>(lhs : EventAction2<T1, T2>, rhs : T1->T2->Void) : EventAction2<T1, T2>
 	{
 		if(lhs == null)
@@ -15,14 +15,14 @@ abstract EventAction2<T1, T2>(Array<T1->T2->Void>)
 		}
 		else
 		{
-			lhs.ToArray().push(rhs);
+			lhs.toArray().push(rhs);
 		}	
 		return lhs;
 	}
 	
     @:op(A - B) public static function sub<T1, T2>(lhs : EventAction2<T1, T2>, rhs : T1->T2->Void) : EventAction2<T1, T2>
 	{
-		var raw = lhs.ToArray();
+		var raw = lhs.toArray();
 		var index = raw.indexOf(rhs);
 		if(index != -1)
 		{
@@ -35,7 +35,7 @@ abstract EventAction2<T1, T2>(Array<T1->T2->Void>)
 		return lhs;
 	}
 	
-	public function Invoke(p1:T1, p2:T2) : Void
+	public function invoke(p1:T1, p2:T2) : Void
 	{
 		if(this == null) return;
 		for (x in this)
diff --git a/Phase/Mscorlib/system/Exception.hx b/Phase/Mscorlib/system/Exception.hx
index 62008cd6c..83182f5cc 100644
--- a/Phase/Mscorlib/system/Exception.hx
+++ b/Phase/Mscorlib/system/Exception.hx
@@ -2,11 +2,11 @@ package system;
 
 class Exception 
 {
-	public var Message(default, null):String;
+	public var message(default, null):String;
 	
 	public function Exception_CsString(message:String)
 	{
-		Message = message;
+		this.message = message;
 		return this;
 	}
 	
diff --git a/Phase/Mscorlib/system/FixedArray.hx b/Phase/Mscorlib/system/FixedArray.hx
index f880b3d45..6344f58e2 100644
--- a/Phase/Mscorlib/system/FixedArray.hx
+++ b/Phase/Mscorlib/system/FixedArray.hx
@@ -6,21 +6,21 @@ package system;
  */
 abstract FixedArray<T>(Array<T>) to Array<T>
 {
-	public inline function new(length:Int32) this = untyped __new__(Array, length.ToHaxeInt());
+	public inline function new(length:Int32) this = untyped __new__(Array, length.toHaxeInt());
 	
-	public inline function ToHaxeArray<T>() : Array<T> return this;
+	public inline function toHaxeArray<T>() : Array<T> return this;
 	
 	@:from public static inline function fromArray<T>(a:Array<T>):FixedArray<T> return cast a;
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):T return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:T):T return this[index.ToHaxeInt()] = val;
+	@:op([]) public inline function get(index:Int32):T return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:T):T return this[index.toHaxeInt()] = val;
 	
 	public inline function iterator() : Iterator<T> return this.iterator();
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<T> return new system.collections.generic.IterableEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<T> return new system.collections.generic.IterableEnumerable(this);
 
 	public static inline function empty<T>(size:Int32) return new FixedArray<T>(size);
 	public static inline function empty2<T>(size:Int32) return new FixedArray<FixedArray<T>>(size);
diff --git a/Phase/Mscorlib/system/HaxeExtensions.hx b/Phase/Mscorlib/system/HaxeExtensions.hx
index ab2089e8f..1ab19b3ec 100644
--- a/Phase/Mscorlib/system/HaxeExtensions.hx
+++ b/Phase/Mscorlib/system/HaxeExtensions.hx
@@ -2,37 +2,37 @@ package system;
 
 class StringExtensions
 {
-	public static inline function ToHaxeString(s:String) return s;
+	public static inline function toHaxeString(s:String) return s;
 }
 
 class IntExtensions
 {
-	public static inline function ToHaxeInt(i:Int) return i;
-	public static inline function ToChar_IFormatProvider(i:Int, provider:IFormatProvider) : system.Char return i;
-	public static inline function ToSByte_IFormatProvider(i:Int, provider:IFormatProvider) : system.SByte return i;
-	public static inline function ToByte_IFormatProvider(i:Int, provider:IFormatProvider) : system.Byte return i;
-	public static inline function ToInt16_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int16 return i;
-	public static inline function ToUInt16_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt16 return i;
-	public static inline function ToInt32_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int32 return i;
-	public static inline function ToUInt32_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt32 return i;
-	public static inline function ToInt64_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int64 return i;
-	public static inline function ToUInt64_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt64 return i;
-	public static inline function ToSingle_IFormatProvider(i:Int, provider:IFormatProvider) : system.Single return i;
-	public static inline function ToDouble_IFormatProvider(i:Int, provider:IFormatProvider) : system.Double return i;
+	public static inline function toHaxeInt(i:Int) return i;
+	public static inline function toChar_IFormatProvider(i:Int, provider:IFormatProvider) : system.Char return i;
+	public static inline function toSByte_IFormatProvider(i:Int, provider:IFormatProvider) : system.SByte return i;
+	public static inline function toByte_IFormatProvider(i:Int, provider:IFormatProvider) : system.Byte return i;
+	public static inline function toInt16_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int16 return i;
+	public static inline function toUInt16_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt16 return i;
+	public static inline function toInt32_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int32 return i;
+	public static inline function toUInt32_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt32 return i;
+	public static inline function toInt64_IFormatProvider(i:Int, provider:IFormatProvider) : system.Int64 return i;
+	public static inline function toUInt64_IFormatProvider(i:Int, provider:IFormatProvider) : system.UInt64 return i;
+	public static inline function toSingle_IFormatProvider(i:Int, provider:IFormatProvider) : system.Single return i;
+	public static inline function toDouble_IFormatProvider(i:Int, provider:IFormatProvider) : system.Double return i;
 }
 class FloatExtensions
 {
-	public static inline function ToHaxeFloat(f:Float) return f;
+	public static inline function toHaxeFloat(f:Float) return f;
 
-	public static inline function ToChar_IFormatProvider(i:Float, provider:IFormatProvider) : system.Char return Std.int(i);
-	public static inline function ToSByte_IFormatProvider(i:Float, provider:IFormatProvider) : system.SByte return Std.int(i);
-	public static inline function ToByte_IFormatProvider(i:Float, provider:IFormatProvider) : system.Byte return Std.int(i);
-	public static inline function ToInt16_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int16 return Std.int(i);
-	public static inline function ToUInt16_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt16 return Std.int(i);
-	public static inline function ToInt32_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int32 return Std.int(i);
-	public static inline function ToUInt32_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt32 return Std.int(i);
-	public static inline function ToInt64_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int64 return Std.int(i);
-	public static inline function ToUInt64_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt64 return Std.int(i);
-	public static inline function ToSingle_IFormatProvider(i:Float, provider:IFormatProvider) : system.Single return Std.int(i);
-	public static inline function ToDouble_IFormatProvider(i:Float, provider:IFormatProvider) : system.Double return Std.int(i);
+	public static inline function toChar_IFormatProvider(i:Float, provider:IFormatProvider) : system.Char return Std.int(i);
+	public static inline function toSByte_IFormatProvider(i:Float, provider:IFormatProvider) : system.SByte return Std.int(i);
+	public static inline function toByte_IFormatProvider(i:Float, provider:IFormatProvider) : system.Byte return Std.int(i);
+	public static inline function toInt16_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int16 return Std.int(i);
+	public static inline function toUInt16_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt16 return Std.int(i);
+	public static inline function toInt32_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int32 return Std.int(i);
+	public static inline function toUInt32_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt32 return Std.int(i);
+	public static inline function toInt64_IFormatProvider(i:Float, provider:IFormatProvider) : system.Int64 return Std.int(i);
+	public static inline function toUInt64_IFormatProvider(i:Float, provider:IFormatProvider) : system.UInt64 return Std.int(i);
+	public static inline function toSingle_IFormatProvider(i:Float, provider:IFormatProvider) : system.Single return Std.int(i);
+	public static inline function toDouble_IFormatProvider(i:Float, provider:IFormatProvider) : system.Double return Std.int(i);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/Int16.hx b/Phase/Mscorlib/system/Int16.hx
index fc4216ac8..2421029e1 100644
--- a/Phase/Mscorlib/system/Int16.hx
+++ b/Phase/Mscorlib/system/Int16.hx
@@ -3,27 +3,27 @@ package system;
 
 abstract Int16(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToInt16(i);
+	public inline function new(i:Int) this = system.Convert.toInt16(i);
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	@:from public static inline function FromByte(c:Byte) : Int16 return new Int16(c.ToHaxeInt());
+	@:from public static inline function fromByte(c:Byte) : Int16 return new Int16(c.toHaxeInt());
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Int16(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Int16(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Int16(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Int16(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Int16(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Int16(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Int16(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Int16(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Int16(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Int16(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Int16(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Int16(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Int16(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Int16(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Int16(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Int16(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Int16(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Int16(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Int16(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Int16(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Int16(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Int16(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Int16(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Int16(this);
 
-	public inline function GetHashCode() : system.Int32 return this | (this << 16);	
+	public inline function getHashCode() : system.Int32 return this | (this << 16);	
 
 	@:op(-A) public inline function neg() : system.Int32 return -this;
 
@@ -53,9 +53,9 @@ abstract Int16(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.Int16, rhs : system.Double) : system.Double;	
 	
 
-    @:op(A / B) public static inline function div0(lhs : system.Int16, rhs : system.Int16) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.Int16, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int16) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.Int16, rhs : system.Int16) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.Int16, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int16) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.Int16, rhs : Float) : Float;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.Int16) : Float;
 		
@@ -107,8 +107,8 @@ abstract Int16(Int) from Int
     // @:op(A + B) public static function add13(lhs : system.Int16, rhs : system.UInt64) : system.UInt64;	
     @:op(A + B) public static function add14(lhs : system.Int16, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.Int16, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.Int16, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Int16, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Int16, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Int16, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 
     @:op(A - B) public static function sub0(lhs : system.Int16, rhs : system.Int16) : system.Int32;
diff --git a/Phase/Mscorlib/system/Int16Array.hx b/Phase/Mscorlib/system/Int16Array.hx
index 682504aec..3a9716263 100644
--- a/Phase/Mscorlib/system/Int16Array.hx
+++ b/Phase/Mscorlib/system/Int16Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract Int16Array(js.html.Int16Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Int16Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Int16Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Int16>):Int16Array return cast new js.html.Int16Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Int16>):Int16Array return cast new js.html.Int16Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Int16>):Int16Array return cast new js.html.Int16Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Int16 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Int16):Int16 return this[index.ToHaxeInt()] = val.ToHaxeInt();
+	@:op([]) public inline function get(index:Int32):Int16 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Int16):Int16 return this[index.toHaxeInt()] = val.toHaxeInt();
 	
 	public inline function iterator() : Iterator<Int16> return new Int16ArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Int16> return new Int16ArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Int16> return new Int16ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new Int16Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/Int16ArrayEnumerable.hx b/Phase/Mscorlib/system/Int16ArrayEnumerable.hx
index b499c4fd4..d54cda6df 100644
--- a/Phase/Mscorlib/system/Int16ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/Int16ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class Int16ArrayEnumerable implements IEnumerable<Int16>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Int16>
+	public function getEnumerator() : IEnumerator<Int16>
 	{
 		return new Int16ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/Int16ArrayEnumerator.hx b/Phase/Mscorlib/system/Int16ArrayEnumerator.hx
index 99688cf22..762de4daf 100644
--- a/Phase/Mscorlib/system/Int16ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/Int16ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class Int16ArrayEnumerator implements IEnumerator<Int16>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Int16;
-	public function get_Current() : Int16 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Int16;
+	public function get_current() : Int16 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Int32.hx b/Phase/Mscorlib/system/Int32.hx
index 783a310fc..71906304f 100644
--- a/Phase/Mscorlib/system/Int32.hx
+++ b/Phase/Mscorlib/system/Int32.hx
@@ -4,30 +4,30 @@ abstract Int32(Int) from Int
 {
 	public inline function new(i:Int) this = i;
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	@:from public static inline function FromChar(c:Char) : Int32 return new Int32(c.ToHaxeInt());
-	@:from public static inline function FromByte(c:Byte) : Int32 return new Int32(c.ToHaxeInt());
-	@:from public static inline function FromSByte(c:SByte) : Int32 return new Int32(c.ToHaxeInt());
-	@:from public static inline function FromInt16(c:Int16) : Int32 return new Int32(c.ToHaxeInt());
+	@:from public static inline function fromChar(c:Char) : Int32 return new Int32(c.toHaxeInt());
+	@:from public static inline function fromByte(c:Byte) : Int32 return new Int32(c.toHaxeInt());
+	@:from public static inline function fromSByte(c:SByte) : Int32 return new Int32(c.toHaxeInt());
+	@:from public static inline function fromInt16(c:Int16) : Int32 return new Int32(c.toHaxeInt());
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Int32(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Int32(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Int32(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Int32(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Int32(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Int32(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Int32(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Int32(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Int32(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Int32(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Int32(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Int32(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Int32(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Int32(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Int32(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Int32(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Int32(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Int32(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Int32(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Int32(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Int32(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Int32(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Int32(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Int32(this);
 
-	public inline function GetHashCode() : system.Int32 return this;
+	public inline function getHashCode() : system.Int32 return this;
 		
-	public function CompareTo_Int32(other:Int32) : Int32
+	public function compareTo_Int32(other:Int32) : Int32
 	{
 		if (this < other) return -1;
 		if (this > other) return 1;
@@ -64,9 +64,9 @@ abstract Int32(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.Int32, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div0(lhs : system.Int32, rhs : system.Int32) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.Int32, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int32) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.Int32, rhs : system.Int32) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.Int32, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int32) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.Int32, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.Int32) : system.Double;
 		
@@ -119,8 +119,8 @@ abstract Int32(Int) from Int
     // @:op(A + B) public static function add13(lhs : system.Int32, rhs : system.UInt64) : system.UInt64;	
 	@:op(A + B) public static function add14(lhs : system.Int32, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.Int32, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.Int32, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Int32, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Int32, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Int32, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub0(lhs : system.Int32, rhs : system.Int32) : system.Int32;
diff --git a/Phase/Mscorlib/system/Int32Array.hx b/Phase/Mscorlib/system/Int32Array.hx
index d453caa46..cab8ab57c 100644
--- a/Phase/Mscorlib/system/Int32Array.hx
+++ b/Phase/Mscorlib/system/Int32Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract Int32Array(js.html.Int32Array)
 {
-	public inline function new(length:Int32) this = new js.html.Int32Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Int32Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Int32>):Int32Array return cast new js.html.Int32Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Int32>):Int32Array return cast new js.html.Int32Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Int32>):Int32Array return cast new js.html.Int32Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Int32 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Int32):Int32 return this[index.ToHaxeInt()] = val.ToHaxeInt();
+	@:op([]) public inline function get(index:Int32):Int32 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Int32):Int32 return this[index.toHaxeInt()] = val.toHaxeInt();
 	
 	public inline function iterator() : Iterator<Int32> return new Int32ArrayIterator(this);
 	
-	@:to public inline function ToEnumerable() : system.collections.generic.IEnumerable<Int32> return new Int32ArrayEnumerable(this);
+	@:to public inline function toEnumerable() : system.collections.generic.IEnumerable<Int32> return new Int32ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new Int32Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/Int32ArrayEnumerable.hx b/Phase/Mscorlib/system/Int32ArrayEnumerable.hx
index d3eb3af92..f65122bc1 100644
--- a/Phase/Mscorlib/system/Int32ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/Int32ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class Int32ArrayEnumerable implements IEnumerable<Int32>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Int32>
+	public function getEnumerator() : IEnumerator<Int32>
 	{
 		return new Int32ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/Int32ArrayEnumerator.hx b/Phase/Mscorlib/system/Int32ArrayEnumerator.hx
index ece70c33a..efbbe1118 100644
--- a/Phase/Mscorlib/system/Int32ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/Int32ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class Int32ArrayEnumerator implements IEnumerator<Int32>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Int32;
-	public function get_Current() : Int32 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Int32;
+	public function get_current() : Int32 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Int64.hx b/Phase/Mscorlib/system/Int64.hx
index c80228c6f..e8b9660ad 100644
--- a/Phase/Mscorlib/system/Int64.hx
+++ b/Phase/Mscorlib/system/Int64.hx
@@ -5,27 +5,27 @@ abstract Int64(Int) from Int
 {
 	public inline function new(i:Int) this = i;
 	
-	public inline function ToHaxeInt(): Int return this;	
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;	
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	@:from public static inline function FromByte(c:Byte) : Int64 return new Int64(c.ToHaxeInt());
-	@:from public static inline function FromInt16(c:Int16) : Int64 return new Int64(c.ToHaxeInt());
-	@:from public static inline function FromInt32(c:Int32) : Int64 return new Int64(c.ToHaxeInt());
+	@:from public static inline function fromByte(c:Byte) : Int64 return new Int64(c.toHaxeInt());
+	@:from public static inline function fromInt16(c:Int16) : Int64 return new Int64(c.toHaxeInt());
+	@:from public static inline function fromInt32(c:Int32) : Int64 return new Int64(c.toHaxeInt());
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Int64(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Int64(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Int64(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Int64(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Int64(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Int64(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Int64(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Int64(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Int64(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Int64(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Int64(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Int64(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Int64(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Int64(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Int64(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Int64(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Int64(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Int64(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Int64(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Int64(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Int64(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Int64(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Int64(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Int64(this);
 	
-	public inline function GetHashCode() : system.Int32 return this;
+	public inline function getHashCode() : system.Int32 return this;
 	
 	@:op(-A) public inline function neg() : system.Int64 return -this;
 
@@ -55,9 +55,9 @@ abstract Int64(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.Int64, rhs : system.Double) : system.Double;	
 
 	
-    @:op(A / B) public static inline function div0(lhs : system.Int64, rhs : system.Int64) : system.Int64 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.Int64, rhs : Int) : system.Int64 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int64) : system.Int64 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.Int64, rhs : system.Int64) : system.Int64 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.Int64, rhs : Int) : system.Int64 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.Int64) : system.Int64 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.Int64, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.Int64) : system.Double;
 	
@@ -110,8 +110,8 @@ abstract Int64(Int) from Int
     // @:op(A + B) public static function add13(lhs : system.Int64, rhs : system.UInt64) : system.Int64;	
     @:op(A + B) public static function add14(lhs : system.Int64, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.Int64, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.Int64, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Int64, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Int64, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Int64, rhs : String) : system.CsString return lhs.toString() + rhs;
 
                               
     @:op(A - B) public static function sub0(lhs : system.Int64, rhs : system.Int64) : system.Int64;
diff --git a/Phase/Mscorlib/system/Int64Array.hx b/Phase/Mscorlib/system/Int64Array.hx
index 1afeea79b..ede43ffa9 100644
--- a/Phase/Mscorlib/system/Int64Array.hx
+++ b/Phase/Mscorlib/system/Int64Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract Int64Array(js.html.Int32Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Int32Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Int32Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Int64>):Int64Array return cast new js.html.Int32Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Int64>):Int64Array return cast new js.html.Int32Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Int64>):Int64Array return cast new js.html.Int32Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Int64 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Int64):Int64 return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):Int64 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Int64):Int64 return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<Int64> return new Int64ArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Int64> return new Int64ArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Int64> return new Int64ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new Int64Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/Int64ArrayEnumerable.hx b/Phase/Mscorlib/system/Int64ArrayEnumerable.hx
index 40da6eb91..2d7fced93 100644
--- a/Phase/Mscorlib/system/Int64ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/Int64ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class Int64ArrayEnumerable implements IEnumerable<Int64>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Int64>
+	public function getEnumerator() : IEnumerator<Int64>
 	{
 		return new Int64ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/Int64ArrayEnumerator.hx b/Phase/Mscorlib/system/Int64ArrayEnumerator.hx
index 14f6757ac..3d5771c71 100644
--- a/Phase/Mscorlib/system/Int64ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/Int64ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class Int64ArrayEnumerator implements IEnumerator<Int64>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Int64;
-	public function get_Current() : Int64 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Int64;
+	public function get_current() : Int64 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Nullable.hx b/Phase/Mscorlib/system/Nullable.hx
index 84ba532e2..09bfe5ab9 100644
--- a/Phase/Mscorlib/system/Nullable.hx
+++ b/Phase/Mscorlib/system/Nullable.hx
@@ -4,6 +4,6 @@ abstract Nullable<T>(Null<T>) from T
 {
 	public inline function new(t:T) this = t;
 	
-	public var Value(get, never):T;
-	public inline function get_Value() : T return this;
+	public var value(get, never):T;
+	public inline function get_value() : T return this;
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/ObjectExtensions.hx b/Phase/Mscorlib/system/ObjectExtensions.hx
index 1f0d1587e..9d0a65ceb 100644
--- a/Phase/Mscorlib/system/ObjectExtensions.hx
+++ b/Phase/Mscorlib/system/ObjectExtensions.hx
@@ -2,16 +2,16 @@ package system;
 
 class ObjectExtensions 
 {
-	public static inline function ToString(v:system.Object) : CsString  return Std.string(v);
-	public static inline function ReferenceEquals(a:system.Object, b:system.Object) : system.Boolean return a == b;
-	public static inline function GetType<T>(a:T) : system.CsType<T> return new system.CsType<T>(Type.getClass(a));
+	public static inline function toString(v:system.Object) : CsString  return Std.string(v);
+	public static inline function referenceEquals(a:system.Object, b:system.Object) : system.Boolean return a == b;
+	public static inline function getType<T>(a:T) : system.CsType<T> return new system.CsType<T>(Type.getClass(a));
 	
-	public static function Equals_Object<T1, T2>(left:T1, right:T2) : Bool
+	public static function equals_Object<T1, T2>(left:T1, right:T2) : Bool
 	{
-		var equals = Reflect.field(left, "Equals");
+		var equals = Reflect.field(left, "equals");
 		if(equals == null)
 		{
-			equals = Reflect.field(left, "Equals_Object");
+			equals = Reflect.field(left, "equals_Object");
 		}
 		
 		if(equals != null)
diff --git a/Phase/Mscorlib/system/SByte.hx b/Phase/Mscorlib/system/SByte.hx
index 98607b0cb..1f9985242 100644
--- a/Phase/Mscorlib/system/SByte.hx
+++ b/Phase/Mscorlib/system/SByte.hx
@@ -3,25 +3,25 @@ package system;
 
 abstract SByte(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToInt8(i);
+	public inline function new(i:Int) this = system.Convert.toInt8(i);
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_SByte(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_SByte(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_SByte(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_SByte(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_SByte(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_SByte(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_SByte(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_SByte(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_SByte(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_SByte(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_SByte(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_SByte(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_SByte(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_SByte(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_SByte(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_SByte(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_SByte(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_SByte(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_SByte(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_SByte(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_SByte(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_SByte(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_SByte(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_SByte(this);
 
-	public inline function GetHashCode() : system.Int32 return this ^ (this << 8);
+	public inline function getHashCode() : system.Int32 return this ^ (this << 8);
 	
 	@:op(-A) public inline function neg() : Int return -this;
 
@@ -52,9 +52,9 @@ abstract SByte(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.SByte, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div0(lhs : system.SByte, rhs : system.SByte) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.SByte, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.SByte) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.SByte, rhs : system.SByte) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.SByte, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.SByte) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.SByte, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.SByte) : system.Double;
 	
@@ -107,8 +107,8 @@ abstract SByte(Int) from Int
     // @:op(A + B) public static function add13(lhs : system.SByte, rhs : system.UInt64) : system.UInt64;	
     @:op(A + B) public static function add14(lhs : system.SByte, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.SByte, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.SByte, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.SByte, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.SByte, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.SByte, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub0(lhs : system.SByte, rhs : system.SByte) : system.Int32;
diff --git a/Phase/Mscorlib/system/SByteArray.hx b/Phase/Mscorlib/system/SByteArray.hx
index b82bf6f22..e9c1e1b27 100644
--- a/Phase/Mscorlib/system/SByteArray.hx
+++ b/Phase/Mscorlib/system/SByteArray.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract SByteArray(js.html.Int8Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Int8Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Int8Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<SByte>):SByteArray return cast new js.html.Int8Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<SByte>):SByteArray return cast new js.html.Int8Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<SByte>):SByteArray return cast new js.html.Int8Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):SByte return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:SByte):SByte return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):SByte return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:SByte):SByte return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<SByte> return new SByteArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<SByte> return new SByteArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<SByte> return new SByteArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new SByteArray(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/SByteArrayEnumerable.hx b/Phase/Mscorlib/system/SByteArrayEnumerable.hx
index c0c05e62f..b6e919ab3 100644
--- a/Phase/Mscorlib/system/SByteArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/SByteArrayEnumerable.hx
@@ -11,7 +11,7 @@ class SByteArrayEnumerable implements IEnumerable<SByte>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<SByte>
+	public function getEnumerator() : IEnumerator<SByte>
 	{
 		return new SByteArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/SByteArrayEnumerator.hx b/Phase/Mscorlib/system/SByteArrayEnumerator.hx
index 995245882..27e9e3757 100644
--- a/Phase/Mscorlib/system/SByteArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/SByteArrayEnumerator.hx
@@ -13,16 +13,16 @@ class SByteArrayEnumerator implements IEnumerator<SByte>
 		_i = -1;
 	}
 	
-	public var Current(get, never):SByte;
-	public function get_Current() : SByte return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):SByte;
+	public function get_current() : SByte return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/Single.hx b/Phase/Mscorlib/system/Single.hx
index 60edf8652..39ee0ec5b 100644
--- a/Phase/Mscorlib/system/Single.hx
+++ b/Phase/Mscorlib/system/Single.hx
@@ -4,37 +4,37 @@ abstract Single(Float) from Float from Int
 {
 	public inline function new(i:Float) this = i;
 
-	@:from public static inline function FromInt(i:Int) : Single return new Single(i);
-	@:from public static inline function FromByte(i:system.Byte) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromInt16(i:system.Int16) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromInt32(i:system.Int32) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromInt64(i:system.Int64) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromSByte(i:system.Byte) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromUInt16(i:system.UInt16) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromUInt32(i:system.UInt32) : Single return new Single(i.ToHaxeInt());
-	@:from public static inline function FromUInt64(i:system.UInt64) : Single return new Single(i.ToHaxeInt());
-
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_Single(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_Single(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_Single(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_Single(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_Single(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_Single(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_Single(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_Single(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_Single(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_Single(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_Single(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_Single(this);
-
-
-	public inline function ToHaxeFloat(): Float return this;
-	public inline function ToString() : CsString return Std.string(this);
-	public function GetHashCode() : system.Int32 return system.Convert.ToHashCode_Single(this);
+	@:from public static inline function fromInt(i:Int) : Single return new Single(i);
+	@:from public static inline function fromByte(i:system.Byte) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromInt16(i:system.Int16) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromInt32(i:system.Int32) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromInt64(i:system.Int64) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromSByte(i:system.Byte) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromUInt16(i:system.UInt16) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromUInt32(i:system.UInt32) : Single return new Single(i.toHaxeInt());
+	@:from public static inline function fromUInt64(i:system.UInt64) : Single return new Single(i.toHaxeInt());
+
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_Single(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_Single(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_Single(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_Single(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_Single(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_Single(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_Single(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_Single(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_Single(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_Single(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_Single(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_Single(this);
+
+
+	public inline function toHaxeFloat(): Float return this;
+	public inline function toString() : CsString return Std.string(this);
+	public function getHashCode() : system.Int32 return system.Convert.toHashCode_Single(this);
 	
 	public static var NaN(get, never) : system.Single;
 	public static inline function get_NaN() : system.Single return Math.NaN;
-	public static inline function IsNaN(v:system.Single) : system.Boolean return Math.isNaN(v.ToHaxeFloat());
+	public static inline function IsNaN(v:system.Single) : system.Boolean return Math.isNaN(v.toHaxeFloat());
 	
 	@:op(-A) public inline function neg() : system.Single return -this;
 
@@ -114,8 +114,8 @@ abstract Single(Float) from Float from Int
     @:op(A + B) public static function add13(lhs : system.Single, rhs : system.UInt64) : system.Single;	
     @:op(A + B) public static function add14(lhs : system.Single, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.Single, rhs : system.Double) : system.Single;	
-    @:op(A + B) public static inline function add16(lhs : system.Single, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.Single, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.Single, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.Single, rhs : String) : system.CsString return lhs.toString() + rhs;
 
                               
     @:op(A - B) public static function sub1(lhs : system.Single, rhs : Int) : system.Single;
diff --git a/Phase/Mscorlib/system/SingleArray.hx b/Phase/Mscorlib/system/SingleArray.hx
index b46c6b59c..115784c23 100644
--- a/Phase/Mscorlib/system/SingleArray.hx
+++ b/Phase/Mscorlib/system/SingleArray.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract SingleArray(js.html.Float32Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Float32Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Float32Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<Single>):SingleArray return cast new js.html.Float32Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<Single>):SingleArray return cast new js.html.Float32Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<Single>):SingleArray return cast new js.html.Float32Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):Single return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:Single):Single return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):Single return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:Single):Single return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<Single> return new SingleArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<Single> return new SingleArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<Single> return new SingleArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new SingleArray(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/SingleArrayEnumerable.hx b/Phase/Mscorlib/system/SingleArrayEnumerable.hx
index 99e63cc21..93c885ec1 100644
--- a/Phase/Mscorlib/system/SingleArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/SingleArrayEnumerable.hx
@@ -11,7 +11,7 @@ class SingleArrayEnumerable implements IEnumerable<Single>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<Single>
+	public function getEnumerator() : IEnumerator<Single>
 	{
 		return new SingleArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/SingleArrayEnumerator.hx b/Phase/Mscorlib/system/SingleArrayEnumerator.hx
index 3ca962f4d..6e15380d1 100644
--- a/Phase/Mscorlib/system/SingleArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/SingleArrayEnumerator.hx
@@ -13,16 +13,16 @@ class SingleArrayEnumerator implements IEnumerator<Single>
 		_i = -1;
 	}
 	
-	public var Current(get, never):Single;
-	public function get_Current() : Single return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):Single;
+	public function get_current() : Single return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/UInt16.hx b/Phase/Mscorlib/system/UInt16.hx
index 898882fdc..28f7f161a 100644
--- a/Phase/Mscorlib/system/UInt16.hx
+++ b/Phase/Mscorlib/system/UInt16.hx
@@ -3,25 +3,25 @@ package system;
 
 abstract UInt16(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToUInt16(i);
+	public inline function new(i:Int) this = system.Convert.toUInt16(i);
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_UInt16(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_UInt16(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_UInt16(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_UInt16(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_UInt16(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_UInt16(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_UInt16(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_UInt16(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_UInt16(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_UInt16(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_UInt16(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_UInt16(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_UInt16(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_UInt16(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_UInt16(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_UInt16(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_UInt16(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_UInt16(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_UInt16(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_UInt16(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_UInt16(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_UInt16(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_UInt16(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_UInt16(this);
 	
-	public function GetHashCode() : system.Int32 return this;
+	public function getHashCode() : system.Int32 return this;
 	
 	@:op(-A) public inline function neg() : system.Int32 return -this;
 
@@ -52,9 +52,9 @@ abstract UInt16(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.UInt16, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div0(lhs : system.UInt16, rhs : system.UInt16) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.UInt16, rhs : Int) : system.Int32 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.UInt16) : system.Int32 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.UInt16, rhs : system.UInt16) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.UInt16, rhs : Int) : system.Int32 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.UInt16) : system.Int32 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.UInt16, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.UInt16) : system.Double;
 	
@@ -107,8 +107,8 @@ abstract UInt16(Int) from Int
     @:op(A + B) public static function add13(lhs : system.UInt16, rhs : system.UInt64) : system.UInt64;	
     @:op(A + B) public static function add14(lhs : system.UInt16, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.UInt16, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.UInt16, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.UInt16, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.UInt16, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.UInt16, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub0(lhs : system.UInt16, rhs : system.UInt16) : system.Int32;
diff --git a/Phase/Mscorlib/system/UInt16Array.hx b/Phase/Mscorlib/system/UInt16Array.hx
index af471c71f..9024e3c34 100644
--- a/Phase/Mscorlib/system/UInt16Array.hx
+++ b/Phase/Mscorlib/system/UInt16Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract UInt16Array(js.html.Uint16Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Uint16Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Uint16Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<UInt16>):UInt16Array return cast new js.html.Uint16Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<UInt16>):UInt16Array return cast new js.html.Uint16Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<UInt16>):UInt16Array return cast new js.html.Uint16Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):UInt16 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:UInt16):UInt16 return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):UInt16 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:UInt16):UInt16 return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<UInt16> return new UInt16ArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<UInt16> return new UInt16ArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<UInt16> return new UInt16ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new UInt16Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/UInt16ArrayEnumerable.hx b/Phase/Mscorlib/system/UInt16ArrayEnumerable.hx
index d599804d2..a1bb856c1 100644
--- a/Phase/Mscorlib/system/UInt16ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/UInt16ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class UInt16ArrayEnumerable implements IEnumerable<UInt16>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<UInt16>
+	public function getEnumerator() : IEnumerator<UInt16>
 	{
 		return new UInt16ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/UInt16ArrayEnumerator.hx b/Phase/Mscorlib/system/UInt16ArrayEnumerator.hx
index 8af965218..6a0151cab 100644
--- a/Phase/Mscorlib/system/UInt16ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/UInt16ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class UInt16ArrayEnumerator implements IEnumerator<UInt16>
 		_i = -1;
 	}
 	
-	public var Current(get, never):UInt16;
-	public function get_Current() : UInt16 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):UInt16;
+	public function get_current() : UInt16 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/UInt32.hx b/Phase/Mscorlib/system/UInt32.hx
index b5c35f397..f45184a8a 100644
--- a/Phase/Mscorlib/system/UInt32.hx
+++ b/Phase/Mscorlib/system/UInt32.hx
@@ -2,25 +2,25 @@ package system;
 
 abstract UInt32(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToUInt32(i);
+	public inline function new(i:Int) this = system.Convert.toUInt32(i);
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_UInt32(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_UInt32(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_UInt32(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_UInt32(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_UInt32(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_UInt32(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_UInt32(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_UInt32(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_UInt32(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_UInt32(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_UInt32(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_UInt32(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_UInt32(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_UInt32(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_UInt32(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_UInt32(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_UInt32(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_UInt32(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_UInt32(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_UInt32(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_UInt32(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_UInt32(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_UInt32(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_UInt32(this);
 
-	public function GetHashCode() : system.Int32 return this;
+	public function getHashCode() : system.Int32 return this;
 	
 	@:op(-A) public inline function neg() : system.Int64 return -this;
 
@@ -51,9 +51,9 @@ abstract UInt32(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.UInt32, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div0(lhs : system.UInt32, rhs : system.UInt32) : system.UInt32 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
-    @:op(A / B) public static inline function div1(lhs : system.UInt32, rhs : Int) : system.Int64 return Std.int(lhs.ToHaxeInt() / rhs);
-    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.UInt32) : system.Int64 return Std.int(lhs / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.UInt32, rhs : system.UInt32) : system.UInt32 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
+    @:op(A / B) public static inline function div1(lhs : system.UInt32, rhs : Int) : system.Int64 return Std.int(lhs.toHaxeInt() / rhs);
+    @:op(A / B) public static inline function div2(lhs : Int, rhs : system.UInt32) : system.Int64 return Std.int(lhs / rhs.toHaxeInt());
     @:op(A / B) public static function div3(lhs : system.UInt32, rhs : Float) : system.Double;
     @:op(A / B) public static function div4(lhs : Float, rhs : system.UInt32) : system.Double;
 		
@@ -106,8 +106,8 @@ abstract UInt32(Int) from Int
     @:op(A + B) public static function add13(lhs : system.UInt32, rhs : system.UInt64) : system.UInt64;	
     @:op(A + B) public static function add14(lhs : system.UInt32, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.UInt32, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.UInt32, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.UInt32, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.UInt32, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.UInt32, rhs : String) : system.CsString return lhs.toString() + rhs;
 
 	
     @:op(A - B) public static function sub0(lhs : system.UInt32, rhs : system.UInt32) : system.UInt32;
diff --git a/Phase/Mscorlib/system/UInt32Array.hx b/Phase/Mscorlib/system/UInt32Array.hx
index e85e80cae..288ba66b2 100644
--- a/Phase/Mscorlib/system/UInt32Array.hx
+++ b/Phase/Mscorlib/system/UInt32Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract UInt32Array(js.html.Uint32Array) 
 {
-	public inline function new(length:Int32) this = new js.html.Uint32Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.Uint32Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<UInt32>):UInt32Array return cast new js.html.Uint32Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<UInt32>):UInt32Array return cast new js.html.Uint32Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<UInt32>):UInt32Array return cast new js.html.Uint32Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):UInt32 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:UInt32):UInt32 return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):UInt32 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:UInt32):UInt32 return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<UInt32> return new UInt32ArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<UInt32> return new UInt32ArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<UInt32> return new UInt32ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new UInt32Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/UInt32ArrayEnumerable.hx b/Phase/Mscorlib/system/UInt32ArrayEnumerable.hx
index 8ee89450b..571982507 100644
--- a/Phase/Mscorlib/system/UInt32ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/UInt32ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class UInt32ArrayEnumerable implements IEnumerable<UInt32>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<UInt32>
+	public function getEnumerator() : IEnumerator<UInt32>
 	{
 		return new UInt32ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/UInt32ArrayEnumerator.hx b/Phase/Mscorlib/system/UInt32ArrayEnumerator.hx
index 0450005ba..d94e684d1 100644
--- a/Phase/Mscorlib/system/UInt32ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/UInt32ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class UInt32ArrayEnumerator implements IEnumerator<UInt32>
 		_i = -1;
 	}
 	
-	public var Current(get, never):UInt32;
-	public function get_Current() : UInt32 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):UInt32;
+	public function get_current() : UInt32 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/UInt64.hx b/Phase/Mscorlib/system/UInt64.hx
index e8ae4820d..025d6bb39 100644
--- a/Phase/Mscorlib/system/UInt64.hx
+++ b/Phase/Mscorlib/system/UInt64.hx
@@ -2,25 +2,25 @@ package system;
 
 abstract UInt64(Int) from Int
 {
-	public inline function new(i:Int) this = system.Convert.ToUInt64(i);
+	public inline function new(i:Int) this = system.Convert.toUInt64(i);
 	
-	public inline function ToHaxeInt(): Int return this;
-	public inline function ToString() : system.CsString return Std.string(this);
+	public inline function toHaxeInt(): Int return this;
+	public inline function toString() : system.CsString return Std.string(this);
 	
-	public inline function ToBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.ToBoolean_UInt64(this);
-	public inline function ToChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.ToChar_UInt64(this);
-	public inline function ToSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.ToSByte_UInt64(this);
-	public inline function ToByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.ToByte_UInt64(this);
-	public inline function ToInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.ToInt16_UInt64(this);
-	public inline function ToUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.ToUInt16_UInt64(this);
-	public inline function ToInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.ToInt32_UInt64(this);
-	public inline function ToUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.ToUInt32_UInt64(this);
-	public inline function ToInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.ToInt64_UInt64(this);
-	public inline function ToUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.ToUInt64_UInt64(this);
-	public inline function ToSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.ToSingle_UInt64(this);
-	public inline function ToDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.ToDouble_UInt64(this);
+	public inline function toBoolean_IFormatProvider(provider:IFormatProvider) : system.Boolean return system.Convert.toBoolean_UInt64(this);
+	public inline function toChar_IFormatProvider(provider:IFormatProvider) : system.Char return system.Convert.toChar_UInt64(this);
+	public inline function toSByte_IFormatProvider(provider:IFormatProvider) : system.SByte return system.Convert.toSByte_UInt64(this);
+	public inline function toByte_IFormatProvider(provider:IFormatProvider) : system.Byte return system.Convert.toByte_UInt64(this);
+	public inline function toInt16_IFormatProvider(provider:IFormatProvider) : system.Int16 return system.Convert.toInt16_UInt64(this);
+	public inline function toUInt16_IFormatProvider(provider:IFormatProvider) : system.UInt16 return system.Convert.toUInt16_UInt64(this);
+	public inline function toInt32_IFormatProvider(provider:IFormatProvider) : system.Int32 return system.Convert.toInt32_UInt64(this);
+	public inline function toUInt32_IFormatProvider(provider:IFormatProvider) : system.UInt32 return system.Convert.toUInt32_UInt64(this);
+	public inline function toInt64_IFormatProvider(provider:IFormatProvider) : system.Int64 return system.Convert.toInt64_UInt64(this);
+	public inline function toUInt64_IFormatProvider(provider:IFormatProvider) : system.UInt64 return system.Convert.toUInt64_UInt64(this);
+	public inline function toSingle_IFormatProvider(provider:IFormatProvider) : system.Single return system.Convert.toSingle_UInt64(this);
+	public inline function toDouble_IFormatProvider(provider:IFormatProvider) : system.Double return system.Convert.toDouble_UInt64(this);
 	
-	public function GetHashCode() : system.Int32 return this;
+	public function getHashCode() : system.Int32 return this;
 	
     @:op(~A)public inline function not() : system.UInt64 return ~this;
 
@@ -47,7 +47,7 @@ abstract UInt64(Int) from Int
     @:op(A * B) public static function mul15(lhs : system.UInt64, rhs : system.Double) : system.Double;	
 
 
-    @:op(A / B) public static inline function div0(lhs : system.UInt64, rhs : system.UInt64) : system.UInt64 return Std.int(lhs.ToHaxeInt() / rhs.ToHaxeInt());
+    @:op(A / B) public static inline function div0(lhs : system.UInt64, rhs : system.UInt64) : system.UInt64 return Std.int(lhs.toHaxeInt() / rhs.toHaxeInt());
     @:op(A / B) public static function div1(lhs : system.UInt64, rhs : Float) : system.Double;
     @:op(A / B) public static function div2(lhs : Float, rhs : system.UInt64) : system.Double;
 	
@@ -96,8 +96,8 @@ abstract UInt64(Int) from Int
     @:op(A + B) public static function add13(lhs : system.UInt64, rhs : system.UInt64) : system.UInt64;	
 	@:op(A + B) public static function add14(lhs : system.UInt64, rhs : system.Single) : system.Single;	
     @:op(A + B) public static function add15(lhs : system.UInt64, rhs : system.Double) : system.Double;	
-    @:op(A + B) public static inline function add16(lhs : system.UInt64, rhs : system.CsString) : system.CsString return lhs.ToString() + rhs;
-    @:op(A + B) public static inline function add17(lhs : system.UInt64, rhs : String) : system.CsString return lhs.ToString() + rhs;
+    @:op(A + B) public static inline function add16(lhs : system.UInt64, rhs : system.CsString) : system.CsString return lhs.toString() + rhs;
+    @:op(A + B) public static inline function add17(lhs : system.UInt64, rhs : String) : system.CsString return lhs.toString() + rhs;
 
                               
     @:op(A - B) public static function sub0(lhs : system.UInt64, rhs : system.UInt64) : system.UInt64;
diff --git a/Phase/Mscorlib/system/UInt64Array.hx b/Phase/Mscorlib/system/UInt64Array.hx
index 54dc6e328..c07460707 100644
--- a/Phase/Mscorlib/system/UInt64Array.hx
+++ b/Phase/Mscorlib/system/UInt64Array.hx
@@ -2,20 +2,20 @@ package system;
 
 abstract UInt64Array(js.html.UInt32Array) 
 {
-	public inline function new(length:Int32) this = new js.html.UInt32Array(length.ToHaxeInt());
+	public inline function new(length:Int32) this = new js.html.UInt32Array(length.toHaxeInt());
 	
 	@:from public static inline function fromArray(a:Array<UInt64>):UInt64Array return cast new js.html.UInt32Array(untyped a);
-	@:from public static inline function fromFixedArray(a:FixedArray<UInt64>):UInt64Array return cast new js.html.UInt32Array(untyped a.ToHaxeArray());
+	@:from public static inline function fromFixedArray(a:FixedArray<UInt64>):UInt64Array return cast new js.html.UInt32Array(untyped a.toHaxeArray());
 	
-	public var Length(get, never):Int32;
-	public inline function get_Length() : Int32 return this.length;
+	public var length(get, never):Int32;
+	public inline function get_length() : Int32 return this.length;
 	
-	@:op([]) public inline function get(index:Int32):UInt64 return this[index.ToHaxeInt()];
-	@:op([]) public inline function set(index:Int32, val:UInt64):UInt64 return this[index.ToHaxeInt()] = val.ToHaxeFloat();
+	@:op([]) public inline function get(index:Int32):UInt64 return this[index.toHaxeInt()];
+	@:op([]) public inline function set(index:Int32, val:UInt64):UInt64 return this[index.toHaxeInt()] = val.toHaxeFloat();
 	
 	public inline function iterator() : Iterator<UInt64> return new UInt64ArrayIterator(this);
 	
-	public inline function ToEnumerable() : system.collections.generic.IEnumerable<UInt64> return new UInt64ArrayEnumerable(this);
+	public inline function toEnumerable() : system.collections.generic.IEnumerable<UInt64> return new UInt64ArrayEnumerable(this);
 
 	public static inline function empty(size:Int32) return new UInt64Array(size);
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/UInt64ArrayEnumerable.hx b/Phase/Mscorlib/system/UInt64ArrayEnumerable.hx
index 4d21a0cf0..54fc78485 100644
--- a/Phase/Mscorlib/system/UInt64ArrayEnumerable.hx
+++ b/Phase/Mscorlib/system/UInt64ArrayEnumerable.hx
@@ -11,7 +11,7 @@ class UInt64ArrayEnumerable implements IEnumerable<UInt64>
 		_array= array;
 	}
 
-	public function GetEnumerator() : IEnumerator<UInt64>
+	public function getEnumerator() : IEnumerator<UInt64>
 	{
 		return new UInt64ArrayEnumerator(_array);
 	}
diff --git a/Phase/Mscorlib/system/UInt64ArrayEnumerator.hx b/Phase/Mscorlib/system/UInt64ArrayEnumerator.hx
index ff5867887..50bb6b7d2 100644
--- a/Phase/Mscorlib/system/UInt64ArrayEnumerator.hx
+++ b/Phase/Mscorlib/system/UInt64ArrayEnumerator.hx
@@ -13,16 +13,16 @@ class UInt64ArrayEnumerator implements IEnumerator<UInt64>
 		_i = -1;
 	}
 	
-	public var Current(get, never):UInt64;
-	public function get_Current() : UInt64 return _array[_i];
-	public function MoveNext() : Bool
+	public var current(get, never):UInt64;
+	public function get_current() : UInt64 return _array[_i];
+	public function moveNext() : Bool
 	{
 		if(_i >= _array.length - 1) return false;
 		_i++;
 		return true;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		_i = -1;
 	}
diff --git a/Phase/Mscorlib/system/collections/generic/IEnumerable.hx b/Phase/Mscorlib/system/collections/generic/IEnumerable.hx
index fa1efefb1..5d84cca98 100644
--- a/Phase/Mscorlib/system/collections/generic/IEnumerable.hx
+++ b/Phase/Mscorlib/system/collections/generic/IEnumerable.hx
@@ -2,5 +2,5 @@ package system.collections.generic;
 
 interface IEnumerable<T>
 {
-	function GetEnumerator() : IEnumerator<T>;
+	function getEnumerator() : IEnumerator<T>;
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/collections/generic/IEnumerator.hx b/Phase/Mscorlib/system/collections/generic/IEnumerator.hx
index 36e1edde6..5d129369d 100644
--- a/Phase/Mscorlib/system/collections/generic/IEnumerator.hx
+++ b/Phase/Mscorlib/system/collections/generic/IEnumerator.hx
@@ -2,7 +2,7 @@ package system.collections.generic;
 
 interface IEnumerator<T>
 {
-	var Current(get, never):T;
-	function MoveNext() : Bool;
-	function Reset():Void;
+	var current(get, never):T;
+	function moveNext() : Bool;
+	function reset():Void;
 }
\ No newline at end of file
diff --git a/Phase/Mscorlib/system/collections/generic/IterableEnumerable.hx b/Phase/Mscorlib/system/collections/generic/IterableEnumerable.hx
index 8fc24d60a..8d042b211 100644
--- a/Phase/Mscorlib/system/collections/generic/IterableEnumerable.hx
+++ b/Phase/Mscorlib/system/collections/generic/IterableEnumerable.hx
@@ -8,7 +8,7 @@ class IterableEnumerable<T> implements IEnumerable<T>
 		_iterable= i;
 	}
 
-	public function GetEnumerator() : IEnumerator<T>
+	public function getEnumerator() : IEnumerator<T>
 	{
 		return new IteratorEnumerator(_iterable.iterator());
 	}
diff --git a/Phase/Mscorlib/system/collections/generic/IteratorEnumerator.hx b/Phase/Mscorlib/system/collections/generic/IteratorEnumerator.hx
index 3fdd1c509..8f3c5730d 100644
--- a/Phase/Mscorlib/system/collections/generic/IteratorEnumerator.hx
+++ b/Phase/Mscorlib/system/collections/generic/IteratorEnumerator.hx
@@ -10,9 +10,9 @@ class IteratorEnumerator<T> implements IEnumerator<T>
 		_it = i;
 	}
 	
-	public var Current(get, never):T;
-	public function get_Current() : T return _current;
-	public function MoveNext() : Bool
+	public var current(get, never):T;
+	public function get_current() : T return _current;
+	public function moveNext() : Bool
 	{
 		if(_it.hasNext())
 		{
@@ -22,7 +22,7 @@ class IteratorEnumerator<T> implements IEnumerator<T>
 		return false;
 		
 	}
-	public function Reset():Void
+	public function reset():Void
 	{
 		throw "not supported";
 	}
diff --git a/Source/AlphaTab.JavaScript/Collections/StringBuilder.cs b/Source/AlphaTab.JavaScript/Collections/StringBuilder.cs
index dc1c11b8c..efa6bd476 100644
--- a/Source/AlphaTab.JavaScript/Collections/StringBuilder.cs
+++ b/Source/AlphaTab.JavaScript/Collections/StringBuilder.cs
@@ -22,7 +22,7 @@ public void Append(object s)
         [Inline]
         public void AppendChar(int i)
         {
-            Script.Write("this += String.fromCharCode(i.ToHaxeInt());");
+            Script.Write("this += String.fromCharCode(i.toHaxeInt());");
         }
 
         [Inline]
diff --git a/Source/AlphaTab.JavaScript/Platform/JavaScript/AlphaTabApi.cs b/Source/AlphaTab.JavaScript/Platform/JavaScript/AlphaTabApi.cs
index ea5ff8c8b..114ed245f 100644
--- a/Source/AlphaTab.JavaScript/Platform/JavaScript/AlphaTabApi.cs
+++ b/Source/AlphaTab.JavaScript/Platform/JavaScript/AlphaTabApi.cs
@@ -33,7 +33,7 @@ public override PlayerState PlayerState
         public override void Tex(string tex, int[] tracks = null)
         {
             var browser = (BrowserUiFacade)UiFacade;
-            Tex(tex, browser.ParseTracks(tracks));
+            base.Tex(tex, browser.ParseTracks(tracks));
         }
 
         public void Print(string width)
diff --git a/Source/AlphaTab.JavaScript/Platform/Platform.cs b/Source/AlphaTab.JavaScript/Platform/Platform.cs
index 274099cca..a02ffe332 100644
--- a/Source/AlphaTab.JavaScript/Platform/Platform.cs
+++ b/Source/AlphaTab.JavaScript/Platform/Platform.cs
@@ -32,13 +32,13 @@ internal static partial class Platform
         [Inline]
         public static float ParseFloat(string s)
         {
-            return Script.Write<float>("untyped parseFloat(s)");
+            return Script.Write<float>("untyped __js__(\"parseFloat({0})\", s)");
         }
 
         [Inline]
         public static int ParseHex(string s)
         {
-            return Script.Write<int>("untyped parseInt(s, 16)");
+            return Script.Write<int>("untyped __js__(\"parseInt({0}, 16)\", s)");
         }
 
         [Inline]
@@ -100,9 +100,10 @@ public static float Log2(float f)
             return Script.Write<float>("untyped Math.log2(f)");
         }
 
+        [Name("parseIntMinValue")]
         public static int ParseInt(string s)
         {
-            var val = Script.Write<int>("untyped parseInt(s)");
+            var val = Script.Write<int>("untyped __js__(\"parseInt({0})\", s)");
             return Script.Write<bool>("Math.isNaN(untyped val)") ? int.MinValue : (int)val;
         }
 
@@ -121,7 +122,7 @@ public static void BlockCopy(byte[] src, int srcOffset, byte[] dst, int dstOffse
         [Inline]
         public static string StringFromCharCode(int c)
         {
-            return Script.Write<string>("String.fromCharCode(c.ToHaxeInt())");
+            return Script.Write<string>("String.fromCharCode(c.toHaxeInt())");
         }
 
         public static sbyte ReadSignedByte(this IReadable readable)
@@ -246,7 +247,7 @@ public static bool IsTruthy(this object o)
         [Inline]
         public static bool IsNaN(float v)
         {
-            return Script.Write<bool>("Math.isNaN(v.ToHaxeFloat())");
+            return Script.Write<bool>("Math.isNaN(v.toHaxeFloat())");
         }
 
         [Inline]
diff --git a/Source/AlphaTab.JavaScript/Rendering/Utils/BoundsLookup.cs b/Source/AlphaTab.JavaScript/Rendering/Utils/BoundsLookup.cs
index 641b0610e..afd55f27e 100644
--- a/Source/AlphaTab.JavaScript/Rendering/Utils/BoundsLookup.cs
+++ b/Source/AlphaTab.JavaScript/Rendering/Utils/BoundsLookup.cs
@@ -1,4 +1,5 @@
 using AlphaTab.Collections;
+using AlphaTab.Haxe.Js.Html;
 using AlphaTab.Model;
 using AlphaTab.Platform;
 
@@ -39,15 +40,17 @@ public object ToJson()
 
                         foreach (var beat in bar.Beats)
                         {
-                            var bb = Platform.Platform.NewObject();
+                            BeatBounds bb = Platform.Platform.NewObject();
 
                             bb.VisualBounds = BoundsToJson(beat.VisualBounds);
                             bb.RealBounds = BoundsToJson(beat.RealBounds);
-                            bb.BeatIndex = beat.Beat.Index;
-                            bb.VoiceIndex = beat.Beat.Voice.Index;
-                            bb.BarIndex = beat.Beat.Voice.Bar.Index;
-                            bb.StaffIndex = beat.Beat.Voice.Bar.Staff.Index;
-                            bb.TrackIndex = beat.Beat.Voice.Bar.Staff.Track.Index;
+
+                            dynamic bbd = bb;
+                            bbd.BeatIndex = beat.Beat.Index;
+                            bbd.VoiceIndex = beat.Beat.Voice.Index;
+                            bbd.BarIndex = beat.Beat.Voice.Bar.Index;
+                            bbd.StaffIndex = beat.Beat.Voice.Bar.Staff.Index;
+                            bbd.TrackIndex = beat.Beat.Voice.Bar.Staff.Track.Index;
 
                             if (beat.Notes != null)
                             {
@@ -55,8 +58,9 @@ public object ToJson()
 
                                 foreach (var note in beat.Notes)
                                 {
-                                    var n = Platform.Platform.NewObject();
-                                    n.Index = note.Note.Index;
+                                    NoteBounds n = Platform.Platform.NewObject();
+                                    dynamic nd = n;
+                                    nd.Index = note.Note.Index;
                                     n.NoteHeadBounds = BoundsToJson(note.NoteHeadBounds);
                                     notes.Add(n);
                                 }
@@ -80,8 +84,7 @@ public object ToJson()
         public static BoundsLookup FromJson(object json, Score score)
         {
             var lookup = new BoundsLookup();
-
-            var staveGroups = json.Member<FastList<StaveGroupBounds>>("StaveGroups");
+            var staveGroups = json.Member<FastList<StaveGroupBounds>>("staveGroups");
             foreach (var staveGroup in staveGroups)
             {
                 var sg = new StaveGroupBounds();
@@ -111,12 +114,14 @@ public static BoundsLookup FromJson(object json, Score score)
                             var bb = new BeatBounds();
                             bb.VisualBounds = beat.VisualBounds;
                             bb.RealBounds = beat.RealBounds;
+
+                            dynamic bd = beat;
                             bb.Beat = score
-                                .Tracks[beat.Member<int>("TrackIndex")]
-                                .Staves[beat.Member<int>("StaffIndex")]
-                                .Bars[beat.Member<int>("BarIndex")]
-                                .Voices[beat.Member<int>("VoiceIndex")]
-                                .Beats[beat.Member<int>("BeatIndex")];
+                                .Tracks[bd.TrackIndex]
+                                .Staves[bd.StaffIndex]
+                                .Bars[bd.BarIndex]
+                                .Voices[bd.VoiceIndex]
+                                .Beats[bd.BeatIndex];
 
                             if (beat.Notes != null)
                             {
@@ -124,7 +129,9 @@ public static BoundsLookup FromJson(object json, Score score)
                                 foreach (var note in beat.Notes)
                                 {
                                     var n = new NoteBounds();
-                                    n.Note = bb.Beat.Notes[note.Member<int>("Index")];
+                                    dynamic nd = note;
+                                    n.Note = bb.Beat.Notes[nd.Index];
+
                                     n.NoteHeadBounds = note.NoteHeadBounds;
                                     bb.AddNote(n);
                                 }
@@ -141,7 +148,7 @@ public static BoundsLookup FromJson(object json, Score score)
 
         private Bounds BoundsToJson(Bounds bounds)
         {
-            var json = Platform.Platform.NewObject();
+            Bounds json = Platform.Platform.NewObject();
             json.X = bounds.X;
             json.Y = bounds.Y;
             json.W = bounds.W;
diff --git a/Source/AlphaTab.JavaScript/UI/BrowserUiFacade.cs b/Source/AlphaTab.JavaScript/UI/BrowserUiFacade.cs
index dc58156d6..d5b6ab53f 100644
--- a/Source/AlphaTab.JavaScript/UI/BrowserUiFacade.cs
+++ b/Source/AlphaTab.JavaScript/UI/BrowserUiFacade.cs
@@ -95,11 +95,9 @@ public void Initialize(AlphaTabApi<object> api, object raw)
         {
             _api = api;
 
-            dynamic options = raw;
             var dataAttributes = GetDataAttributes();
-            var settings = Settings.FromJson(options, dataAttributes);
+            var settings = Settings.FromJson(raw, dataAttributes);
             api.Settings = settings;
-
             if (settings.Engine == "default" || settings.Engine == "svg")
             {
                 api.Container.Scroll += ShowSvgsInViewPort;
@@ -110,6 +108,7 @@ public void Initialize(AlphaTabApi<object> api, object raw)
 
             // get track data to parse
             object tracksData;
+            dynamic options = raw;
             if (options != null && options.tracks)
             {
                 tracksData = options.tracks;
diff --git a/Source/AlphaTab.Test.Js/TestFramework/AsyncTestMethodAttribute.cs b/Source/AlphaTab.Test.Js/TestFramework/AsyncTestMethodAttribute.cs
index d8788bbee..7329539af 100644
--- a/Source/AlphaTab.Test.Js/TestFramework/AsyncTestMethodAttribute.cs
+++ b/Source/AlphaTab.Test.Js/TestFramework/AsyncTestMethodAttribute.cs
@@ -10,4 +10,4 @@ internal sealed class AsyncTestMethodAttribute : Attribute
     {
         public extern AsyncTestMethodAttribute();
     }
-}
\ No newline at end of file
+}
diff --git a/Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js b/Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js
index 1ee41aa25..6eadf257f 100644
--- a/Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js
+++ b/Source/AlphaTab.Test.Js/test/alphaTab.tests.specs.js
@@ -1,1420 +1,1420 @@
 /// <reference path="alphaTab.tests.js" />

 describe("alphaTab.test.audio.AlphaSynthTests", function() {

     var __instance = new alphaTab.test.audio.AlphaSynthTests();

-    it("TestPcmGeneration", function(done) {

+    it("testPcmGeneration", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestPcmGeneration();

+        __instance.testPcmGeneration();

     });

 });

 describe("alphaTab.test.audio.MidiFileGeneratorTest", function() {

     var __instance = new alphaTab.test.audio.MidiFileGeneratorTest();

-    it("TestFullSong", function(done) {

+    it("testFullSong", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFullSong();

+        __instance.testFullSong();

     });

-    it("TestCorrectMidiOrder", function(done) {

+    it("testCorrectMidiOrder", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestCorrectMidiOrder();

+        __instance.testCorrectMidiOrder();

         done();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

         done();

     });

-    it("TestGraceBeatGeneration", function(done) {

+    it("testGraceBeatGeneration", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGraceBeatGeneration();

+        __instance.testGraceBeatGeneration();

     });

-    it("TestBendMultiPoint", function(done) {

+    it("testBendMultiPoint", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBendMultiPoint();

+        __instance.testBendMultiPoint();

         done();

     });

 });

 describe("alphaTab.test.audio.MidiPlaybackControllerTest", function() {

     var __instance = new alphaTab.test.audio.MidiPlaybackControllerTest();

-    it("TestRepeatClose", function(done) {

+    it("testRepeatClose", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRepeatClose();

+        __instance.testRepeatClose();

     });

-    it("TestRepeatCloseMulti", function(done) {

+    it("testRepeatCloseMulti", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRepeatCloseMulti();

+        __instance.testRepeatCloseMulti();

     });

-    it("TestRepeatCloseWithoutStartAtBeginning", function(done) {

+    it("testRepeatCloseWithoutStartAtBeginning", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRepeatCloseWithoutStartAtBeginning();

+        __instance.testRepeatCloseWithoutStartAtBeginning();

     });

-    it("TestRepeatCloseAlternateEndings", function(done) {

+    it("testRepeatCloseAlternateEndings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRepeatCloseAlternateEndings();

+        __instance.testRepeatCloseAlternateEndings();

     });

 });

 describe("alphaTab.test.importer.AlphaTexImporterTest", function() {

     var __instance = new alphaTab.test.importer.AlphaTexImporterTest();

-    it("EnsureMetadataParsing_Issue73", function(done) {

+    it("ensureMetadataParsing_Issue73", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.EnsureMetadataParsing_Issue73();

+        __instance.ensureMetadataParsing_Issue73();

         done();

     });

-    it("TestTuning", function(done) {

+    it("testTuning", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuning();

+        __instance.testTuning();

         done();

     });

-    it("DeadNotes1_Issue79", function(done) {

+    it("deadNotes1_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.DeadNotes1_Issue79();

+        __instance.deadNotes1_Issue79();

         done();

     });

-    it("DeadNotes2_Issue79", function(done) {

+    it("deadNotes2_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.DeadNotes2_Issue79();

+        __instance.deadNotes2_Issue79();

         done();

     });

-    it("Trill_Issue79", function(done) {

+    it("trill_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Trill_Issue79();

+        __instance.trill_Issue79();

         done();

     });

-    it("Tremolo_Issue79", function(done) {

+    it("tremolo_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Tremolo_Issue79();

+        __instance.tremolo_Issue79();

         done();

     });

-    it("TremoloPicking_Issue79", function(done) {

+    it("tremoloPicking_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TremoloPicking_Issue79();

+        __instance.tremoloPicking_Issue79();

         done();

     });

-    it("Hamonics_Issue79", function(done) {

+    it("hamonics_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Hamonics_Issue79();

+        __instance.hamonics_Issue79();

         done();

     });

-    it("HamonicsRenderingText_Issue79", function(done) {

+    it("hamonicsRenderingText_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.HamonicsRenderingText_Issue79();

+        __instance.hamonicsRenderingText_Issue79();

         done();

     });

-    it("Grace_Issue79", function(done) {

+    it("grace_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Grace_Issue79();

+        __instance.grace_Issue79();

         done();

     });

-    it("BendRendering_Issue79", function(done) {

+    it("bendRendering_Issue79", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.BendRendering_Issue79();

+        __instance.bendRendering_Issue79();

         done();

     });

-    it("TestLeftHandFingerSingleNote", function(done) {

+    it("testLeftHandFingerSingleNote", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestLeftHandFingerSingleNote();

+        __instance.testLeftHandFingerSingleNote();

         done();

     });

-    it("TestRightHandFingerSingleNote", function(done) {

+    it("testRightHandFingerSingleNote", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRightHandFingerSingleNote();

+        __instance.testRightHandFingerSingleNote();

         done();

     });

-    it("TestLeftHandFingerChord", function(done) {

+    it("testLeftHandFingerChord", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestLeftHandFingerChord();

+        __instance.testLeftHandFingerChord();

         done();

     });

-    it("TestRightHandFingerChord", function(done) {

+    it("testRightHandFingerChord", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRightHandFingerChord();

+        __instance.testRightHandFingerChord();

         done();

     });

-    it("TestUnstringed", function(done) {

+    it("testUnstringed", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestUnstringed();

+        __instance.testUnstringed();

         done();

     });

-    it("TestMultiStaffDefaultSettings", function(done) {

+    it("testMultiStaffDefaultSettings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiStaffDefaultSettings();

+        __instance.testMultiStaffDefaultSettings();

         done();

     });

-    it("TestMultiStaffDefaultSettingsBraces", function(done) {

+    it("testMultiStaffDefaultSettingsBraces", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiStaffDefaultSettingsBraces();

+        __instance.testMultiStaffDefaultSettingsBraces();

         done();

     });

-    it("TestSingleStaffWithSetting", function(done) {

+    it("testSingleStaffWithSetting", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSingleStaffWithSetting();

+        __instance.testSingleStaffWithSetting();

         done();

     });

-    it("TestMultiStaffWithSettings", function(done) {

+    it("testMultiStaffWithSettings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiStaffWithSettings();

+        __instance.testMultiStaffWithSettings();

         done();

     });

-    it("TestMultiTrack", function(done) {

+    it("testMultiTrack", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiTrack();

+        __instance.testMultiTrack();

         done();

     });

-    it("TestMultiTrackNames", function(done) {

+    it("testMultiTrackNames", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiTrackNames();

+        __instance.testMultiTrackNames();

         done();

     });

-    it("TestMultiTrackMultiStaff", function(done) {

+    it("testMultiTrackMultiStaff", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiTrackMultiStaff();

+        __instance.testMultiTrackMultiStaff();

         done();

     });

-    it("TestMultiTrackMultiStaffInconsistentBars", function(done) {

+    it("testMultiTrackMultiStaffInconsistentBars", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiTrackMultiStaffInconsistentBars();

+        __instance.testMultiTrackMultiStaffInconsistentBars();

         done();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

         done();

     });

-    it("TestSection", function(done) {

+    it("testSection", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSection();

+        __instance.testSection();

         done();

     });

-    it("TestPopSlapTap", function(done) {

+    it("testPopSlapTap", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestPopSlapTap();

+        __instance.testPopSlapTap();

         done();

     });

-    it("TestTripletFeelNumeric", function(done) {

+    it("testTripletFeelNumeric", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTripletFeelNumeric();

+        __instance.testTripletFeelNumeric();

         done();

     });

-    it("TestTripletFeelLongNames", function(done) {

+    it("testTripletFeelLongNames", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTripletFeelLongNames();

+        __instance.testTripletFeelLongNames();

         done();

     });

-    it("TestTripletFeelShortNames", function(done) {

+    it("testTripletFeelShortNames", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTripletFeelShortNames();

+        __instance.testTripletFeelShortNames();

         done();

     });

-    it("TestTripletFeelMultiBar", function(done) {

+    it("testTripletFeelMultiBar", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTripletFeelMultiBar();

+        __instance.testTripletFeelMultiBar();

         done();

     });

-    it("TestTupletRepeat", function(done) {

+    it("testTupletRepeat", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTupletRepeat();

+        __instance.testTupletRepeat();

         done();

     });

-    it("TestSimpleAnacrusis", function(done) {

+    it("testSimpleAnacrusis", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSimpleAnacrusis();

+        __instance.testSimpleAnacrusis();

         done();

     });

-    it("TestMultiBarAnacrusis", function(done) {

+    it("testMultiBarAnacrusis", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestMultiBarAnacrusis();

+        __instance.testMultiBarAnacrusis();

         done();

     });

-    it("TestRandomAnacrusis", function(done) {

+    it("testRandomAnacrusis", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRandomAnacrusis();

+        __instance.testRandomAnacrusis();

         done();

     });

 });

 describe("alphaTab.test.importer.Gp3ImporterTest", function() {

     var __instance = new alphaTab.test.importer.Gp3ImporterTest();

-    it("TestScoreInfo", function(done) {

+    it("testScoreInfo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestScoreInfo();

+        __instance.testScoreInfo();

     });

-    it("TestNotes", function(done) {

+    it("testNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNotes();

+        __instance.testNotes();

     });

-    it("TestTimeSignatures", function(done) {

+    it("testTimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTimeSignatures();

+        __instance.testTimeSignatures();

     });

-    it("TestDead", function(done) {

+    it("testDead", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDead();

+        __instance.testDead();

     });

-    it("TestAccentuation", function(done) {

+    it("testAccentuation", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAccentuation();

+        __instance.testAccentuation();

     });

-    it("TestGuitarPro3Harmonics", function(done) {

+    it("testGuitarPro3Harmonics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGuitarPro3Harmonics();

+        __instance.testGuitarPro3Harmonics();

         done();

     });

-    it("TestHammer", function(done) {

+    it("testHammer", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHammer();

+        __instance.testHammer();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

     });

-    it("TestGuitarPro3Vibrato", function(done) {

+    it("testGuitarPro3Vibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGuitarPro3Vibrato();

+        __instance.testGuitarPro3Vibrato();

     });

-    it("TestOtherEffects", function(done) {

+    it("testOtherEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOtherEffects();

+        __instance.testOtherEffects();

     });

-    it("TestStroke", function(done) {

+    it("testStroke", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStroke();

+        __instance.testStroke();

     });

-    it("TestTuplets", function(done) {

+    it("testTuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuplets();

+        __instance.testTuplets();

     });

-    it("TestRanges", function(done) {

+    it("testRanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRanges();

+        __instance.testRanges();

     });

-    it("TestEffects", function(done) {

+    it("testEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestEffects();

+        __instance.testEffects();

     });

-    it("TestStrings", function(done) {

+    it("testStrings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStrings();

+        __instance.testStrings();

     });

 });

 describe("alphaTab.test.importer.Gp4ImporterTest", function() {

     var __instance = new alphaTab.test.importer.Gp4ImporterTest();

-    it("TestScoreInfo", function(done) {

+    it("testScoreInfo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestScoreInfo();

+        __instance.testScoreInfo();

     });

-    it("TestNotes", function(done) {

+    it("testNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNotes();

+        __instance.testNotes();

     });

-    it("TestTimeSignatures", function(done) {

+    it("testTimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTimeSignatures();

+        __instance.testTimeSignatures();

     });

-    it("TestDead", function(done) {

+    it("testDead", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDead();

+        __instance.testDead();

     });

-    it("TestGrace", function(done) {

+    it("testGrace", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGrace();

+        __instance.testGrace();

     });

-    it("TestAccentuation", function(done) {

+    it("testAccentuation", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAccentuation();

+        __instance.testAccentuation();

     });

-    it("TestHarmonics", function(done) {

+    it("testHarmonics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHarmonics();

+        __instance.testHarmonics();

     });

-    it("TestHammer", function(done) {

+    it("testHammer", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHammer();

+        __instance.testHammer();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

     });

-    it("TestTremolo", function(done) {

+    it("testTremolo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTremolo();

+        __instance.testTremolo();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

     });

-    it("TestVibrato", function(done) {

+    it("testVibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestVibrato();

+        __instance.testVibrato();

     });

-    it("TestTrills", function(done) {

+    it("testTrills", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTrills();

+        __instance.testTrills();

     });

-    it("TestOtherEffects", function(done) {

+    it("testOtherEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOtherEffects();

+        __instance.testOtherEffects();

     });

-    it("TestFingering", function(done) {

+    it("testFingering", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFingering();

+        __instance.testFingering();

     });

-    it("TestStroke", function(done) {

+    it("testStroke", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStroke();

+        __instance.testStroke();

     });

-    it("TestTuplets", function(done) {

+    it("testTuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuplets();

+        __instance.testTuplets();

     });

-    it("TestRanges", function(done) {

+    it("testRanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRanges();

+        __instance.testRanges();

     });

-    it("TestEffects", function(done) {

+    it("testEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestEffects();

+        __instance.testEffects();

     });

-    it("TestStrings", function(done) {

+    it("testStrings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStrings();

+        __instance.testStrings();

     });

-    it("TestColors", function(done) {

+    it("testColors", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestColors();

+        __instance.testColors();

     });

 });

 describe("alphaTab.test.importer.Gp5ImporterTest", function() {

     var __instance = new alphaTab.test.importer.Gp5ImporterTest();

-    it("TestScoreInfo", function(done) {

+    it("testScoreInfo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestScoreInfo();

+        __instance.testScoreInfo();

     });

-    it("TestNotes", function(done) {

+    it("testNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNotes();

+        __instance.testNotes();

     });

-    it("TestTimeSignatures", function(done) {

+    it("testTimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTimeSignatures();

+        __instance.testTimeSignatures();

     });

-    it("TestDead", function(done) {

+    it("testDead", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDead();

+        __instance.testDead();

     });

-    it("TestGrace", function(done) {

+    it("testGrace", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGrace();

+        __instance.testGrace();

     });

-    it("TestAccentuation", function(done) {

+    it("testAccentuation", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAccentuation();

+        __instance.testAccentuation();

     });

-    it("TestHarmonics", function(done) {

+    it("testHarmonics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHarmonics();

+        __instance.testHarmonics();

     });

-    it("TestHammer", function(done) {

+    it("testHammer", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHammer();

+        __instance.testHammer();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

     });

-    it("TestTremolo", function(done) {

+    it("testTremolo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTremolo();

+        __instance.testTremolo();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

     });

-    it("TestVibrato", function(done) {

+    it("testVibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestVibrato();

+        __instance.testVibrato();

     });

-    it("TestTrills", function(done) {

+    it("testTrills", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTrills();

+        __instance.testTrills();

     });

-    it("TestOtherEffects", function(done) {

+    it("testOtherEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOtherEffects();

+        __instance.testOtherEffects();

     });

-    it("TestFingering", function(done) {

+    it("testFingering", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFingering();

+        __instance.testFingering();

     });

-    it("TestStroke", function(done) {

+    it("testStroke", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStroke();

+        __instance.testStroke();

     });

-    it("TestTuplets", function(done) {

+    it("testTuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuplets();

+        __instance.testTuplets();

     });

-    it("TestRanges", function(done) {

+    it("testRanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRanges();

+        __instance.testRanges();

     });

-    it("TestEffects", function(done) {

+    it("testEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestEffects();

+        __instance.testEffects();

     });

-    it("TestSerenade", function(done) {

+    it("testSerenade", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSerenade();

+        __instance.testSerenade();

     });

-    it("TestStrings", function(done) {

+    it("testStrings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStrings();

+        __instance.testStrings();

     });

-    it("TestKeySignatures", function(done) {

+    it("testKeySignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestKeySignatures();

+        __instance.testKeySignatures();

     });

-    it("TestChords", function(done) {

+    it("testChords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestChords();

+        __instance.testChords();

     });

-    it("TestColors", function(done) {

+    it("testColors", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestColors();

+        __instance.testColors();

     });

-    it("TestCanon", function(done) {

+    it("testCanon", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestCanon();

+        __instance.testCanon();

     });

 });

 describe("alphaTab.test.importer.Gp7ImporterTest", function() {

     var __instance = new alphaTab.test.importer.Gp7ImporterTest();

-    it("TestScoreInfo", function(done) {

+    it("testScoreInfo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestScoreInfo();

+        __instance.testScoreInfo();

     });

-    it("TestNotes", function(done) {

+    it("testNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNotes();

+        __instance.testNotes();

     });

-    it("TestTimeSignatures", function(done) {

+    it("testTimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTimeSignatures();

+        __instance.testTimeSignatures();

     });

-    it("TestDead", function(done) {

+    it("testDead", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDead();

+        __instance.testDead();

     });

-    it("TestGrace", function(done) {

+    it("testGrace", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGrace();

+        __instance.testGrace();

     });

-    it("TestAccentuation", function(done) {

+    it("testAccentuation", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAccentuation();

+        __instance.testAccentuation();

     });

-    it("TestHarmonics", function(done) {

+    it("testHarmonics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHarmonics();

+        __instance.testHarmonics();

     });

-    it("TestHammer", function(done) {

+    it("testHammer", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHammer();

+        __instance.testHammer();

     });

-    it("TestNumber", function(done) {

+    it("testNumber", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNumber();

+        __instance.testNumber();

         done();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

     });

-    it("TestBendAdvanced", function(done) {

+    it("testBendAdvanced", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBendAdvanced();

+        __instance.testBendAdvanced();

     });

-    it("TestWhammyAdvanced", function(done) {

+    it("testWhammyAdvanced", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestWhammyAdvanced();

+        __instance.testWhammyAdvanced();

     });

-    it("TestTremolo", function(done) {

+    it("testTremolo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTremolo();

+        __instance.testTremolo();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

     });

-    it("TestVibrato", function(done) {

+    it("testVibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestVibrato();

+        __instance.testVibrato();

     });

-    it("TestTrills", function(done) {

+    it("testTrills", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTrills();

+        __instance.testTrills();

     });

-    it("TestOtherEffects", function(done) {

+    it("testOtherEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOtherEffects();

+        __instance.testOtherEffects();

     });

-    it("TestFingering", function(done) {

+    it("testFingering", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFingering();

+        __instance.testFingering();

     });

-    it("TestStroke", function(done) {

+    it("testStroke", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStroke();

+        __instance.testStroke();

     });

-    it("TestTuplets", function(done) {

+    it("testTuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuplets();

+        __instance.testTuplets();

     });

-    it("TestRanges", function(done) {

+    it("testRanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRanges();

+        __instance.testRanges();

     });

-    it("TestEffects", function(done) {

+    it("testEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestEffects();

+        __instance.testEffects();

     });

-    it("TestSerenade", function(done) {

+    it("testSerenade", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSerenade();

+        __instance.testSerenade();

     });

-    it("TestStrings", function(done) {

+    it("testStrings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStrings();

+        __instance.testStrings();

     });

-    it("TestKeySignatures", function(done) {

+    it("testKeySignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestKeySignatures();

+        __instance.testKeySignatures();

     });

-    it("TestChords", function(done) {

+    it("testChords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestChords();

+        __instance.testChords();

     });

-    it("TestColors", function(done) {

+    it("testColors", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestColors();

+        __instance.testColors();

     });

-    it("TestTremoloVibrato", function(done) {

+    it("testTremoloVibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTremoloVibrato();

+        __instance.testTremoloVibrato();

     });

-    it("TestOttavia", function(done) {

+    it("testOttavia", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOttavia();

+        __instance.testOttavia();

     });

-    it("TestSimileMark", function(done) {

+    it("testSimileMark", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSimileMark();

+        __instance.testSimileMark();

     });

-    it("TestAnacrusis", function(done) {

+    it("testAnacrusis", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAnacrusis();

+        __instance.testAnacrusis();

     });

-    it("TestFermata", function(done) {

+    it("testFermata", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFermata();

+        __instance.testFermata();

     });

-    it("TestPickSlide", function(done) {

+    it("testPickSlide", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestPickSlide();

+        __instance.testPickSlide();

     });

 });

 describe("alphaTab.test.importer.GpxImporterTest", function() {

     var __instance = new alphaTab.test.importer.GpxImporterTest();

-    it("TestFileSystemCompressed", function(done) {

+    it("testFileSystemCompressed", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFileSystemCompressed();

+        __instance.testFileSystemCompressed();

     });

-    it("TestScoreInfo", function(done) {

+    it("testScoreInfo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestScoreInfo();

+        __instance.testScoreInfo();

     });

-    it("TestNotes", function(done) {

+    it("testNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNotes();

+        __instance.testNotes();

     });

-    it("TestTimeSignatures", function(done) {

+    it("testTimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTimeSignatures();

+        __instance.testTimeSignatures();

     });

-    it("TestDead", function(done) {

+    it("testDead", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDead();

+        __instance.testDead();

     });

-    it("TestGrace", function(done) {

+    it("testGrace", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestGrace();

+        __instance.testGrace();

     });

-    it("TestAccentuation", function(done) {

+    it("testAccentuation", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestAccentuation();

+        __instance.testAccentuation();

     });

-    it("TestHarmonics", function(done) {

+    it("testHarmonics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHarmonics();

+        __instance.testHarmonics();

     });

-    it("TestHammer", function(done) {

+    it("testHammer", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestHammer();

+        __instance.testHammer();

     });

-    it("TestBend", function(done) {

+    it("testBend", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestBend();

+        __instance.testBend();

     });

-    it("TestTremolo", function(done) {

+    it("testTremolo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTremolo();

+        __instance.testTremolo();

     });

-    it("TestSlides", function(done) {

+    it("testSlides", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSlides();

+        __instance.testSlides();

     });

-    it("TestVibrato", function(done) {

+    it("testVibrato", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestVibrato();

+        __instance.testVibrato();

     });

-    it("TestTrills", function(done) {

+    it("testTrills", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTrills();

+        __instance.testTrills();

     });

-    it("TestOtherEffects", function(done) {

+    it("testOtherEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestOtherEffects();

+        __instance.testOtherEffects();

     });

-    it("TestFingering", function(done) {

+    it("testFingering", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestFingering();

+        __instance.testFingering();

     });

-    it("TestStroke", function(done) {

+    it("testStroke", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStroke();

+        __instance.testStroke();

     });

-    it("TestTuplets", function(done) {

+    it("testTuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestTuplets();

+        __instance.testTuplets();

     });

-    it("TestRanges", function(done) {

+    it("testRanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestRanges();

+        __instance.testRanges();

     });

-    it("TestEffects", function(done) {

+    it("testEffects", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestEffects();

+        __instance.testEffects();

     });

-    it("TestSerenade", function(done) {

+    it("testSerenade", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSerenade();

+        __instance.testSerenade();

     });

-    it("TestStrings", function(done) {

+    it("testStrings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStrings();

+        __instance.testStrings();

     });

-    it("TestKeySignatures", function(done) {

+    it("testKeySignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestKeySignatures();

+        __instance.testKeySignatures();

     });

-    it("TestChords", function(done) {

+    it("testChords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestChords();

+        __instance.testChords();

     });

-    it("TestColors", function(done) {

+    it("testColors", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestColors();

+        __instance.testColors();

     });

 });

 describe("alphaTab.test.importer.MusicXmlImporterSamplesTests", function() {

     var __instance = new alphaTab.test.importer.MusicXmlImporterSamplesTests();

-    it("Test_BeetAnGeSample", function(done) {

+    it("test_BeetAnGeSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_BeetAnGeSample();

+        __instance.test_BeetAnGeSample();

     });

-    it("Test_Binchois", function(done) {

+    it("test_Binchois", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Binchois();

+        __instance.test_Binchois();

     });

-    it("Test_BrahWiMeSample", function(done) {

+    it("test_BrahWiMeSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_BrahWiMeSample();

+        __instance.test_BrahWiMeSample();

     });

-    it("Test_BrookeWestSample", function(done) {

+    it("test_BrookeWestSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_BrookeWestSample();

+        __instance.test_BrookeWestSample();

     });

-    it("Test_Chant", function(done) {

+    it("test_Chant", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Chant();

+        __instance.test_Chant();

     });

-    it("Test_DebuMandSample", function(done) {

+    it("test_DebuMandSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_DebuMandSample();

+        __instance.test_DebuMandSample();

     });

-    it("Test_Dichterliebe01", function(done) {

+    it("test_Dichterliebe01", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Dichterliebe01();

+        __instance.test_Dichterliebe01();

     });

-    it("Test_Echigo", function(done) {

+    it("test_Echigo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Echigo();

+        __instance.test_Echigo();

     });

-    it("Test_FaurReveSample", function(done) {

+    it("test_FaurReveSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_FaurReveSample();

+        __instance.test_FaurReveSample();

     });

-    it("Test_MahlFaGe4Sample", function(done) {

+    it("test_MahlFaGe4Sample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_MahlFaGe4Sample();

+        __instance.test_MahlFaGe4Sample();

     });

-    it("Test_MozaChloSample", function(done) {

+    it("test_MozaChloSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_MozaChloSample();

+        __instance.test_MozaChloSample();

     });

-    it("Test_MozartPianoSonata", function(done) {

+    it("test_MozartPianoSonata", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_MozartPianoSonata();

+        __instance.test_MozartPianoSonata();

     });

-    it("Test_MozartTrio", function(done) {

+    it("test_MozartTrio", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_MozartTrio();

+        __instance.test_MozartTrio();

     });

-    it("Test_MozaVeilSample", function(done) {

+    it("test_MozaVeilSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_MozaVeilSample();

+        __instance.test_MozaVeilSample();

     });

-    it("Test_Saltarello", function(done) {

+    it("test_Saltarello", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Saltarello();

+        __instance.test_Saltarello();

     });

-    it("Test_SchbAvMaSample", function(done) {

+    it("test_SchbAvMaSample", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_SchbAvMaSample();

+        __instance.test_SchbAvMaSample();

     });

-    it("Test_Telemann", function(done) {

+    it("test_Telemann", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_Telemann();

+        __instance.test_Telemann();

     });

 });

 describe("alphaTab.test.importer.MusicXmlImporterTestSuiteTests", function() {

     var __instance = new alphaTab.test.importer.MusicXmlImporterTestSuiteTests();

-    it("Test_01a_Pitches_Pitches", function(done) {

+    it("test_01a_Pitches_Pitches", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01a_Pitches_Pitches();

+        __instance.test_01a_Pitches_Pitches();

     });

-    it("Test_01b_Pitches_Intervals", function(done) {

+    it("test_01b_Pitches_Intervals", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01b_Pitches_Intervals();

+        __instance.test_01b_Pitches_Intervals();

     });

-    it("Test_01c_Pitches_NoVoiceElement", function(done) {

+    it("test_01c_Pitches_NoVoiceElement", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01c_Pitches_NoVoiceElement();

+        __instance.test_01c_Pitches_NoVoiceElement();

     });

-    it("Test_01d_Pitches_Microtones", function(done) {

+    it("test_01d_Pitches_Microtones", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01d_Pitches_Microtones();

+        __instance.test_01d_Pitches_Microtones();

     });

-    it("Test_01e_Pitches_ParenthesizedAccidentals", function(done) {

+    it("test_01e_Pitches_ParenthesizedAccidentals", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01e_Pitches_ParenthesizedAccidentals();

+        __instance.test_01e_Pitches_ParenthesizedAccidentals();

     });

-    it("Test_01f_Pitches_ParenthesizedMicrotoneAccidentals", function(done) {

+    it("test_01f_Pitches_ParenthesizedMicrotoneAccidentals", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_01f_Pitches_ParenthesizedMicrotoneAccidentals();

+        __instance.test_01f_Pitches_ParenthesizedMicrotoneAccidentals();

     });

-    it("Test_02a_Rests_Durations", function(done) {

+    it("test_02a_Rests_Durations", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_02a_Rests_Durations();

+        __instance.test_02a_Rests_Durations();

     });

-    it("Test_02b_Rests_PitchedRests", function(done) {

+    it("test_02b_Rests_PitchedRests", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_02b_Rests_PitchedRests();

+        __instance.test_02b_Rests_PitchedRests();

     });

-    it("Test_02c_Rests_MultiMeasureRests", function(done) {

+    it("test_02c_Rests_MultiMeasureRests", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_02c_Rests_MultiMeasureRests();

+        __instance.test_02c_Rests_MultiMeasureRests();

     });

-    it("Test_02d_Rests_Multimeasure_TimeSignatures", function(done) {

+    it("test_02d_Rests_Multimeasure_TimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_02d_Rests_Multimeasure_TimeSignatures();

+        __instance.test_02d_Rests_Multimeasure_TimeSignatures();

     });

-    it("Test_02e_Rests_NoType", function(done) {

+    it("test_02e_Rests_NoType", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_02e_Rests_NoType();

+        __instance.test_02e_Rests_NoType();

     });

-    it("Test_03a_Rhythm_Durations", function(done) {

+    it("test_03a_Rhythm_Durations", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_03a_Rhythm_Durations();

+        __instance.test_03a_Rhythm_Durations();

     });

-    it("Test_03b_Rhythm_Backup", function(done) {

+    it("test_03b_Rhythm_Backup", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_03b_Rhythm_Backup();

+        __instance.test_03b_Rhythm_Backup();

     });

-    it("Test_03c_Rhythm_DivisionChange", function(done) {

+    it("test_03c_Rhythm_DivisionChange", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_03c_Rhythm_DivisionChange();

+        __instance.test_03c_Rhythm_DivisionChange();

     });

-    it("Test_03d_Rhythm_DottedDurations_Factors", function(done) {

+    it("test_03d_Rhythm_DottedDurations_Factors", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_03d_Rhythm_DottedDurations_Factors();

+        __instance.test_03d_Rhythm_DottedDurations_Factors();

     });

-    it("Test_11a_TimeSignatures", function(done) {

+    it("test_11a_TimeSignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11a_TimeSignatures();

+        __instance.test_11a_TimeSignatures();

     });

-    it("Test_11b_TimeSignatures_NoTime", function(done) {

+    it("test_11b_TimeSignatures_NoTime", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11b_TimeSignatures_NoTime();

+        __instance.test_11b_TimeSignatures_NoTime();

     });

-    it("Test_11c_TimeSignatures_CompoundSimple", function(done) {

+    it("test_11c_TimeSignatures_CompoundSimple", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11c_TimeSignatures_CompoundSimple();

+        __instance.test_11c_TimeSignatures_CompoundSimple();

     });

-    it("Test_11d_TimeSignatures_CompoundMultiple", function(done) {

+    it("test_11d_TimeSignatures_CompoundMultiple", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11d_TimeSignatures_CompoundMultiple();

+        __instance.test_11d_TimeSignatures_CompoundMultiple();

     });

-    it("Test_11e_TimeSignatures_CompoundMixed", function(done) {

+    it("test_11e_TimeSignatures_CompoundMixed", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11e_TimeSignatures_CompoundMixed();

+        __instance.test_11e_TimeSignatures_CompoundMixed();

     });

-    it("Test_11f_TimeSignatures_SymbolMeaning", function(done) {

+    it("test_11f_TimeSignatures_SymbolMeaning", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11f_TimeSignatures_SymbolMeaning();

+        __instance.test_11f_TimeSignatures_SymbolMeaning();

     });

-    it("Test_11g_TimeSignatures_SingleNumber", function(done) {

+    it("test_11g_TimeSignatures_SingleNumber", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11g_TimeSignatures_SingleNumber();

+        __instance.test_11g_TimeSignatures_SingleNumber();

     });

-    it("Test_11h_TimeSignatures_SenzaMisura", function(done) {

+    it("test_11h_TimeSignatures_SenzaMisura", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_11h_TimeSignatures_SenzaMisura();

+        __instance.test_11h_TimeSignatures_SenzaMisura();

     });

-    it("Test_12a_Clefs", function(done) {

+    it("test_12a_Clefs", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_12a_Clefs();

+        __instance.test_12a_Clefs();

     });

-    it("Test_12b_Clefs_NoKeyOrClef", function(done) {

+    it("test_12b_Clefs_NoKeyOrClef", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_12b_Clefs_NoKeyOrClef();

+        __instance.test_12b_Clefs_NoKeyOrClef();

     });

-    it("Test_13a_KeySignatures", function(done) {

+    it("test_13a_KeySignatures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_13a_KeySignatures();

+        __instance.test_13a_KeySignatures();

     });

-    it("Test_13b_KeySignatures_ChurchModes", function(done) {

+    it("test_13b_KeySignatures_ChurchModes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_13b_KeySignatures_ChurchModes();

+        __instance.test_13b_KeySignatures_ChurchModes();

     });

-    it("Test_13c_KeySignatures_NonTraditional", function(done) {

+    it("test_13c_KeySignatures_NonTraditional", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_13c_KeySignatures_NonTraditional();

+        __instance.test_13c_KeySignatures_NonTraditional();

     });

-    it("Test_13d_KeySignatures_Microtones", function(done) {

+    it("test_13d_KeySignatures_Microtones", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_13d_KeySignatures_Microtones();

+        __instance.test_13d_KeySignatures_Microtones();

     });

-    it("Test_14a_StaffDetails_LineChanges", function(done) {

+    it("test_14a_StaffDetails_LineChanges", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_14a_StaffDetails_LineChanges();

+        __instance.test_14a_StaffDetails_LineChanges();

     });

-    it("Test_21a_Chord_Basic", function(done) {

+    it("test_21a_Chord_Basic", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21a_Chord_Basic();

+        __instance.test_21a_Chord_Basic();

     });

-    it("Test_21b_Chords_TwoNotes", function(done) {

+    it("test_21b_Chords_TwoNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21b_Chords_TwoNotes();

+        __instance.test_21b_Chords_TwoNotes();

     });

-    it("Test_21c_Chords_ThreeNotesDuration", function(done) {

+    it("test_21c_Chords_ThreeNotesDuration", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21c_Chords_ThreeNotesDuration();

+        __instance.test_21c_Chords_ThreeNotesDuration();

     });

-    it("Test_21d_Chords_SchubertStabatMater", function(done) {

+    it("test_21d_Chords_SchubertStabatMater", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21d_Chords_SchubertStabatMater();

+        __instance.test_21d_Chords_SchubertStabatMater();

     });

-    it("Test_21e_Chords_PickupMeasures", function(done) {

+    it("test_21e_Chords_PickupMeasures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21e_Chords_PickupMeasures();

+        __instance.test_21e_Chords_PickupMeasures();

     });

-    it("Test_21f_Chord_ElementInBetween", function(done) {

+    it("test_21f_Chord_ElementInBetween", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_21f_Chord_ElementInBetween();

+        __instance.test_21f_Chord_ElementInBetween();

     });

-    it("Test_22a_Noteheads", function(done) {

+    it("test_22a_Noteheads", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_22a_Noteheads();

+        __instance.test_22a_Noteheads();

     });

-    it("Test_22b_Staff_Notestyles", function(done) {

+    it("test_22b_Staff_Notestyles", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_22b_Staff_Notestyles();

+        __instance.test_22b_Staff_Notestyles();

     });

-    it("Test_22c_Noteheads_Chords", function(done) {

+    it("test_22c_Noteheads_Chords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_22c_Noteheads_Chords();

+        __instance.test_22c_Noteheads_Chords();

     });

-    it("Test_22d_Parenthesized_Noteheads", function(done) {

+    it("test_22d_Parenthesized_Noteheads", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_22d_Parenthesized_Noteheads();

+        __instance.test_22d_Parenthesized_Noteheads();

     });

-    it("Test_23a_Tuplets", function(done) {

+    it("test_23a_Tuplets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23a_Tuplets();

+        __instance.test_23a_Tuplets();

     });

-    it("Test_23b_Tuplets_Styles", function(done) {

+    it("test_23b_Tuplets_Styles", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23b_Tuplets_Styles();

+        __instance.test_23b_Tuplets_Styles();

     });

-    it("Test_23c_Tuplet_Display_NonStandard", function(done) {

+    it("test_23c_Tuplet_Display_NonStandard", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23c_Tuplet_Display_NonStandard();

+        __instance.test_23c_Tuplet_Display_NonStandard();

     });

-    it("Test_23d_Tuplets_Nested", function(done) {

+    it("test_23d_Tuplets_Nested", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23d_Tuplets_Nested();

+        __instance.test_23d_Tuplets_Nested();

     });

-    it("Test_23e_Tuplets_Tremolo", function(done) {

+    it("test_23e_Tuplets_Tremolo", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23e_Tuplets_Tremolo();

+        __instance.test_23e_Tuplets_Tremolo();

     });

-    it("Test_23f_Tuplets_DurationButNoBracket", function(done) {

+    it("test_23f_Tuplets_DurationButNoBracket", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_23f_Tuplets_DurationButNoBracket();

+        __instance.test_23f_Tuplets_DurationButNoBracket();

     });

-    it("Test_24a_GraceNotes", function(done) {

+    it("test_24a_GraceNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24a_GraceNotes();

+        __instance.test_24a_GraceNotes();

     });

-    it("Test_24b_ChordAsGraceNote", function(done) {

+    it("test_24b_ChordAsGraceNote", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24b_ChordAsGraceNote();

+        __instance.test_24b_ChordAsGraceNote();

     });

-    it("Test_24c_GraceNote_MeasureEnd", function(done) {

+    it("test_24c_GraceNote_MeasureEnd", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24c_GraceNote_MeasureEnd();

+        __instance.test_24c_GraceNote_MeasureEnd();

     });

-    it("Test_24d_AfterGrace", function(done) {

+    it("test_24d_AfterGrace", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24d_AfterGrace();

+        __instance.test_24d_AfterGrace();

     });

-    it("Test_24e_GraceNote_StaffChange", function(done) {

+    it("test_24e_GraceNote_StaffChange", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24e_GraceNote_StaffChange();

+        __instance.test_24e_GraceNote_StaffChange();

     });

-    it("Test_24f_GraceNote_Slur", function(done) {

+    it("test_24f_GraceNote_Slur", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_24f_GraceNote_Slur();

+        __instance.test_24f_GraceNote_Slur();

     });

-    it("Test_31a_Directions", function(done) {

+    it("test_31a_Directions", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_31a_Directions();

+        __instance.test_31a_Directions();

     });

-    it("Test_31c_MetronomeMarks", function(done) {

+    it("test_31c_MetronomeMarks", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_31c_MetronomeMarks();

+        __instance.test_31c_MetronomeMarks();

     });

-    it("Test_32a_Notations", function(done) {

+    it("test_32a_Notations", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_32a_Notations();

+        __instance.test_32a_Notations();

     });

-    it("Test_32b_Articulations_Texts", function(done) {

+    it("test_32b_Articulations_Texts", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_32b_Articulations_Texts();

+        __instance.test_32b_Articulations_Texts();

     });

-    it("Test_32c_MultipleNotationChildren", function(done) {

+    it("test_32c_MultipleNotationChildren", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_32c_MultipleNotationChildren();

+        __instance.test_32c_MultipleNotationChildren();

     });

-    it("Test_32d_Arpeggio", function(done) {

+    it("test_32d_Arpeggio", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_32d_Arpeggio();

+        __instance.test_32d_Arpeggio();

     });

-    it("Test_33a_Spanners", function(done) {

+    it("test_33a_Spanners", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33a_Spanners();

+        __instance.test_33a_Spanners();

     });

-    it("Test_33b_Spanners_Tie", function(done) {

+    it("test_33b_Spanners_Tie", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33b_Spanners_Tie();

+        __instance.test_33b_Spanners_Tie();

     });

-    it("Test_33c_Spanners_Slurs", function(done) {

+    it("test_33c_Spanners_Slurs", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33c_Spanners_Slurs();

+        __instance.test_33c_Spanners_Slurs();

     });

-    it("Test_33d_Spanners_OctaveShifts", function(done) {

+    it("test_33d_Spanners_OctaveShifts", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33d_Spanners_OctaveShifts();

+        __instance.test_33d_Spanners_OctaveShifts();

     });

-    it("Test_33e_Spanners_OctaveShifts_InvalidSize", function(done) {

+    it("test_33e_Spanners_OctaveShifts_InvalidSize", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33e_Spanners_OctaveShifts_InvalidSize();

+        __instance.test_33e_Spanners_OctaveShifts_InvalidSize();

     });

-    it("Test_33f_Trill_EndingOnGraceNote", function(done) {

+    it("test_33f_Trill_EndingOnGraceNote", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33f_Trill_EndingOnGraceNote();

+        __instance.test_33f_Trill_EndingOnGraceNote();

     });

-    it("Test_33g_Slur_ChordedNotes", function(done) {

+    it("test_33g_Slur_ChordedNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33g_Slur_ChordedNotes();

+        __instance.test_33g_Slur_ChordedNotes();

     });

-    it("Test_33h_Spanners_Glissando", function(done) {

+    it("test_33h_Spanners_Glissando", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33h_Spanners_Glissando();

+        __instance.test_33h_Spanners_Glissando();

     });

-    it("Test_33i_Ties_NotEnded", function(done) {

+    it("test_33i_Ties_NotEnded", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_33i_Ties_NotEnded();

+        __instance.test_33i_Ties_NotEnded();

     });

-    it("Test_41a_MultiParts_Partorder", function(done) {

+    it("test_41a_MultiParts_Partorder", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41a_MultiParts_Partorder();

+        __instance.test_41a_MultiParts_Partorder();

     });

-    it("Test_41b_MultiParts_MoreThan10", function(done) {

+    it("test_41b_MultiParts_MoreThan10", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41b_MultiParts_MoreThan10();

+        __instance.test_41b_MultiParts_MoreThan10();

     });

-    it("Test_41c_StaffGroups", function(done) {

+    it("test_41c_StaffGroups", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41c_StaffGroups();

+        __instance.test_41c_StaffGroups();

     });

-    it("Test_41d_StaffGroups_Nested", function(done) {

+    it("test_41d_StaffGroups_Nested", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41d_StaffGroups_Nested();

+        __instance.test_41d_StaffGroups_Nested();

     });

-    it("Test_41e_StaffGroups_InstrumentNames_Linebroken", function(done) {

+    it("test_41e_StaffGroups_InstrumentNames_Linebroken", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41e_StaffGroups_InstrumentNames_Linebroken();

+        __instance.test_41e_StaffGroups_InstrumentNames_Linebroken();

     });

-    it("Test_41f_StaffGroups_Overlapping", function(done) {

+    it("test_41f_StaffGroups_Overlapping", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41f_StaffGroups_Overlapping();

+        __instance.test_41f_StaffGroups_Overlapping();

     });

-    it("Test_41g_PartNoId", function(done) {

+    it("test_41g_PartNoId", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41g_PartNoId();

+        __instance.test_41g_PartNoId();

     });

-    it("Test_41h_TooManyParts", function(done) {

+    it("test_41h_TooManyParts", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41h_TooManyParts();

+        __instance.test_41h_TooManyParts();

     });

-    it("Test_41i_PartNameDisplay_Override", function(done) {

+    it("test_41i_PartNameDisplay_Override", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_41i_PartNameDisplay_Override();

+        __instance.test_41i_PartNameDisplay_Override();

     });

-    it("Test_42a_MultiVoice_TwoVoicesOnStaff_Lyrics", function(done) {

+    it("test_42a_MultiVoice_TwoVoicesOnStaff_Lyrics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_42a_MultiVoice_TwoVoicesOnStaff_Lyrics();

+        __instance.test_42a_MultiVoice_TwoVoicesOnStaff_Lyrics();

     });

-    it("Test_42b_MultiVoice_MidMeasureClefChange", function(done) {

+    it("test_42b_MultiVoice_MidMeasureClefChange", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_42b_MultiVoice_MidMeasureClefChange();

+        __instance.test_42b_MultiVoice_MidMeasureClefChange();

     });

-    it("Test_43a_PianoStaff", function(done) {

+    it("test_43a_PianoStaff", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_43a_PianoStaff();

+        __instance.test_43a_PianoStaff();

     });

-    it("Test_43b_MultiStaff_DifferentKeys", function(done) {

+    it("test_43b_MultiStaff_DifferentKeys", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_43b_MultiStaff_DifferentKeys();

+        __instance.test_43b_MultiStaff_DifferentKeys();

     });

-    it("Test_43c_MultiStaff_DifferentKeysAfterBackup", function(done) {

+    it("test_43c_MultiStaff_DifferentKeysAfterBackup", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_43c_MultiStaff_DifferentKeysAfterBackup();

+        __instance.test_43c_MultiStaff_DifferentKeysAfterBackup();

     });

-    it("Test_43d_MultiStaff_StaffChange", function(done) {

+    it("test_43d_MultiStaff_StaffChange", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_43d_MultiStaff_StaffChange();

+        __instance.test_43d_MultiStaff_StaffChange();

     });

-    it("Test_43e_Multistaff_ClefDynamics", function(done) {

+    it("test_43e_Multistaff_ClefDynamics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_43e_Multistaff_ClefDynamics();

+        __instance.test_43e_Multistaff_ClefDynamics();

     });

-    it("Test_45a_SimpleRepeat", function(done) {

+    it("test_45a_SimpleRepeat", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45a_SimpleRepeat();

+        __instance.test_45a_SimpleRepeat();

     });

-    it("Test_45b_RepeatWithAlternatives", function(done) {

+    it("test_45b_RepeatWithAlternatives", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45b_RepeatWithAlternatives();

+        __instance.test_45b_RepeatWithAlternatives();

     });

-    it("Test_45c_RepeatMultipleTimes", function(done) {

+    it("test_45c_RepeatMultipleTimes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45c_RepeatMultipleTimes();

+        __instance.test_45c_RepeatMultipleTimes();

     });

-    it("Test_45d_Repeats_Nested_Alternatives", function(done) {

+    it("test_45d_Repeats_Nested_Alternatives", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45d_Repeats_Nested_Alternatives();

+        __instance.test_45d_Repeats_Nested_Alternatives();

     });

-    it("Test_45e_Repeats_Nested_Alternatives", function(done) {

+    it("test_45e_Repeats_Nested_Alternatives", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45e_Repeats_Nested_Alternatives();

+        __instance.test_45e_Repeats_Nested_Alternatives();

     });

-    it("Test_45f_Repeats_InvalidEndings", function(done) {

+    it("test_45f_Repeats_InvalidEndings", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45f_Repeats_InvalidEndings();

+        __instance.test_45f_Repeats_InvalidEndings();

     });

-    it("Test_45g_Repeats_NotEnded", function(done) {

+    it("test_45g_Repeats_NotEnded", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_45g_Repeats_NotEnded();

+        __instance.test_45g_Repeats_NotEnded();

     });

-    it("Test_46a_Barlines", function(done) {

+    it("test_46a_Barlines", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46a_Barlines();

+        __instance.test_46a_Barlines();

     });

-    it("Test_46b_MidmeasureBarline", function(done) {

+    it("test_46b_MidmeasureBarline", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46b_MidmeasureBarline();

+        __instance.test_46b_MidmeasureBarline();

     });

-    it("Test_46c_Midmeasure_Clef", function(done) {

+    it("test_46c_Midmeasure_Clef", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46c_Midmeasure_Clef();

+        __instance.test_46c_Midmeasure_Clef();

     });

-    it("Test_46d_PickupMeasure_ImplicitMeasures", function(done) {

+    it("test_46d_PickupMeasure_ImplicitMeasures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46d_PickupMeasure_ImplicitMeasures();

+        __instance.test_46d_PickupMeasure_ImplicitMeasures();

     });

-    it("Test_46e_PickupMeasure_SecondVoiceStartsLater", function(done) {

+    it("test_46e_PickupMeasure_SecondVoiceStartsLater", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46e_PickupMeasure_SecondVoiceStartsLater();

+        __instance.test_46e_PickupMeasure_SecondVoiceStartsLater();

     });

-    it("Test_46f_IncompleteMeasures", function(done) {

+    it("test_46f_IncompleteMeasures", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46f_IncompleteMeasures();

+        __instance.test_46f_IncompleteMeasures();

     });

-    it("Test_46g_PickupMeasure_Chordnames_FiguredBass", function(done) {

+    it("test_46g_PickupMeasure_Chordnames_FiguredBass", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_46g_PickupMeasure_Chordnames_FiguredBass();

+        __instance.test_46g_PickupMeasure_Chordnames_FiguredBass();

     });

-    it("Test_51b_Header_Quotes", function(done) {

+    it("test_51b_Header_Quotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_51b_Header_Quotes();

+        __instance.test_51b_Header_Quotes();

     });

-    it("Test_51c_MultipleRights", function(done) {

+    it("test_51c_MultipleRights", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_51c_MultipleRights();

+        __instance.test_51c_MultipleRights();

     });

-    it("Test_51d_EmptyTitle", function(done) {

+    it("test_51d_EmptyTitle", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_51d_EmptyTitle();

+        __instance.test_51d_EmptyTitle();

     });

-    it("Test_52a_PageLayout", function(done) {

+    it("test_52a_PageLayout", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_52a_PageLayout();

+        __instance.test_52a_PageLayout();

     });

-    it("Test_52b_Breaks", function(done) {

+    it("test_52b_Breaks", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_52b_Breaks();

+        __instance.test_52b_Breaks();

     });

-    it("Test_61a_Lyrics", function(done) {

+    it("test_61a_Lyrics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61a_Lyrics();

+        __instance.test_61a_Lyrics();

     });

-    it("Test_61b_MultipleLyrics", function(done) {

+    it("test_61b_MultipleLyrics", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61b_MultipleLyrics();

+        __instance.test_61b_MultipleLyrics();

     });

-    it("Test_61c_Lyrics_Pianostaff", function(done) {

+    it("test_61c_Lyrics_Pianostaff", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61c_Lyrics_Pianostaff();

+        __instance.test_61c_Lyrics_Pianostaff();

     });

-    it("Test_61d_Lyrics_Melisma", function(done) {

+    it("test_61d_Lyrics_Melisma", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61d_Lyrics_Melisma();

+        __instance.test_61d_Lyrics_Melisma();

     });

-    it("Test_61e_Lyrics_Chords", function(done) {

+    it("test_61e_Lyrics_Chords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61e_Lyrics_Chords();

+        __instance.test_61e_Lyrics_Chords();

     });

-    it("Test_61f_Lyrics_GracedNotes", function(done) {

+    it("test_61f_Lyrics_GracedNotes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61f_Lyrics_GracedNotes();

+        __instance.test_61f_Lyrics_GracedNotes();

     });

-    it("Test_61g_Lyrics_NameNumber", function(done) {

+    it("test_61g_Lyrics_NameNumber", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61g_Lyrics_NameNumber();

+        __instance.test_61g_Lyrics_NameNumber();

     });

-    it("Test_61h_Lyrics_BeamsMelismata", function(done) {

+    it("test_61h_Lyrics_BeamsMelismata", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61h_Lyrics_BeamsMelismata();

+        __instance.test_61h_Lyrics_BeamsMelismata();

     });

-    it("Test_61i_Lyrics_Chords", function(done) {

+    it("test_61i_Lyrics_Chords", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61i_Lyrics_Chords();

+        __instance.test_61i_Lyrics_Chords();

     });

-    it("Test_61j_Lyrics_Elisions", function(done) {

+    it("test_61j_Lyrics_Elisions", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61j_Lyrics_Elisions();

+        __instance.test_61j_Lyrics_Elisions();

     });

-    it("Test_61k_Lyrics_SpannersExtenders", function(done) {

+    it("test_61k_Lyrics_SpannersExtenders", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_61k_Lyrics_SpannersExtenders();

+        __instance.test_61k_Lyrics_SpannersExtenders();

     });

-    it("Test_71a_Chordnames", function(done) {

+    it("test_71a_Chordnames", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71a_Chordnames();

+        __instance.test_71a_Chordnames();

     });

-    it("Test_71c_ChordsFrets", function(done) {

+    it("test_71c_ChordsFrets", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71c_ChordsFrets();

+        __instance.test_71c_ChordsFrets();

     });

-    it("Test_71d_ChordsFrets_Multistaff", function(done) {

+    it("test_71d_ChordsFrets_Multistaff", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71d_ChordsFrets_Multistaff();

+        __instance.test_71d_ChordsFrets_Multistaff();

     });

-    it("Test_71e_TabStaves", function(done) {

+    it("test_71e_TabStaves", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71e_TabStaves();

+        __instance.test_71e_TabStaves();

     });

-    it("Test_71f_AllChordTypes", function(done) {

+    it("test_71f_AllChordTypes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71f_AllChordTypes();

+        __instance.test_71f_AllChordTypes();

     });

-    it("Test_71g_MultipleChordnames", function(done) {

+    it("test_71g_MultipleChordnames", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_71g_MultipleChordnames();

+        __instance.test_71g_MultipleChordnames();

     });

-    it("Test_72a_TransposingInstruments", function(done) {

+    it("test_72a_TransposingInstruments", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_72a_TransposingInstruments();

+        __instance.test_72a_TransposingInstruments();

     });

-    it("Test_72b_TransposingInstruments_Full", function(done) {

+    it("test_72b_TransposingInstruments_Full", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_72b_TransposingInstruments_Full();

+        __instance.test_72b_TransposingInstruments_Full();

     });

-    it("Test_72c_TransposingInstruments_Change", function(done) {

+    it("test_72c_TransposingInstruments_Change", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_72c_TransposingInstruments_Change();

+        __instance.test_72c_TransposingInstruments_Change();

     });

-    it("Test_73a_Percussion", function(done) {

+    it("test_73a_Percussion", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_73a_Percussion();

+        __instance.test_73a_Percussion();

     });

-    it("Test_74a_FiguredBass", function(done) {

+    it("test_74a_FiguredBass", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_74a_FiguredBass();

+        __instance.test_74a_FiguredBass();

     });

-    it("Test_75a_AccordionRegistrations", function(done) {

+    it("test_75a_AccordionRegistrations", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_75a_AccordionRegistrations();

+        __instance.test_75a_AccordionRegistrations();

     });

-    it("Test_99a_Sibelius5_IgnoreBeaming", function(done) {

+    it("test_99a_Sibelius5_IgnoreBeaming", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_99a_Sibelius5_IgnoreBeaming();

+        __instance.test_99a_Sibelius5_IgnoreBeaming();

     });

-    it("Test_99b_Lyrics_BeamsMelismata_IgnoreBeams", function(done) {

+    it("test_99b_Lyrics_BeamsMelismata_IgnoreBeams", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.Test_99b_Lyrics_BeamsMelismata_IgnoreBeams();

+        __instance.test_99b_Lyrics_BeamsMelismata_IgnoreBeams();

     });

 });

 describe("alphaTab.test.model.LyricsTest", function() {

     var __instance = new alphaTab.test.model.LyricsTest();

-    it("TestApplySingleLineFirstBar", function(done) {

+    it("testApplySingleLineFirstBar", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestApplySingleLineFirstBar();

+        __instance.testApplySingleLineFirstBar();

     });

-    it("TestApplySingleLineBarOffset", function(done) {

+    it("testApplySingleLineBarOffset", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestApplySingleLineBarOffset();

+        __instance.testApplySingleLineBarOffset();

     });

-    it("TestApplyMultiLineFirstBar", function(done) {

+    it("testApplyMultiLineFirstBar", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestApplyMultiLineFirstBar();

+        __instance.testApplyMultiLineFirstBar();

     });

-    it("TestApplyMultiLineBarOffset", function(done) {

+    it("testApplyMultiLineBarOffset", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestApplyMultiLineBarOffset();

+        __instance.testApplyMultiLineBarOffset();

     });

-    it("TestSpaces", function(done) {

+    it("testSpaces", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestSpaces();

+        __instance.testSpaces();

         done();

     });

-    it("TestNewLines", function(done) {

+    it("testNewLines", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestNewLines();

+        __instance.testNewLines();

         done();

     });

-    it("TestDash", function(done) {

+    it("testDash", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestDash();

+        __instance.testDash();

         done();

     });

-    it("TestPlus", function(done) {

+    it("testPlus", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestPlus();

+        __instance.testPlus();

         done();

     });

-    it("TestComments", function(done) {

+    it("testComments", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestComments();

+        __instance.testComments();

         done();

     });

 });

 describe("alphaTab.test.model.TuningParserTest", function() {

     var __instance = new alphaTab.test.model.TuningParserTest();

-    it("TestStandard", function(done) {

+    it("testStandard", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.TestStandard();

+        __instance.testStandard();

         done();

     });

 });

 describe("alphaTab.test.xml.XmlParseTest", function() {

     var __instance = new alphaTab.test.xml.XmlParseTest();

-    it("ParseSimple", function(done) {

+    it("parseSimple", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseSimple();

+        __instance.parseSimple();

         done();

     });

-    it("ParseShorthand", function(done) {

+    it("parseShorthand", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseShorthand();

+        __instance.parseShorthand();

         done();

     });

-    it("ParseSingleAttribute", function(done) {

+    it("parseSingleAttribute", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseSingleAttribute();

+        __instance.parseSingleAttribute();

         done();

     });

-    it("ParseMultipleAttributes", function(done) {

+    it("parseMultipleAttributes", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseMultipleAttributes();

+        __instance.parseMultipleAttributes();

         done();

     });

-    it("ParseSimpleText", function(done) {

+    it("parseSimpleText", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseSimpleText();

+        __instance.parseSimpleText();

         done();

     });

-    it("ParseChild", function(done) {

+    it("parseChild", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseChild();

+        __instance.parseChild();

         done();

     });

-    it("ParseMultiChild", function(done) {

+    it("parseMultiChild", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseMultiChild();

+        __instance.parseMultiChild();

         done();

     });

-    it("ParseComments", function(done) {

+    it("parseComments", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseComments();

+        __instance.parseComments();

         done();

     });

-    it("ParseDoctype", function(done) {

+    it("parseDoctype", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseDoctype();

+        __instance.parseDoctype();

         done();

     });

-    it("ParseXmlHeadTest", function(done) {

+    it("parseXmlHeadTest", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseXmlHeadTest();

+        __instance.parseXmlHeadTest();

         done();

     });

-    it("ParseFull", function(done) {

+    it("parseFull", function(done) {

         alphaTab.test.TestPlatform.Done = done;

-        __instance.ParseFull();

+        __instance.parseFull();

         done();

     });

 });

diff --git a/Source/AlphaTab.Test/Audio/AlphaSynthTests.cs b/Source/AlphaTab.Test/Audio/AlphaSynthTests.cs
index 85fd43c43..eba8f6721 100644
--- a/Source/AlphaTab.Test/Audio/AlphaSynthTests.cs
+++ b/Source/AlphaTab.Test/Audio/AlphaSynthTests.cs
@@ -43,7 +43,7 @@ public void TestPcmGeneration()
 
                 while (!finished)
                 {
-                    testOutput.Continue();
+                    testOutput.Next();
                 }
 
                 //Console.WriteLine(testOutput.Samples.Count);
@@ -81,7 +81,7 @@ public void Play()
         {
         }
 
-        public void Continue()
+        public void Next()
         {
             if (_finished)
             {
diff --git a/Source/AlphaTab.Test/Audio/MidiFileGeneratorTest.cs b/Source/AlphaTab.Test/Audio/MidiFileGeneratorTest.cs
index 7bdef7e96..2bd62bf88 100644
--- a/Source/AlphaTab.Test/Audio/MidiFileGeneratorTest.cs
+++ b/Source/AlphaTab.Test/Audio/MidiFileGeneratorTest.cs
@@ -115,11 +115,11 @@ public void TestBend()
                 new FlatMidiEventGenerator.BendEvent { Tick = 959, Track = 0, Channel = info.SecondaryChannel, Value = 43 },
 
                 // note itself
-                new FlatMidiEventGenerator.NoteEvent { Tick = 0, Track = 0, Channel = info.SecondaryChannel, DynamicValue = note.Dynamic, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
+                new FlatMidiEventGenerator.NoteEvent { Tick = 0, Track = 0, Channel = info.SecondaryChannel, DynamicValue = note.Dynamics, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
 
                 // reset bend
                 new FlatMidiEventGenerator.BendEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, Value = 32 },
-                new FlatMidiEventGenerator.NoteEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, DynamicValue = note.Dynamic, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
+                new FlatMidiEventGenerator.NoteEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, DynamicValue = note.Dynamics, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
 
                 // end of track
                 new FlatMidiEventGenerator.TrackEndEvent { Tick = 3840, Track = 0 } // 3840 = end of bar
@@ -349,11 +349,11 @@ public void TestBendMultiPoint()
                 new FlatMidiEventGenerator.BendEvent { Tick = 959, Track = 0, Channel = info.SecondaryChannel, Value = 32 }, // no bend
 
                 // note itself
-                new FlatMidiEventGenerator.NoteEvent { Tick = 0, Track = 0, Channel = info.SecondaryChannel, DynamicValue = note.Dynamic, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
+                new FlatMidiEventGenerator.NoteEvent { Tick = 0, Track = 0, Channel = info.SecondaryChannel, DynamicValue = note.Dynamics, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
 
                 // reset bend
                 new FlatMidiEventGenerator.BendEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, Value = 32 }, // finish
-                new FlatMidiEventGenerator.NoteEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, DynamicValue = note.Dynamic, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
+                new FlatMidiEventGenerator.NoteEvent { Tick = 960, Track = 0, Channel = info.PrimaryChannel, DynamicValue = note.Dynamics, Key = (byte) note.RealValue, Length = note.Beat.Duration.ToTicks() },
                 // end of track
                 new FlatMidiEventGenerator.TrackEndEvent { Tick = 3840, Track = 0 } // 3840 = end of bar
             };
diff --git a/Source/AlphaTab.Test/Importer/Gp3ImporterTest.cs b/Source/AlphaTab.Test/Importer/Gp3ImporterTest.cs
index def7bc360..560adb99a 100644
--- a/Source/AlphaTab.Test/Importer/Gp3ImporterTest.cs
+++ b/Source/AlphaTab.Test/Importer/Gp3ImporterTest.cs
@@ -74,7 +74,7 @@ public void TestAccentuation()
 
                 Assert.IsTrue(score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[0].Notes[0].IsGhost);
                 // it seems accentuation is handled as Forte Fortissimo
-                Assert.AreEqual(DynamicValue.FFF, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Notes[0].Dynamic);
+                Assert.AreEqual(DynamicValue.FFF, score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[1].Notes[0].Dynamics);
                 Assert.IsTrue(score.Tracks[0].Staves[0].Bars[0].Voices[0].Beats[3].Notes[0].IsLetRing);
                 Render(score);
             });
diff --git a/Source/AlphaTab.Test/Importer/MusicXmlImporterTestBase.cs b/Source/AlphaTab.Test/Importer/MusicXmlImporterTestBase.cs
index 4f706ef45..ba43e7ba1 100644
--- a/Source/AlphaTab.Test/Importer/MusicXmlImporterTestBase.cs
+++ b/Source/AlphaTab.Test/Importer/MusicXmlImporterTestBase.cs
@@ -323,7 +323,7 @@ protected void AreEqual(Note expected, Note actual)
             Assert.AreEqual(expected.TrillSpeed, actual.TrillSpeed, "Mismatch on TrillSpeed");
             Assert.AreEqual(expected.DurationPercent, actual.DurationPercent, "Mismatch on DurationPercent");
             //Assert.AreEqual(expected.AccidentalMode, actual.AccidentalMode, "Mismatch on AccidentalMode");
-            Assert.AreEqual(expected.Dynamic, actual.Dynamic, "Mismatch on Dynamic");
+            Assert.AreEqual(expected.Dynamics, actual.Dynamics, "Mismatch on Dynamic");
             Assert.AreEqual(expected.RealValue, actual.RealValue, "Mismatch on RealValue");
         }
 
diff --git a/Source/AlphaTab/Audio/Generator/MidiFileGenerator.cs b/Source/AlphaTab/Audio/Generator/MidiFileGenerator.cs
index 0455b3f2d..01e7d77e4 100644
--- a/Source/AlphaTab/Audio/Generator/MidiFileGenerator.cs
+++ b/Source/AlphaTab/Audio/Generator/MidiFileGenerator.cs
@@ -517,7 +517,7 @@ private int ApplyStaticDuration(int duration, int maximum)
 
         private DynamicValue GetDynamicValue(Note note)
         {
-            var dynamicValue = note.Dynamic;
+            var dynamicValue = note.Dynamics;
 
             // more silent on hammer destination
             if (!note.Beat.Voice.Bar.Staff.IsPercussion && note.HammerPullOrigin != null)
diff --git a/Source/AlphaTab/Importer/Gp3To5Importer.cs b/Source/AlphaTab/Importer/Gp3To5Importer.cs
index f43173e96..c1155d722 100644
--- a/Source/AlphaTab/Importer/Gp3To5Importer.cs
+++ b/Source/AlphaTab/Importer/Gp3To5Importer.cs
@@ -1062,8 +1062,8 @@ public void ReadNote(Track track, Bar bar, Voice voice, Beat beat, int stringInd
             if ((flags & 0x10) != 0)
             {
                 var dynamicNumber = Data.ReadSignedByte();
-                newNote.Dynamic = ToDynamicValue(dynamicNumber);
-                beat.Dynamic = newNote.Dynamic;
+                newNote.Dynamics = ToDynamicValue(dynamicNumber);
+                beat.Dynamics = newNote.Dynamics;
             }
 
             if ((flags & 0x20) != 0)
@@ -1220,7 +1220,7 @@ public void ReadGrace(Voice voice, Note note)
             graceNote.String = note.String;
             graceNote.Fret = Data.ReadSignedByte();
             graceBeat.Duration = Duration.ThirtySecond;
-            graceBeat.Dynamic = ToDynamicValue(Data.ReadSignedByte());
+            graceBeat.Dynamics = ToDynamicValue(Data.ReadSignedByte());
             var transition = Data.ReadSignedByte();
             switch (transition)
             {
@@ -1237,7 +1237,7 @@ public void ReadGrace(Voice voice, Note note)
                     break;
             }
 
-            graceNote.Dynamic = graceBeat.Dynamic;
+            graceNote.Dynamics = graceBeat.Dynamics;
             Data.Skip(1); // duration
 
             if (_versionNumber < 500)
diff --git a/Source/AlphaTab/Importer/GpifParser.cs b/Source/AlphaTab/Importer/GpifParser.cs
index 7d3a88e1f..d6becca0d 100644
--- a/Source/AlphaTab/Importer/GpifParser.cs
+++ b/Source/AlphaTab/Importer/GpifParser.cs
@@ -1374,28 +1374,28 @@ private void ParseBeat(XmlNode node)
                             switch (c.InnerText)
                             {
                                 case "PPP":
-                                    beat.Dynamic = DynamicValue.PPP;
+                                    beat.Dynamics = DynamicValue.PPP;
                                     break;
                                 case "PP":
-                                    beat.Dynamic = DynamicValue.PP;
+                                    beat.Dynamics = DynamicValue.PP;
                                     break;
                                 case "P":
-                                    beat.Dynamic = DynamicValue.P;
+                                    beat.Dynamics = DynamicValue.P;
                                     break;
                                 case "MP":
-                                    beat.Dynamic = DynamicValue.MP;
+                                    beat.Dynamics = DynamicValue.MP;
                                     break;
                                 case "MF":
-                                    beat.Dynamic = DynamicValue.MF;
+                                    beat.Dynamics = DynamicValue.MF;
                                     break;
                                 case "F":
-                                    beat.Dynamic = DynamicValue.F;
+                                    beat.Dynamics = DynamicValue.F;
                                     break;
                                 case "FF":
-                                    beat.Dynamic = DynamicValue.FF;
+                                    beat.Dynamics = DynamicValue.FF;
                                     break;
                                 case "FFF":
-                                    beat.Dynamic = DynamicValue.FFF;
+                                    beat.Dynamics = DynamicValue.FFF;
                                     break;
                             }
 
diff --git a/Source/AlphaTab/Importer/MusicXmlImporter.cs b/Source/AlphaTab/Importer/MusicXmlImporter.cs
index f8ea2346f..a3063b475 100644
--- a/Source/AlphaTab/Importer/MusicXmlImporter.cs
+++ b/Source/AlphaTab/Importer/MusicXmlImporter.cs
@@ -1145,28 +1145,28 @@ private void ParseDynamics(XmlNode element, Beat beat)
                     switch (c.LocalName)
                     {
                         case "p":
-                            beat.Dynamic = DynamicValue.P;
+                            beat.Dynamics = DynamicValue.P;
                             break;
                         case "pp":
-                            beat.Dynamic = DynamicValue.PP;
+                            beat.Dynamics = DynamicValue.PP;
                             break;
                         case "ppp":
-                            beat.Dynamic = DynamicValue.PPP;
+                            beat.Dynamics = DynamicValue.PPP;
                             break;
                         case "f":
-                            beat.Dynamic = DynamicValue.F;
+                            beat.Dynamics = DynamicValue.F;
                             break;
                         case "ff":
-                            beat.Dynamic = DynamicValue.FF;
+                            beat.Dynamics = DynamicValue.FF;
                             break;
                         case "fff":
-                            beat.Dynamic = DynamicValue.FFF;
+                            beat.Dynamics = DynamicValue.FFF;
                             break;
                         case "mp":
-                            beat.Dynamic = DynamicValue.MP;
+                            beat.Dynamics = DynamicValue.MP;
                             break;
                         case "mf":
-                            beat.Dynamic = DynamicValue.MF;
+                            beat.Dynamics = DynamicValue.MF;
                             break;
                     }
                 }
diff --git a/Source/AlphaTab/Model/Beat.cs b/Source/AlphaTab/Model/Beat.cs
index f2ab00851..309c4f668 100644
--- a/Source/AlphaTab/Model/Beat.cs
+++ b/Source/AlphaTab/Model/Beat.cs
@@ -322,7 +322,7 @@ public class Beat
         /// <summary>
         /// Gets or sets the dynamics applied to this beat.
         /// </summary>
-        public DynamicValue Dynamic { get; set; }
+        public DynamicValue Dynamics { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the beam direction should be inverted.
@@ -357,7 +357,7 @@ public Beat()
             PlaybackDuration = 0;
             TupletDenominator = -1;
             TupletNumerator = -1;
-            Dynamic = DynamicValue.F;
+            Dynamics = DynamicValue.F;
             Crescendo = CrescendoType.None;
             InvertBeamDirection = false;
             Ottava = Ottavia.Regular;
@@ -402,7 +402,7 @@ internal static void CopyTo(Beat src, Beat dst)
             dst.DisplayDuration = src.DisplayDuration;
             dst.PlaybackStart = src.PlaybackStart;
             dst.PlaybackDuration = src.PlaybackDuration;
-            dst.Dynamic = src.Dynamic;
+            dst.Dynamics = src.Dynamics;
             dst.IsLegatoOrigin = src.IsLegatoOrigin;
             dst.InvertBeamDirection = src.InvertBeamDirection;
             dst.WhammyBarType = src.WhammyBarType;
diff --git a/Source/AlphaTab/Model/Note.cs b/Source/AlphaTab/Model/Note.cs
index e648abb1b..fcb4edb47 100644
--- a/Source/AlphaTab/Model/Note.cs
+++ b/Source/AlphaTab/Model/Note.cs
@@ -310,7 +310,7 @@ public class Note
         /// <summary>
         /// Gets or sets the dynamics for this note.
         /// </summary>
-        public DynamicValue Dynamic { get; set; }
+        public DynamicValue Dynamics { get; set; }
 
         internal bool IsEffectSlurOrigin { get; set; }
         internal bool HasEffectSlur { get; set; }
@@ -632,7 +632,7 @@ public Note()
             BendType = BendType.None;
             BendStyle = BendStyle.Default;
             BendPoints = new FastList<BendPoint>();
-            Dynamic = DynamicValue.F;
+            Dynamics = DynamicValue.F;
 
             Accentuated = AccentuationType.None;
             Fret = int.MinValue;
@@ -683,7 +683,7 @@ internal static void CopyTo(Note src, Note dst)
             dst.TrillSpeed = src.TrillSpeed;
             dst.DurationPercent = src.DurationPercent;
             dst.AccidentalMode = src.AccidentalMode;
-            dst.Dynamic = src.Dynamic;
+            dst.Dynamics = src.Dynamics;
             dst.Octave = src.Octave;
             dst.Tone = src.Tone;
             dst.Element = src.Element;
diff --git a/Source/AlphaTab/Rendering/Effects/DynamicsEffectInfo.cs b/Source/AlphaTab/Rendering/Effects/DynamicsEffectInfo.cs
index 9031a9196..2cfb2a701 100644
--- a/Source/AlphaTab/Rendering/Effects/DynamicsEffectInfo.cs
+++ b/Source/AlphaTab/Rendering/Effects/DynamicsEffectInfo.cs
@@ -23,7 +23,7 @@ private bool InternalShouldCreateGlyph(Beat beat)
             }
 
             var show = beat.Voice.Index == 0 && beat.Index == 0 && beat.Voice.Bar.Index == 0 ||
-                       beat.PreviousBeat != null && beat.Dynamic != beat.PreviousBeat.Dynamic;
+                       beat.PreviousBeat != null && beat.Dynamics != beat.PreviousBeat.Dynamics;
 
             // ensure we do not show duplicate dynamics
             if (show && beat.Voice.Index > 0)
@@ -33,7 +33,7 @@ private bool InternalShouldCreateGlyph(Beat beat)
                     if (voice.Index < beat.Voice.Index)
                     {
                         var beatAtSamePos = voice.GetBeatAtDisplayStart(beat.DisplayStart);
-                        if (beatAtSamePos != null && beat.Dynamic == beatAtSamePos.Dynamic &&
+                        if (beatAtSamePos != null && beat.Dynamics == beatAtSamePos.Dynamics &&
                             InternalShouldCreateGlyph(beatAtSamePos))
                         {
                             show = false;
@@ -47,7 +47,7 @@ private bool InternalShouldCreateGlyph(Beat beat)
 
         public EffectGlyph CreateNewGlyph(BarRendererBase renderer, Beat beat)
         {
-            return new DynamicsGlyph(0, 0, beat.Dynamic);
+            return new DynamicsGlyph(0, 0, beat.Dynamics);
         }
 
         public bool CanExpand(Beat from, Beat to)
diff --git a/Source/AlphaTab/Rendering/Layout/ScoreLayout.cs b/Source/AlphaTab/Rendering/Layout/ScoreLayout.cs
index a04dc95f6..e18ae30d8 100644
--- a/Source/AlphaTab/Rendering/Layout/ScoreLayout.cs
+++ b/Source/AlphaTab/Rendering/Layout/ScoreLayout.cs
@@ -10,7 +10,7 @@
 namespace AlphaTab.Rendering.Layout
 {
     /// <summary>
-    /// This is the base public class for creating new layouting engines for the score renderer. 
+    /// This is the base public class for creating new layouting engines for the score renderer.
     /// </summary>
     internal abstract class ScoreLayout
     {
@@ -213,7 +213,7 @@ protected StaveGroup CreateEmptyStaveGroup()
                 {
                     var staff = track.Staves[staffIndex];
 
-                    // use optimal profile for track 
+                    // use optimal profile for track
                     string staveProfile;
                     if (staff.IsPercussion)
                     {
@@ -291,7 +291,7 @@ public T GetRendererForBar<T>(string key, Bar bar)
         public void RenderAnnotation()
         {
             // attention, you are not allowed to remove change this notice within any version of this library without permission!
-            var msg = "Rendered using alphaTab (https://www.alphaTab.net)";
+            var msg = "rendered by alphaTab (https://alphaTab.net)";
 
             var canvas = Renderer.Canvas;
             var resources = Renderer.Settings.RenderingResources;
diff --git a/TestData/Docs/TwoTracks.gp b/TestData/Docs/TwoTracks.gp
new file mode 100644
index 000000000..eb27710ec
Binary files /dev/null and b/TestData/Docs/TwoTracks.gp differ
diff --git a/TestData/Docs/player/player.html b/TestData/Docs/player/player.html
index 05a6d4419..52aa146e4 100644
--- a/TestData/Docs/player/player.html
+++ b/TestData/Docs/player/player.html
@@ -270,10 +270,10 @@
             var trackList = $('#trackList');
             trackList.empty();
             
-            for( var i = 0; i < score.Tracks.length; i++) {
+            for( var i = 0; i < score.tracks.length; i++) {
                 // build list item for track
                 var li = $('<li></li>')
-                    .data('track', score.Tracks[i].Index)
+                    .data('track', score.tracks[i].index)
                 ;
                 
                 // show/hide button and track title
@@ -282,7 +282,7 @@
                 
                 var showHide = $('<i class="fa fa-eye-slash showHide"></i>');
                 title.append(showHide);
-                title.append(score.Tracks[i].Name);
+                title.append(score.tracks[i].name);
                 title.on('click', function(e) {
                     var track = $(this).closest('li').data('track');
                     tracks = [track];
@@ -323,7 +323,7 @@
                     min: 0,
                     max: 16,
                     step: 1,
-                    value: score.Tracks[i].PlaybackInfo.Volume,
+                    value: score.tracks[i].playbackInfo.volume,
                     handle: 'square'
                 })
                 
@@ -332,9 +332,9 @@
         });
         at.on('alphaTab.rendered', function(e) {
             // load track indices
-            tracks = at.alphaTab('tracks');
+            tracks = at.alphaTab('tracks').splice();
             for(var i = 0; i < tracks.length; i++) {
-                tracks[i] = tracks[i].Index;
+                tracks[i] = tracks[i].index;
             }
             
             // check checkboxes 
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Bends.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Bends.png
index 17703f671..0a010b14e 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Bends.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Bends.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Brush.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Brush.png
index 3266f691a..c7231d2e4 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Brush.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Brush.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Chords.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Chords.png
index 7184d86d6..00de8defa 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Chords.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Chords.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Dynamics.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Dynamics.png
index 4c689b0e8..5b71f36c0 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Dynamics.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Dynamics.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/FadeIn.png b/TestData/VisualTests/Features/EffectsAndAnnotations/FadeIn.png
index 5011c97f7..5a644c4ae 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/FadeIn.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/FadeIn.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Fingering.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Fingering.png
index d99456ff6..34d5ef5ef 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Fingering.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Fingering.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/LetRing.png b/TestData/VisualTests/Features/EffectsAndAnnotations/LetRing.png
index 1185dc405..2c836071a 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/LetRing.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/LetRing.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Markers.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Markers.png
index 9f21b9229..b701d714c 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Markers.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Markers.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/PalmMute.png b/TestData/VisualTests/Features/EffectsAndAnnotations/PalmMute.png
index 04e3386ee..016e31c59 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/PalmMute.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/PalmMute.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/PickStroke.png b/TestData/VisualTests/Features/EffectsAndAnnotations/PickStroke.png
index 75357a92b..4bb7c4542 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/PickStroke.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/PickStroke.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Slides.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Slides.png
index 0e9548dfd..155811d96 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Slides.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Slides.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Tap.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Tap.png
index 0eb4032a7..7675c9896 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Tap.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Tap.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Tempo.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Tempo.png
index da2cb6384..908a611b0 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Tempo.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Tempo.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Text.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Text.png
index c2245bbf7..a391be970 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Text.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Text.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloBar.png b/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloBar.png
index 4650c3471..e2795283e 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloBar.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloBar.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloPicking.png b/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloPicking.png
index 657512b51..4884aadc8 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloPicking.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/TremoloPicking.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Trill.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Trill.png
index 084164133..f9840878e 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Trill.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Trill.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/TripletFeel.png b/TestData/VisualTests/Features/EffectsAndAnnotations/TripletFeel.png
index 434dbaf62..c2458f0d3 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/TripletFeel.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/TripletFeel.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Tuplets.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Tuplets.png
index 5167a82f5..a99a06ca7 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Tuplets.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Tuplets.png differ
diff --git a/TestData/VisualTests/Features/EffectsAndAnnotations/Vibrato.png b/TestData/VisualTests/Features/EffectsAndAnnotations/Vibrato.png
index 8ced72354..d31246d5c 100644
Binary files a/TestData/VisualTests/Features/EffectsAndAnnotations/Vibrato.png and b/TestData/VisualTests/Features/EffectsAndAnnotations/Vibrato.png differ
diff --git a/TestData/VisualTests/Features/General/AlternateEndings.png b/TestData/VisualTests/Features/General/AlternateEndings.png
index 138348bc4..2a107459a 100644
Binary files a/TestData/VisualTests/Features/General/AlternateEndings.png and b/TestData/VisualTests/Features/General/AlternateEndings.png differ
diff --git a/TestData/VisualTests/Features/General/Repeats.png b/TestData/VisualTests/Features/General/Repeats.png
index fccdeb6fa..40e2fdbd5 100644
Binary files a/TestData/VisualTests/Features/General/Repeats.png and b/TestData/VisualTests/Features/General/Repeats.png differ
diff --git a/TestData/VisualTests/Features/General/SongDetails.png b/TestData/VisualTests/Features/General/SongDetails.png
index 32113ef04..0a0e47a47 100644
Binary files a/TestData/VisualTests/Features/General/SongDetails.png and b/TestData/VisualTests/Features/General/SongDetails.png differ
diff --git a/TestData/VisualTests/Features/General/Tuning.png b/TestData/VisualTests/Features/General/Tuning.png
index 00b334df5..ce295efcd 100644
Binary files a/TestData/VisualTests/Features/General/Tuning.png and b/TestData/VisualTests/Features/General/Tuning.png differ
diff --git a/TestData/VisualTests/Features/GuitarTabs/Rhythm.png b/TestData/VisualTests/Features/GuitarTabs/Rhythm.png
index b38dcb692..2c92a9139 100644
Binary files a/TestData/VisualTests/Features/GuitarTabs/Rhythm.png and b/TestData/VisualTests/Features/GuitarTabs/Rhythm.png differ
diff --git a/TestData/VisualTests/Features/GuitarTabs/RhythmWithBeams.png b/TestData/VisualTests/Features/GuitarTabs/RhythmWithBeams.png
index 2f03fcc0d..48ef7a0c5 100644
Binary files a/TestData/VisualTests/Features/GuitarTabs/RhythmWithBeams.png and b/TestData/VisualTests/Features/GuitarTabs/RhythmWithBeams.png differ
diff --git a/TestData/VisualTests/Features/GuitarTabs/StringVariations.png b/TestData/VisualTests/Features/GuitarTabs/StringVariations.png
index 847edf50a..24cf5d8b7 100644
Binary files a/TestData/VisualTests/Features/GuitarTabs/StringVariations.png and b/TestData/VisualTests/Features/GuitarTabs/StringVariations.png differ
diff --git a/TestData/VisualTests/Features/Layout/MultiTrack.png b/TestData/VisualTests/Features/Layout/MultiTrack.png
index c933d31b0..1ac43ce9d 100644
Binary files a/TestData/VisualTests/Features/Layout/MultiTrack.png and b/TestData/VisualTests/Features/Layout/MultiTrack.png differ
diff --git a/TestData/VisualTests/Features/Layout/PageLayout.png b/TestData/VisualTests/Features/Layout/PageLayout.png
index 7f3dd8529..c6843ef70 100644
Binary files a/TestData/VisualTests/Features/Layout/PageLayout.png and b/TestData/VisualTests/Features/Layout/PageLayout.png differ
diff --git a/TestData/VisualTests/Features/Layout/PageLayout5BarsPerRow.png b/TestData/VisualTests/Features/Layout/PageLayout5BarsPerRow.png
index a64373235..46c8f260d 100644
Binary files a/TestData/VisualTests/Features/Layout/PageLayout5BarsPerRow.png and b/TestData/VisualTests/Features/Layout/PageLayout5BarsPerRow.png differ
diff --git a/TestData/VisualTests/Features/Layout/PageLayoutBar5To8.png b/TestData/VisualTests/Features/Layout/PageLayoutBar5To8.png
index 2ef78f782..b5f26edb4 100644
Binary files a/TestData/VisualTests/Features/Layout/PageLayoutBar5To8.png and b/TestData/VisualTests/Features/Layout/PageLayoutBar5To8.png differ
diff --git a/TestData/VisualTests/Features/MusicNotation/Accidentals.png b/TestData/VisualTests/Features/MusicNotation/Accidentals.png
index 1de0b692d..6db5f974c 100644
Binary files a/TestData/VisualTests/Features/MusicNotation/Accidentals.png and b/TestData/VisualTests/Features/MusicNotation/Accidentals.png differ
diff --git a/TestData/VisualTests/Features/MusicNotation/Clefs.png b/TestData/VisualTests/Features/MusicNotation/Clefs.png
index a17541c2a..0605dd1c6 100644
Binary files a/TestData/VisualTests/Features/MusicNotation/Clefs.png and b/TestData/VisualTests/Features/MusicNotation/Clefs.png differ
diff --git a/TestData/VisualTests/Features/MusicNotation/KeySignatures.png b/TestData/VisualTests/Features/MusicNotation/KeySignatures.png
index 785ff2c2e..4b5d65f2e 100644
Binary files a/TestData/VisualTests/Features/MusicNotation/KeySignatures.png and b/TestData/VisualTests/Features/MusicNotation/KeySignatures.png differ
diff --git a/TestData/VisualTests/Features/MusicNotation/NotesRestsBeams.png b/TestData/VisualTests/Features/MusicNotation/NotesRestsBeams.png
index de52437a4..b100c01b6 100644
Binary files a/TestData/VisualTests/Features/MusicNotation/NotesRestsBeams.png and b/TestData/VisualTests/Features/MusicNotation/NotesRestsBeams.png differ
diff --git a/TestData/VisualTests/Features/MusicNotation/TimeSignatures.png b/TestData/VisualTests/Features/MusicNotation/TimeSignatures.png
index 3dbad9ab9..42c5fbe49 100644
Binary files a/TestData/VisualTests/Features/MusicNotation/TimeSignatures.png and b/TestData/VisualTests/Features/MusicNotation/TimeSignatures.png differ
diff --git a/TestData/VisualTests/Features/SpecialNotes/DeadNotes.png b/TestData/VisualTests/Features/SpecialNotes/DeadNotes.png
index ab44b2ff9..0f9b4fa22 100644
Binary files a/TestData/VisualTests/Features/SpecialNotes/DeadNotes.png and b/TestData/VisualTests/Features/SpecialNotes/DeadNotes.png differ
diff --git a/TestData/VisualTests/Features/SpecialNotes/GhostNotes.png b/TestData/VisualTests/Features/SpecialNotes/GhostNotes.png
index af0973c04..1358b8542 100644
Binary files a/TestData/VisualTests/Features/SpecialNotes/GhostNotes.png and b/TestData/VisualTests/Features/SpecialNotes/GhostNotes.png differ
diff --git a/TestData/VisualTests/Features/SpecialNotes/GraceNotes.png b/TestData/VisualTests/Features/SpecialNotes/GraceNotes.png
index f3996b7c4..15b54c227 100644
Binary files a/TestData/VisualTests/Features/SpecialNotes/GraceNotes.png and b/TestData/VisualTests/Features/SpecialNotes/GraceNotes.png differ
diff --git a/TestData/VisualTests/Features/SpecialNotes/TiedNotes.png b/TestData/VisualTests/Features/SpecialNotes/TiedNotes.png
index b1ac78d4d..4e89901b9 100644
Binary files a/TestData/VisualTests/Features/SpecialNotes/TiedNotes.png and b/TestData/VisualTests/Features/SpecialNotes/TiedNotes.png differ
diff --git a/TestData/VisualTests/Features/SpecialTracks/DrumTabs.png b/TestData/VisualTests/Features/SpecialTracks/DrumTabs.png
index a3542b433..e561a3a40 100644
Binary files a/TestData/VisualTests/Features/SpecialTracks/DrumTabs.png and b/TestData/VisualTests/Features/SpecialTracks/DrumTabs.png differ
diff --git a/TestData/VisualTests/Features/SpecialTracks/GrandStaff.png b/TestData/VisualTests/Features/SpecialTracks/GrandStaff.png
index c1dea877f..937b908a8 100644
Binary files a/TestData/VisualTests/Features/SpecialTracks/GrandStaff.png and b/TestData/VisualTests/Features/SpecialTracks/GrandStaff.png differ
diff --git a/appveyor.yml b/appveyor.yml
index 7b0b774d4..98188ca7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.9.4.{build}
+version: 0.9.5.{build}
 # branches to build
 branches:
   only: