diff --git a/scripts/api.json b/scripts/api.json
index f6ba1396a..0b00b10e0 100644
--- a/scripts/api.json
+++ b/scripts/api.json
@@ -558,7 +558,6 @@
             "function AnimationScriptNamed(const name: String): AnimationScript"
           ],
           "csharp": [
-            "public static AnimationScript Animation.AnimationScriptNamed(string name);",
             "public static AnimationScript SplashKit.AnimationScriptNamed(string name);"
           ]
         }
@@ -640,7 +639,7 @@
             "procedure AssignAnimation(anim: Animation; script: AnimationScript; const name: String)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(AnimationScript script, string name);",
+            "public void Animation.Assign(AnimationScript script, string name);",
             "public static void SplashKit.AssignAnimation(Animation anim, AnimationScript script, string name);"
           ]
         }
@@ -735,7 +734,7 @@
             "procedure AssignAnimation(anim: Animation; script: AnimationScript; const name: String; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(AnimationScript script, string name, bool withSound);",
+            "public void Animation.Assign(AnimationScript script, string name, bool withSound);",
             "public static void SplashKit.AssignAnimation(Animation anim, AnimationScript script, string name, bool withSound);"
           ]
         }
@@ -817,7 +816,7 @@
             "procedure AssignAnimation(anim: Animation; script: AnimationScript; idx: Integer)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(AnimationScript script, int idx);",
+            "public void Animation.Assign(AnimationScript script, int idx);",
             "public static void SplashKit.AssignAnimation(Animation anim, AnimationScript script, int idx);"
           ]
         }
@@ -912,7 +911,7 @@
             "procedure AssignAnimation(anim: Animation; script: AnimationScript; idx: Integer; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(AnimationScript script, int idx, bool withSound);",
+            "public void Animation.Assign(AnimationScript script, int idx, bool withSound);",
             "public static void SplashKit.AssignAnimation(Animation anim, AnimationScript script, int idx, bool withSound);"
           ]
         }
@@ -994,7 +993,7 @@
             "procedure AssignAnimation(anim: Animation; const scriptName: String; const name: String)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(string scriptName, string name);",
+            "public void Animation.Assign(string scriptName, string name);",
             "public static void SplashKit.AssignAnimation(Animation anim, string scriptName, string name);"
           ]
         }
@@ -1089,7 +1088,7 @@
             "procedure AssignAnimation(anim: Animation; const scriptName: String; const name: String; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(string scriptName, string name, bool withSound);",
+            "public void Animation.Assign(string scriptName, string name, bool withSound);",
             "public static void SplashKit.AssignAnimation(Animation anim, string scriptName, string name, bool withSound);"
           ]
         }
@@ -1158,7 +1157,7 @@
             "procedure AssignAnimation(anim: Animation; idx: Integer)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(int idx);",
+            "public void Animation.Assign(int idx);",
             "public static void SplashKit.AssignAnimation(Animation anim, int idx);"
           ]
         }
@@ -1240,7 +1239,7 @@
             "procedure AssignAnimation(anim: Animation; idx: Integer; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(int idx, bool withSound);",
+            "public void Animation.Assign(int idx, bool withSound);",
             "public static void SplashKit.AssignAnimation(Animation anim, int idx, bool withSound);"
           ]
         }
@@ -1308,7 +1307,7 @@
             "procedure AssignAnimation(anim: Animation; name: String)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(string name);",
+            "public void Animation.Assign(string name);",
             "public static void SplashKit.AssignAnimation(Animation anim, string name);"
           ]
         }
@@ -1390,7 +1389,7 @@
             "procedure AssignAnimation(anim: Animation; name: String; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.AssignAnimation(string name, bool withSound);",
+            "public void Animation.Assign(string name, bool withSound);",
             "public static void SplashKit.AssignAnimation(Animation anim, string name, bool withSound);"
           ]
         }
@@ -1469,7 +1468,6 @@
             "function CreateAnimation(script: AnimationScript; idx: Integer; withSound: Boolean): Animation"
           ],
           "csharp": [
-            "public static Animation Animation.CreateAnimation(AnimationScript script, int idx, bool withSound);",
             "public static Animation SplashKit.CreateAnimation(AnimationScript script, int idx, bool withSound);"
           ]
         }
@@ -1685,7 +1683,6 @@
             "function CreateAnimation(const scriptName: String; const name: String): Animation"
           ],
           "csharp": [
-            "public static Animation Animation.CreateAnimation(string scriptName, string name);",
             "public static Animation SplashKit.CreateAnimation(string scriptName, string name);"
           ]
         }
@@ -1764,7 +1761,6 @@
             "function CreateAnimation(const scriptName: String; const name: String; withSound: Boolean): Animation"
           ],
           "csharp": [
-            "public static Animation Animation.CreateAnimation(string scriptName, string name, bool withSound);",
             "public static Animation SplashKit.CreateAnimation(string scriptName, string name, bool withSound);"
           ]
         }
@@ -1804,7 +1800,7 @@
             "procedure FreeAllAnimationScripts()"
           ],
           "csharp": [
-            "public static void Animation.FreeAllAnimationScripts();",
+            "public static void Animation.FreeAll();",
             "public static void SplashKit.FreeAllAnimationScripts();"
           ]
         }
@@ -1859,7 +1855,6 @@
             "procedure FreeAnimation(ani: Animation)"
           ],
           "csharp": [
-            "public void Animation.FreeAnimation();",
             "public static void SplashKit.FreeAnimation(Animation ani);"
           ]
         }
@@ -1914,7 +1909,6 @@
             "procedure FreeAnimationScript(scriptToFree: AnimationScript)"
           ],
           "csharp": [
-            "public void AnimationScript.FreeAnimationScript();",
             "public static void SplashKit.FreeAnimationScript(AnimationScript scriptToFree);"
           ]
         }
@@ -1967,7 +1961,6 @@
             "procedure FreeAnimationScript(const name: String)"
           ],
           "csharp": [
-            "public static void Animation.FreeAnimationScript(string name);",
             "public static void SplashKit.FreeAnimationScript(string name);"
           ]
         }
@@ -2034,7 +2027,6 @@
             "function HasAnimationNamed(script: AnimationScript; const name: String): Boolean"
           ],
           "csharp": [
-            "public bool AnimationScript.HasAnimationNamed(string name);",
             "public static bool SplashKit.HasAnimationNamed(AnimationScript script, string name);"
           ]
         }
@@ -2086,7 +2078,6 @@
             "function HasAnimationScript(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Animation.HasAnimationScript(string name);",
             "public static bool SplashKit.HasAnimationScript(string name);"
           ]
         }
@@ -2208,7 +2199,7 @@
             "procedure RestartAnimation(anim: Animation)"
           ],
           "csharp": [
-            "public void Animation.RestartAnimation();",
+            "public void Animation.Restart();",
             "public static void SplashKit.RestartAnimation(Animation anim);"
           ]
         }
@@ -2277,7 +2268,7 @@
             "procedure RestartAnimation(anim: Animation; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Animation.RestartAnimation(bool withSound);",
+            "public void Animation.Restart(bool withSound);",
             "public static void SplashKit.RestartAnimation(Animation anim, bool withSound);"
           ]
         }
@@ -2356,7 +2347,6 @@
             "procedure UpdateAnimation(anim: Animation; pct: Single; withSound: Boolean)"
           ],
           "csharp": [
-            "public static void Animation.UpdateAnimation(Animation anim, float pct, bool withSound);",
             "public static void SplashKit.UpdateAnimation(Animation anim, float pct, bool withSound);"
           ]
         }
@@ -2411,7 +2401,7 @@
             "procedure UpdateAnimation(anim: Animation)"
           ],
           "csharp": [
-            "public void Animation.UpdateAnimation();",
+            "public void Animation.Update();",
             "public static void SplashKit.UpdateAnimation(Animation anim);"
           ]
         }
@@ -2480,7 +2470,7 @@
             "procedure UpdateAnimation(anim: Animation; pct: Single)"
           ],
           "csharp": [
-            "public void Animation.UpdateAnimation(float pct);",
+            "public void Animation.Update(float pct);",
             "public static void SplashKit.UpdateAnimation(Animation anim, float pct);"
           ]
         }
@@ -2577,7 +2567,6 @@
             "procedure CloseAudio()"
           ],
           "csharp": [
-            "public static void Audio.CloseAudio();",
             "public static void SplashKit.CloseAudio();"
           ]
         }
@@ -2616,7 +2605,6 @@
             "procedure OpenAudio()"
           ],
           "csharp": [
-            "public static void Audio.OpenAudio();",
             "public static void SplashKit.OpenAudio();"
           ]
         }
@@ -2682,7 +2670,6 @@
             "procedure FadeMusicIn(const name: String; ms: Integer)"
           ],
           "csharp": [
-            "public static void Audio.FadeMusicIn(string name, int ms);",
             "public static void SplashKit.FadeMusicIn(string name, int ms);"
           ]
         }
@@ -2761,7 +2748,6 @@
             "procedure FadeMusicIn(const name: String; times: Integer; ms: Integer)"
           ],
           "csharp": [
-            "public static void Audio.FadeMusicIn(string name, int times, int ms);",
             "public static void SplashKit.FadeMusicIn(string name, int times, int ms);"
           ]
         }
@@ -2829,7 +2815,7 @@
             "procedure FadeMusicIn(data: Music; ms: Integer)"
           ],
           "csharp": [
-            "public void Music.FadeMusicIn(int ms);",
+            "public void Music.FadeIn(int ms);",
             "public static void SplashKit.FadeMusicIn(Music data, int ms);"
           ]
         }
@@ -2911,7 +2897,7 @@
             "procedure FadeMusicIn(data: Music; times: Integer; ms: Integer)"
           ],
           "csharp": [
-            "public void Music.FadeMusicIn(int times, int ms);",
+            "public void Music.FadeIn(int times, int ms);",
             "public static void SplashKit.FadeMusicIn(Music data, int times, int ms);"
           ]
         }
@@ -2964,7 +2950,7 @@
             "procedure FadeMusicOut(ms: Integer)"
           ],
           "csharp": [
-            "public static void Audio.FadeMusicOut(int ms);",
+            "public static void Audio.FadeOut(int ms);",
             "public static void SplashKit.FadeMusicOut(int ms);"
           ]
         }
@@ -3059,7 +3045,6 @@
             "procedure FreeMusic(effect: Music)"
           ],
           "csharp": [
-            "public void Music.FreeMusic();",
             "public static void SplashKit.FreeMusic(Music effect);"
           ]
         }
@@ -3111,7 +3096,6 @@
             "function HasMusic(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Audio.HasMusic(string name);",
             "public static bool SplashKit.HasMusic(string name);"
           ]
         }
@@ -3340,7 +3324,6 @@
             "function MusicNamed(const name: String): Music"
           ],
           "csharp": [
-            "public static Music Audio.MusicNamed(string name);",
             "public static Music SplashKit.MusicNamed(string name);"
           ]
         }
@@ -3432,7 +3415,6 @@
             "function MusicValid(m: Music): Boolean"
           ],
           "csharp": [
-            "public static bool Audio.MusicValid(Music m);",
             "public static bool SplashKit.MusicValid(Music m);"
           ]
         }
@@ -3512,7 +3494,7 @@
             "procedure PauseMusic()"
           ],
           "csharp": [
-            "public static void Audio.PauseMusic();",
+            "public static void Audio.Pause();",
             "public static void SplashKit.PauseMusic();"
           ]
         }
@@ -3565,7 +3547,6 @@
             "procedure PlayMusic(const name: String)"
           ],
           "csharp": [
-            "public static void Audio.PlayMusic(string name);",
             "public static void SplashKit.PlayMusic(string name);"
           ]
         }
@@ -3631,7 +3612,6 @@
             "procedure PlayMusic(const name: String; times: Integer)"
           ],
           "csharp": [
-            "public static void Audio.PlayMusic(string name, int times);",
             "public static void SplashKit.PlayMusic(string name, int times);"
           ]
         }
@@ -3686,7 +3666,7 @@
             "procedure PlayMusic(data: Music)"
           ],
           "csharp": [
-            "public void Music.PlayMusic();",
+            "public void Music.Play();",
             "public static void SplashKit.PlayMusic(Music data);"
           ]
         }
@@ -3755,7 +3735,7 @@
             "procedure PlayMusic(data: Music; times: Integer)"
           ],
           "csharp": [
-            "public void Music.PlayMusic(int times);",
+            "public void Music.Play(int times);",
             "public static void SplashKit.PlayMusic(Music data, int times);"
           ]
         }
@@ -3837,7 +3817,7 @@
             "procedure PlayMusic(data: Music; times: Integer; volume: Double)"
           ],
           "csharp": [
-            "public void Music.PlayMusic(int times, double volume);",
+            "public void Music.Play(int times, double volume);",
             "public static void SplashKit.PlayMusic(Music data, int times, double volume);"
           ]
         }
@@ -3877,7 +3857,7 @@
             "procedure ResumeMusic()"
           ],
           "csharp": [
-            "public static void Audio.ResumeMusic();",
+            "public static void Audio.Resume();",
             "public static void SplashKit.ResumeMusic();"
           ]
         }
@@ -3970,7 +3950,7 @@
             "procedure StopMusic()"
           ],
           "csharp": [
-            "public static void Audio.StopMusic();",
+            "public static void Audio.Stop();",
             "public static void SplashKit.StopMusic();"
           ]
         }
@@ -4022,7 +4002,6 @@
             "procedure FadeAllSoundEffectsOut(ms: Integer)"
           ],
           "csharp": [
-            "public static void Audio.FadeAllSoundEffectsOut(int ms);",
             "public static void SplashKit.FadeAllSoundEffectsOut(int ms);"
           ]
         }
@@ -4090,7 +4069,7 @@
             "procedure FadeSoundEffectOut(effect: SoundEffect; ms: Integer)"
           ],
           "csharp": [
-            "public void SoundEffect.FadeSoundEffectOut(int ms);",
+            "public void SoundEffect.FadeOut(int ms);",
             "public static void SplashKit.FadeSoundEffectOut(SoundEffect effect, int ms);"
           ]
         }
@@ -4129,7 +4108,6 @@
             "procedure FreeAllSoundEffects()"
           ],
           "csharp": [
-            "public static void Audio.FreeAllSoundEffects();",
             "public static void SplashKit.FreeAllSoundEffects();"
           ]
         }
@@ -4185,7 +4163,7 @@
             "procedure FreeSoundEffect(effect: SoundEffect)"
           ],
           "csharp": [
-            "public void SoundEffect.FreeSoundEffect();",
+            "public void SoundEffect.Close();",
             "public static void SplashKit.FreeSoundEffect(SoundEffect effect);"
           ]
         }
@@ -4237,7 +4215,6 @@
             "function HasSoundEffect(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Audio.HasSoundEffect(string name);",
             "public static bool SplashKit.HasSoundEffect(string name);"
           ]
         }
@@ -4357,7 +4334,6 @@
             "procedure PlaySoundEffect(const name: String)"
           ],
           "csharp": [
-            "public static void Audio.PlaySoundEffect(string name);",
             "public static void SplashKit.PlaySoundEffect(string name);"
           ]
         }
@@ -4423,7 +4399,6 @@
             "procedure PlaySoundEffect(const name: String; volume: Double)"
           ],
           "csharp": [
-            "public static void Audio.PlaySoundEffect(string name, double volume);",
             "public static void SplashKit.PlaySoundEffect(string name, double volume);"
           ]
         }
@@ -4489,7 +4464,6 @@
             "procedure PlaySoundEffect(const name: String; times: Integer)"
           ],
           "csharp": [
-            "public static void Audio.PlaySoundEffect(string name, int times);",
             "public static void SplashKit.PlaySoundEffect(string name, int times);"
           ]
         }
@@ -4568,7 +4542,6 @@
             "procedure PlaySoundEffect(const name: String; times: Integer; volume: Double)"
           ],
           "csharp": [
-            "public static void Audio.PlaySoundEffect(string name, int times, double volume);",
             "public static void SplashKit.PlaySoundEffect(string name, int times, double volume);"
           ]
         }
@@ -4623,7 +4596,7 @@
             "procedure PlaySoundEffect(effect: SoundEffect)"
           ],
           "csharp": [
-            "public void SoundEffect.PlaySoundEffect();",
+            "public void SoundEffect.Play();",
             "public static void SplashKit.PlaySoundEffect(SoundEffect effect);"
           ]
         }
@@ -4692,7 +4665,7 @@
             "procedure PlaySoundEffect(effect: SoundEffect; volume: Double)"
           ],
           "csharp": [
-            "public void SoundEffect.PlaySoundEffect(double volume);",
+            "public void SoundEffect.Play(double volume);",
             "public static void SplashKit.PlaySoundEffect(SoundEffect effect, double volume);"
           ]
         }
@@ -4761,7 +4734,7 @@
             "procedure PlaySoundEffect(effect: SoundEffect; times: Integer)"
           ],
           "csharp": [
-            "public void SoundEffect.PlaySoundEffect(int times);",
+            "public void SoundEffect.Play(int times);",
             "public static void SplashKit.PlaySoundEffect(SoundEffect effect, int times);"
           ]
         }
@@ -4843,7 +4816,7 @@
             "procedure PlaySoundEffect(effect: SoundEffect; times: Integer; volume: Double)"
           ],
           "csharp": [
-            "public void SoundEffect.PlaySoundEffect(int times, double volume);",
+            "public void SoundEffect.Play(int times, double volume);",
             "public static void SplashKit.PlaySoundEffect(SoundEffect effect, int times, double volume);"
           ]
         }
@@ -5005,7 +4978,6 @@
             "function SoundEffectNamed(const name: String): SoundEffect"
           ],
           "csharp": [
-            "public static SoundEffect Audio.SoundEffectNamed(string name);",
             "public static SoundEffect SplashKit.SoundEffectNamed(string name);"
           ]
         }
@@ -5058,7 +5030,6 @@
             "function SoundEffectPlaying(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Audio.SoundEffectPlaying(string name);",
             "public static bool SplashKit.SoundEffectPlaying(string name);"
           ]
         }
@@ -5165,7 +5136,6 @@
             "function SoundEffectValid(effect: SoundEffect): Boolean"
           ],
           "csharp": [
-            "public static bool Audio.SoundEffectValid(SoundEffect effect);",
             "public static bool SplashKit.SoundEffectValid(SoundEffect effect);"
           ]
         }
@@ -5218,7 +5188,6 @@
             "procedure StopSoundEffect(const name: String)"
           ],
           "csharp": [
-            "public static void Audio.StopSoundEffect(string name);",
             "public static void SplashKit.StopSoundEffect(string name);"
           ]
         }
@@ -5273,7 +5242,7 @@
             "procedure StopSoundEffect(effect: SoundEffect)"
           ],
           "csharp": [
-            "public void SoundEffect.StopSoundEffect();",
+            "public void SoundEffect.Stop();",
             "public static void SplashKit.StopSoundEffect(SoundEffect effect);"
           ]
         }
@@ -5509,7 +5478,7 @@
             "procedure CenterCameraOn(s: Sprite; const offset: Vector2D)"
           ],
           "csharp": [
-            "public static void Camera.CenterCameraOn(Sprite s, Vector2D offset);",
+            "public static void Camera.CenterOn(Sprite s, Vector2D offset);",
             "public static void SplashKit.CenterCameraOn(Sprite s, Vector2D offset);"
           ]
         }
@@ -5588,7 +5557,7 @@
             "procedure CenterCameraOn(s: Sprite; offsetX: Double; offsetY: Double)"
           ],
           "csharp": [
-            "public static void Camera.CenterCameraOn(Sprite s, double offsetX, double offsetY);",
+            "public static void Camera.CenterOn(Sprite s, double offsetX, double offsetY);",
             "public static void SplashKit.CenterCameraOn(Sprite s, double offsetX, double offsetY);"
           ]
         }
@@ -5642,7 +5611,7 @@
             "procedure MoveCameraBy(const offset: Vector2D)"
           ],
           "csharp": [
-            "public static void Camera.MoveCameraBy(Vector2D offset);",
+            "public static void Camera.MoveBy(Vector2D offset);",
             "public static void SplashKit.MoveCameraBy(Vector2D offset);"
           ]
         }
@@ -5708,7 +5677,7 @@
             "procedure MoveCameraBy(dx: Double; dy: Double)"
           ],
           "csharp": [
-            "public static void Camera.MoveCameraBy(double dx, double dy);",
+            "public static void Camera.MoveBy(double dx, double dy);",
             "public static void SplashKit.MoveCameraBy(double dx, double dy);"
           ]
         }
@@ -5762,7 +5731,7 @@
             "procedure MoveCameraTo(const pt: Point2D)"
           ],
           "csharp": [
-            "public static void Camera.MoveCameraTo(Point2D pt);",
+            "public static void Camera.MoveTo(Point2D pt);",
             "public static void SplashKit.MoveCameraTo(Point2D pt);"
           ]
         }
@@ -5828,7 +5797,7 @@
             "procedure MoveCameraTo(x: Double; y: Double)"
           ],
           "csharp": [
-            "public static void Camera.MoveCameraTo(double x, double y);",
+            "public static void Camera.MoveTo(double x, double y);",
             "public static void SplashKit.MoveCameraTo(double x, double y);"
           ]
         }
@@ -13073,7 +13042,7 @@
             "function RandomColor(): Color"
           ],
           "csharp": [
-            "public static Color Color.RandomColor();",
+            "public static Color Color.Random();",
             "public static Color SplashKit.RandomColor();"
           ]
         }
@@ -13126,7 +13095,7 @@
             "function RandomRGBColor(alpha: Integer): Color"
           ],
           "csharp": [
-            "public static Color Color.RandomRGBColor(int alpha);",
+            "public static Color Color.RandomRGB(int alpha);",
             "public static Color SplashKit.RandomRGBColor(int alpha);"
           ]
         }
@@ -14559,7 +14528,6 @@
             "function CenterPoint(const c: Circle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.CenterPoint(Circle c);",
             "public static Point2D SplashKit.CenterPoint(Circle c);"
           ]
         }
@@ -14624,7 +14592,6 @@
             "function CircleAt(const pt: Point2D; radius: Double): Circle"
           ],
           "csharp": [
-            "public static Circle Geometry.CircleAt(Point2D pt, double radius);",
             "public static Circle SplashKit.CircleAt(Point2D pt, double radius);"
           ]
         }
@@ -14703,7 +14670,6 @@
             "function CircleAt(x: Double; y: Double; radius: Double): Circle"
           ],
           "csharp": [
-            "public static Circle Geometry.CircleAt(double x, double y, double radius);",
             "public static Circle SplashKit.CircleAt(double x, double y, double radius);"
           ]
         }
@@ -14755,7 +14721,6 @@
             "function CircleRadius(c: Circle): Single"
           ],
           "csharp": [
-            "public static float Geometry.CircleRadius(Circle c);",
             "public static float SplashKit.CircleRadius(Circle c);"
           ]
         }
@@ -14820,7 +14785,6 @@
             "function CircleTriangleIntersect(const c: Circle; const tri: Triangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.CircleTriangleIntersect(Circle c, Triangle tri);",
             "public static bool SplashKit.CircleTriangleIntersect(Circle c, Triangle tri);"
           ]
         }
@@ -14899,7 +14863,6 @@
             "function CircleTriangleIntersect(const c: Circle; const tri: Triangle; var p: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.CircleTriangleIntersect(Circle c, Triangle tri, ref Point2D p);",
             "public static bool SplashKit.CircleTriangleIntersect(Circle c, Triangle tri, ref Point2D p);"
           ]
         }
@@ -14951,7 +14914,6 @@
             "function CircleX(const c: Circle): Single"
           ],
           "csharp": [
-            "public static float Geometry.CircleX(Circle c);",
             "public static float SplashKit.CircleX(Circle c);"
           ]
         }
@@ -15003,7 +14965,6 @@
             "function CircleY(const c: Circle): Single"
           ],
           "csharp": [
-            "public static float Geometry.CircleY(Circle c);",
             "public static float SplashKit.CircleY(Circle c);"
           ]
         }
@@ -15068,7 +15029,6 @@
             "function CirclesIntersect(c1: Circle; c2: Circle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.CirclesIntersect(Circle c1, Circle c2);",
             "public static bool SplashKit.CirclesIntersect(Circle c1, Circle c2);"
           ]
         }
@@ -15186,7 +15146,6 @@
             "function CirclesIntersect(c1X: Double; c1Y: Double; c1Radius: Double; c2X: Double; c2Y: Double; c2Radius: Double): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.CirclesIntersect(double c1X, double c1Y, double c1Radius, double c2X, double c2Y, double c2Radius);",
             "public static bool SplashKit.CirclesIntersect(double c1X, double c1Y, double c1Radius, double c2X, double c2Y, double c2Radius);"
           ]
         }
@@ -15251,7 +15210,6 @@
             "function ClosestPointOnCircle(const fromPt: Point2D; const c: Circle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnCircle(Point2D fromPt, Circle c);",
             "public static Point2D SplashKit.ClosestPointOnCircle(Point2D fromPt, Circle c);"
           ]
         }
@@ -15316,7 +15274,6 @@
             "function ClosestPointOnLineFromCircle(const c: Circle; const l: Line): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnLineFromCircle(Circle c, Line l);",
             "public static Point2D SplashKit.ClosestPointOnLineFromCircle(Circle c, Line l);"
           ]
         }
@@ -15381,7 +15338,6 @@
             "function ClosestPointOnRectFromCircle(const c: Circle; const rect: Rectangle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnRectFromCircle(Circle c, Rectangle rect);",
             "public static Point2D SplashKit.ClosestPointOnRectFromCircle(Circle c, Rectangle rect);"
           ]
         }
@@ -15446,7 +15402,6 @@
             "function ClosestPointOnTriangleFromCircle(const c: Circle; const tri: Triangle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnTriangleFromCircle(Circle c, Triangle tri);",
             "public static Point2D SplashKit.ClosestPointOnTriangleFromCircle(Circle c, Triangle tri);"
           ]
         }
@@ -15511,7 +15466,6 @@
             "function DistantPointOnCircle(const pt: Point2D; const c: Circle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.DistantPointOnCircle(Point2D pt, Circle c);",
             "public static Point2D SplashKit.DistantPointOnCircle(Point2D pt, Circle c);"
           ]
         }
@@ -15602,7 +15556,6 @@
             "function DistantPointOnCircleHeading(const pt: Point2D; const c: Circle; const heading: Vector2D; var oppositePt: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.DistantPointOnCircleHeading(Point2D pt, Circle c, Vector2D heading, ref Point2D oppositePt);",
             "public static bool SplashKit.DistantPointOnCircleHeading(Point2D pt, Circle c, Vector2D heading, ref Point2D oppositePt);"
           ]
         }
@@ -15680,7 +15633,6 @@
             "function RayCircleIntersectDistance(const rayOrigin: Point2D; const rayHeading: Vector2D; const c: Circle): Single"
           ],
           "csharp": [
-            "public static float Geometry.RayCircleIntersectDistance(Point2D rayOrigin, Vector2D rayHeading, Circle c);",
             "public static float SplashKit.RayCircleIntersectDistance(Point2D rayOrigin, Vector2D rayHeading, Circle c);"
           ]
         }
@@ -15771,7 +15723,6 @@
             "function TangentPoints(const fromPt: Point2D; const c: Circle; var p1: Point2D; var p2: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.TangentPoints(Point2D fromPt, Circle c, ref Point2D p1, ref Point2D p2);",
             "public static bool SplashKit.TangentPoints(Point2D fromPt, Circle c, ref Point2D p1, ref Point2D p2);"
           ]
         }
@@ -15862,7 +15813,6 @@
             "procedure WidestPoints(const c: Circle; const along: Vector2D; var pt1: Point2D; var pt2: Point2D)"
           ],
           "csharp": [
-            "public static void Geometry.WidestPoints(Circle c, Vector2D along, ref Point2D pt1, ref Point2D pt2);",
             "public static void SplashKit.WidestPoints(Circle c, Vector2D along, ref Point2D pt1, ref Point2D pt2);"
           ]
         }
@@ -15914,7 +15864,6 @@
             "function Cosine(degrees: Single): Single"
           ],
           "csharp": [
-            "public static float Geometry.Cosine(float degrees);",
             "public static float SplashKit.Cosine(float degrees);"
           ]
         }
@@ -15966,7 +15915,6 @@
             "function Sine(degrees: Single): Single"
           ],
           "csharp": [
-            "public static float Geometry.Sine(float degrees);",
             "public static float SplashKit.Sine(float degrees);"
           ]
         }
@@ -16018,7 +15966,6 @@
             "function Tangent(degrees: Single): Single"
           ],
           "csharp": [
-            "public static float Geometry.Tangent(float degrees);",
             "public static float SplashKit.Tangent(float degrees);"
           ]
         }
@@ -16083,7 +16030,6 @@
             "function ClosestPointOnLine(fromPt: Point2D; const l: Line): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnLine(Point2D fromPt, Line l);",
             "public static Point2D SplashKit.ClosestPointOnLine(Point2D fromPt, Line l);"
           ]
         }
@@ -16161,7 +16107,6 @@
             "function ClosestPointOnLines(fromPt: Point2D; const lines: ArrayOfLine; var lineIdx: Integer): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.ClosestPointOnLines(Point2D fromPt, List<Line> lines, ref int lineIdx);",
             "public static Point2D SplashKit.ClosestPointOnLines(Point2D fromPt, List<Line> lines, ref int lineIdx);"
           ]
         }
@@ -16227,7 +16172,6 @@
             "function LineFrom(const start: Point2D; const endPt: Point2D): Line"
           ],
           "csharp": [
-            "public static Line Geometry.LineFrom(Point2D start, Point2D endPt);",
             "public static Line SplashKit.LineFrom(Point2D start, Point2D endPt);"
           ]
         }
@@ -16293,7 +16237,6 @@
             "function LineFrom(const start: Point2D; const offset: Vector2D): Line"
           ],
           "csharp": [
-            "public static Line Geometry.LineFrom(Point2D start, Vector2D offset);",
             "public static Line SplashKit.LineFrom(Point2D start, Vector2D offset);"
           ]
         }
@@ -16346,7 +16289,6 @@
             "function LineFrom(const v: Vector2D): Line"
           ],
           "csharp": [
-            "public static Line Geometry.LineFrom(Vector2D v);",
             "public static Line SplashKit.LineFrom(Vector2D v);"
           ]
         }
@@ -16437,7 +16379,6 @@
             "function LineFrom(x1: Double; y1: Double; x2: Double; y2: Double): Line"
           ],
           "csharp": [
-            "public static Line Geometry.LineFrom(double x1, double y1, double x2, double y2);",
             "public static Line SplashKit.LineFrom(double x1, double y1, double x2, double y2);"
           ]
         }
@@ -16515,7 +16456,6 @@
             "function LineIntersectionPoint(const line1: Line; const line2: Line; var pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.LineIntersectionPoint(Line line1, Line line2, ref Point2D pt);",
             "public static bool SplashKit.LineIntersectionPoint(Line line1, Line line2, ref Point2D pt);"
           ]
         }
@@ -16580,7 +16520,6 @@
             "function LineIntersectsCircle(const l: Line; const c: Circle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.LineIntersectsCircle(Line l, Circle c);",
             "public static bool SplashKit.LineIntersectsCircle(Line l, Circle c);"
           ]
         }
@@ -16645,7 +16584,6 @@
             "function LineIntersectsLines(const l: Line; const lines: ArrayOfLine): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.LineIntersectsLines(Line l, List<Line> lines);",
             "public static bool SplashKit.LineIntersectsLines(Line l, List<Line> lines);"
           ]
         }
@@ -16710,7 +16648,6 @@
             "function LineIntersectsRect(const l: Line; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.LineIntersectsRect(Line l, Rectangle rect);",
             "public static bool SplashKit.LineIntersectsRect(Line l, Rectangle rect);"
           ]
         }
@@ -16762,7 +16699,6 @@
             "function LineLength(const l: Line): Single"
           ],
           "csharp": [
-            "public static float Geometry.LineLength(Line l);",
             "public static float SplashKit.LineLength(Line l);"
           ]
         }
@@ -16814,7 +16750,6 @@
             "function LineLengthSquared(const l: Line): Single"
           ],
           "csharp": [
-            "public static float Geometry.LineLengthSquared(Line l);",
             "public static float SplashKit.LineLengthSquared(Line l);"
           ]
         }
@@ -16866,7 +16801,6 @@
             "function LineMidPoint(const l: Line): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.LineMidPoint(Line l);",
             "public static Point2D SplashKit.LineMidPoint(Line l);"
           ]
         }
@@ -16918,7 +16852,6 @@
             "function LineNormal(const l: Line): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Geometry.LineNormal(Line l);",
             "public static Vector2D SplashKit.LineNormal(Line l);"
           ]
         }
@@ -16970,7 +16903,6 @@
             "function LineToString(const ln: Line): String"
           ],
           "csharp": [
-            "public static string Geometry.LineToString(Line ln);",
             "public static string SplashKit.LineToString(Line ln);"
           ]
         }
@@ -17023,7 +16955,6 @@
             "function LinesFrom(const rect: Rectangle): ArrayOfLine"
           ],
           "csharp": [
-            "public static List<Line> Geometry.LinesFrom(Rectangle rect);",
             "public static List<Line> SplashKit.LinesFrom(Rectangle rect);"
           ]
         }
@@ -17076,7 +17007,6 @@
             "function LinesFrom(const t: Triangle): ArrayOfLine"
           ],
           "csharp": [
-            "public static List<Line> Geometry.LinesFrom(Triangle t);",
             "public static List<Line> SplashKit.LinesFrom(Triangle t);"
           ]
         }
@@ -17141,7 +17071,6 @@
             "function LinesIntersect(const l1: Line; const l2: Line): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.LinesIntersect(Line l1, Line l2);",
             "public static bool SplashKit.LinesIntersect(Line l1, Line l2);"
           ]
         }
@@ -17206,7 +17135,6 @@
             "function PointAt(x: Double; y: Double): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.PointAt(double x, double y);",
             "public static Point2D SplashKit.PointAt(double x, double y);"
           ]
         }
@@ -17245,7 +17173,6 @@
             "function PointAtOrigin(): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.PointAtOrigin();",
             "public static Point2D SplashKit.PointAtOrigin();"
           ]
         }
@@ -17310,7 +17237,6 @@
             "function PointInCircle(const pt: Point2D; const c: Circle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInCircle(Point2D pt, Circle c);",
             "public static bool SplashKit.PointInCircle(Point2D pt, Circle c);"
           ]
         }
@@ -17415,7 +17341,6 @@
             "function PointInCircle(ptx: Double; pty: Double; cx: Double; cy: Double; radius: Double): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInCircle(double ptx, double pty, double cx, double cy, double radius);",
             "public static bool SplashKit.PointInCircle(double ptx, double pty, double cx, double cy, double radius);"
           ]
         }
@@ -17480,7 +17405,6 @@
             "function PointInQuad(const pt: Point2D; const q: Quad): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInQuad(Point2D pt, Quad q);",
             "public static bool SplashKit.PointInQuad(Point2D pt, Quad q);"
           ]
         }
@@ -17545,7 +17469,6 @@
             "function PointInRectangle(const pt: Point2D; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInRectangle(Point2D pt, Rectangle rect);",
             "public static bool SplashKit.PointInRectangle(Point2D pt, Rectangle rect);"
           ]
         }
@@ -17663,7 +17586,6 @@
             "function PointInRectangle(ptx: Double; pty: Double; rectX: Double; rectY: Double; rectWidth: Double; rectHeight: Double): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInRectangle(double ptx, double pty, double rectX, double rectY, double rectWidth, double rectHeight);",
             "public static bool SplashKit.PointInRectangle(double ptx, double pty, double rectX, double rectY, double rectWidth, double rectHeight);"
           ]
         }
@@ -17728,7 +17650,6 @@
             "function PointInTriangle(const pt: Point2D; const tri: Triangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointInTriangle(Point2D pt, Triangle tri);",
             "public static bool SplashKit.PointInTriangle(Point2D pt, Triangle tri);"
           ]
         }
@@ -17793,7 +17714,6 @@
             "function PointLineDistance(const pt: Point2D; const l: Line): Single"
           ],
           "csharp": [
-            "public static float Geometry.PointLineDistance(Point2D pt, Line l);",
             "public static float SplashKit.PointLineDistance(Point2D pt, Line l);"
           ]
         }
@@ -17858,7 +17778,6 @@
             "function PointOffsetBy(const startPoint: Point2D; const offset: Vector2D): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.PointOffsetBy(Point2D startPoint, Vector2D offset);",
             "public static Point2D SplashKit.PointOffsetBy(Point2D startPoint, Vector2D offset);"
           ]
         }
@@ -17910,7 +17829,6 @@
             "function PointOffsetFromOrigin(const offset: Vector2D): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.PointOffsetFromOrigin(Vector2D offset);",
             "public static Point2D SplashKit.PointOffsetFromOrigin(Vector2D offset);"
           ]
         }
@@ -17975,7 +17893,6 @@
             "function PointOnLine(const pt: Point2D; const l: Line): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointOnLine(Point2D pt, Line l);",
             "public static bool SplashKit.PointOnLine(Point2D pt, Line l);"
           ]
         }
@@ -18054,7 +17971,6 @@
             "function PointOnLine(const pt: Point2D; const l: Line; proximity: Single): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.PointOnLine(Point2D pt, Line l, float proximity);",
             "public static bool SplashKit.PointOnLine(Point2D pt, Line l, float proximity);"
           ]
         }
@@ -18119,7 +18035,6 @@
             "function PointPointAngle(const pt1: Point2D; const pt2: Point2D): Single"
           ],
           "csharp": [
-            "public static float Geometry.PointPointAngle(Point2D pt1, Point2D pt2);",
             "public static float SplashKit.PointPointAngle(Point2D pt1, Point2D pt2);"
           ]
         }
@@ -18184,7 +18099,6 @@
             "function PointPointDistance(const pt1: Point2D; const pt2: Point2D): Single"
           ],
           "csharp": [
-            "public static float Geometry.PointPointDistance(Point2D pt1, Point2D pt2);",
             "public static float SplashKit.PointPointDistance(Point2D pt1, Point2D pt2);"
           ]
         }
@@ -18236,7 +18150,6 @@
             "function PointToString(const pt: Point2D): String"
           ],
           "csharp": [
-            "public static string Geometry.PointToString(Point2D pt);",
             "public static string SplashKit.PointToString(Point2D pt);"
           ]
         }
@@ -18288,7 +18201,6 @@
             "function RandomBitmapPoint(bmp: Bitmap): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.RandomBitmapPoint(Bitmap bmp);",
             "public static Point2D SplashKit.RandomBitmapPoint(Bitmap bmp);"
           ]
         }
@@ -18327,7 +18239,6 @@
             "function RandomScreenPoint(): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.RandomScreenPoint();",
             "public static Point2D SplashKit.RandomScreenPoint();"
           ]
         }
@@ -18379,7 +18290,6 @@
             "function RandomWindowPoint(wind: Window): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.RandomWindowPoint(Window wind);",
             "public static Point2D SplashKit.RandomWindowPoint(Window wind);"
           ]
         }
@@ -18444,7 +18354,6 @@
             "function SamePoint(const pt1: Point2D; const pt2: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.SamePoint(Point2D pt1, Point2D pt2);",
             "public static bool SplashKit.SamePoint(Point2D pt1, Point2D pt2);"
           ]
         }
@@ -18536,7 +18445,6 @@
             "function QuadFrom(const p1: Point2D; const p2: Point2D; const p3: Point2D; const p4: Point2D): Quad"
           ],
           "csharp": [
-            "public static Quad Geometry.QuadFrom(Point2D p1, Point2D p2, Point2D p3, Point2D p4);",
             "public static Quad SplashKit.QuadFrom(Point2D p1, Point2D p2, Point2D p3, Point2D p4);"
           ]
         }
@@ -18589,7 +18497,6 @@
             "function QuadFrom(const rect: Rectangle): Quad"
           ],
           "csharp": [
-            "public static Quad Geometry.QuadFrom(Rectangle rect);",
             "public static Quad SplashKit.QuadFrom(Rectangle rect);"
           ]
         }
@@ -18655,7 +18562,6 @@
             "function QuadFrom(const rect: Rectangle; const transform: Matrix2D): Quad"
           ],
           "csharp": [
-            "public static Quad Geometry.QuadFrom(Rectangle rect, Matrix2D transform);",
             "public static Quad SplashKit.QuadFrom(Rectangle rect, Matrix2D transform);"
           ]
         }
@@ -18798,7 +18704,6 @@
             "function QuadFrom(xTopLeft: Double; yTopLeft: Double; xTopRight: Double; yTopRight: Double; xBottomLeft: Double; yBottomLeft: Double; xBottomRight: Double; yBottomRight: Double): Quad"
           ],
           "csharp": [
-            "public static Quad Geometry.QuadFrom(double xTopLeft, double yTopLeft, double xTopRight, double yTopRight, double xBottomLeft, double yBottomLeft, double xBottomRight, double yBottomRight);",
             "public static Quad SplashKit.QuadFrom(double xTopLeft, double yTopLeft, double xTopRight, double yTopRight, double xBottomLeft, double yBottomLeft, double xBottomRight, double yBottomRight);"
           ]
         }
@@ -18863,7 +18768,6 @@
             "function QuadsIntersect(const q1: Quad; const q2: Quad): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.QuadsIntersect(Quad q1, Quad q2);",
             "public static bool SplashKit.QuadsIntersect(Quad q1, Quad q2);"
           ]
         }
@@ -18941,7 +18845,6 @@
             "procedure SetQuadPoint(var q: Quad; idx: Integer; const value: Point2D)"
           ],
           "csharp": [
-            "public static void Geometry.SetQuadPoint(ref Quad q, int idx, Point2D value);",
             "public static void SplashKit.SetQuadPoint(ref Quad q, int idx, Point2D value);"
           ]
         }
@@ -18993,7 +18896,6 @@
             "function TrianglesFrom(const q: Quad): ArrayOfTriangle"
           ],
           "csharp": [
-            "public static List<Triangle> Geometry.TrianglesFrom(Quad q);",
             "public static List<Triangle> SplashKit.TrianglesFrom(Quad q);"
           ]
         }
@@ -19058,7 +18960,6 @@
             "function InsetRectangle(const rect: Rectangle; insetAmount: Single): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.InsetRectangle(Rectangle rect, float insetAmount);",
             "public static Rectangle SplashKit.InsetRectangle(Rectangle rect, float insetAmount);"
           ]
         }
@@ -19123,7 +19024,6 @@
             "function Intersection(const rect1: Rectangle; const rect2: Rectangle): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.Intersection(Rectangle rect1, Rectangle rect2);",
             "public static Rectangle SplashKit.Intersection(Rectangle rect1, Rectangle rect2);"
           ]
         }
@@ -19176,7 +19076,6 @@
             "function RectangleAround(const c: Circle): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleAround(Circle c);",
             "public static Rectangle SplashKit.RectangleAround(Circle c);"
           ]
         }
@@ -19229,7 +19128,6 @@
             "function RectangleAround(const l: Line): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleAround(Line l);",
             "public static Rectangle SplashKit.RectangleAround(Line l);"
           ]
         }
@@ -19282,7 +19180,6 @@
             "function RectangleAround(const q: Quad): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleAround(Quad q);",
             "public static Rectangle SplashKit.RectangleAround(Quad q);"
           ]
         }
@@ -19335,7 +19232,6 @@
             "function RectangleAround(const t: Triangle): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleAround(Triangle t);",
             "public static Rectangle SplashKit.RectangleAround(Triangle t);"
           ]
         }
@@ -19387,7 +19283,6 @@
             "function RectangleBottom(const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Geometry.RectangleBottom(Rectangle rect);",
             "public static float SplashKit.RectangleBottom(Rectangle rect);"
           ]
         }
@@ -19439,7 +19334,6 @@
             "function RectangleCenter(const rect: Rectangle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.RectangleCenter(Rectangle rect);",
             "public static Point2D SplashKit.RectangleCenter(Rectangle rect);"
           ]
         }
@@ -19518,7 +19412,6 @@
             "function RectangleFrom(pt: Point2D; width: Double; height: Double): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleFrom(Point2D pt, double width, double height);",
             "public static Rectangle SplashKit.RectangleFrom(Point2D pt, double width, double height);"
           ]
         }
@@ -19584,7 +19477,6 @@
             "function RectangleFrom(pt1: Point2D; pt2: Point2D): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleFrom(Point2D pt1, Point2D pt2);",
             "public static Rectangle SplashKit.RectangleFrom(Point2D pt1, Point2D pt2);"
           ]
         }
@@ -19675,7 +19567,6 @@
             "function RectangleFrom(x: Double; y: Double; width: Double; height: Double): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleFrom(double x, double y, double width, double height);",
             "public static Rectangle SplashKit.RectangleFrom(double x, double y, double width, double height);"
           ]
         }
@@ -19727,7 +19618,6 @@
             "function RectangleLeft(const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Geometry.RectangleLeft(Rectangle rect);",
             "public static float SplashKit.RectangleLeft(Rectangle rect);"
           ]
         }
@@ -19792,7 +19682,6 @@
             "function RectangleOffsetBy(const rect: Rectangle; const offset: Vector2D): Rectangle"
           ],
           "csharp": [
-            "public static Rectangle Geometry.RectangleOffsetBy(Rectangle rect, Vector2D offset);",
             "public static Rectangle SplashKit.RectangleOffsetBy(Rectangle rect, Vector2D offset);"
           ]
         }
@@ -19844,7 +19733,6 @@
             "function RectangleRight(const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Geometry.RectangleRight(Rectangle rect);",
             "public static float SplashKit.RectangleRight(Rectangle rect);"
           ]
         }
@@ -19896,7 +19784,6 @@
             "function RectangleToString(const rect: Rectangle): String"
           ],
           "csharp": [
-            "public static string Geometry.RectangleToString(Rectangle rect);",
             "public static string SplashKit.RectangleToString(Rectangle rect);"
           ]
         }
@@ -19948,7 +19835,6 @@
             "function RectangleTop(const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Geometry.RectangleTop(Rectangle rect);",
             "public static float SplashKit.RectangleTop(Rectangle rect);"
           ]
         }
@@ -20013,7 +19899,6 @@
             "function RectanglesIntersect(const rect1: Rectangle; const rect2: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.RectanglesIntersect(Rectangle rect1, Rectangle rect2);",
             "public static bool SplashKit.RectanglesIntersect(Rectangle rect1, Rectangle rect2);"
           ]
         }
@@ -20065,7 +19950,6 @@
             "function TriangleBarycenter(const tri: Triangle): Point2D"
           ],
           "csharp": [
-            "public static Point2D Geometry.TriangleBarycenter(Triangle tri);",
             "public static Point2D SplashKit.TriangleBarycenter(Triangle tri);"
           ]
         }
@@ -20143,7 +20027,6 @@
             "function TriangleFrom(const p1: Point2D; const p2: Point2D; const p3: Point2D): Triangle"
           ],
           "csharp": [
-            "public static Triangle Geometry.TriangleFrom(Point2D p1, Point2D p2, Point2D p3);",
             "public static Triangle SplashKit.TriangleFrom(Point2D p1, Point2D p2, Point2D p3);"
           ]
         }
@@ -20261,7 +20144,6 @@
             "function TriangleFrom(x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double): Triangle"
           ],
           "csharp": [
-            "public static Triangle Geometry.TriangleFrom(double x1, double y1, double x2, double y2, double x3, double y3);",
             "public static Triangle SplashKit.TriangleFrom(double x1, double y1, double x2, double y2, double x3, double y3);"
           ]
         }
@@ -20326,7 +20208,6 @@
             "function TriangleRectangleIntersect(const tri: Triangle; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.TriangleRectangleIntersect(Triangle tri, Rectangle rect);",
             "public static bool SplashKit.TriangleRectangleIntersect(Triangle tri, Rectangle rect);"
           ]
         }
@@ -20378,7 +20259,6 @@
             "function TriangleToString(const tri: Triangle): String"
           ],
           "csharp": [
-            "public static string Geometry.TriangleToString(Triangle tri);",
             "public static string SplashKit.TriangleToString(Triangle tri);"
           ]
         }
@@ -20443,7 +20323,6 @@
             "function TrianglesIntersect(const t1: Triangle; const t2: Triangle): Boolean"
           ],
           "csharp": [
-            "public static bool Geometry.TrianglesIntersect(Triangle t1, Triangle t2);",
             "public static bool SplashKit.TrianglesIntersect(Triangle t1, Triangle t2);"
           ]
         }
@@ -20529,7 +20408,7 @@
             "procedure DrawCircle(clr: Color; const c: Circle)"
           ],
           "csharp": [
-            "public void Circle.DrawCircle(Color clr);",
+            "public void Circle.Draw(Color clr);",
             "public static void SplashKit.DrawCircle(Color clr, Circle c);"
           ]
         }
@@ -20610,7 +20489,7 @@
             "procedure DrawCircle(clr: Color; const c: Circle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Circle.DrawCircle(Color clr, DrawingOptions opts);",
+            "public void Circle.Draw(Color clr, DrawingOptions opts);",
             "public static void SplashKit.DrawCircle(Color clr, Circle c, DrawingOptions opts);"
           ]
         }
@@ -20908,7 +20787,7 @@
             "procedure DrawCircleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; radius: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawCircleOnBitmap(Color clr, double x, double y, double radius);",
+            "public void Bitmap.DrawCircle(Color clr, double x, double y, double radius);",
             "public static void SplashKit.DrawCircleOnBitmap(Bitmap destination, Color clr, double x, double y, double radius);"
           ]
         }
@@ -21028,7 +20907,7 @@
             "procedure DrawCircleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; radius: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawCircleOnBitmap(Color clr, double x, double y, double radius, DrawingOptions opts);",
+            "public void Bitmap.DrawCircle(Color clr, double x, double y, double radius, DrawingOptions opts);",
             "public static void SplashKit.DrawCircleOnBitmap(Bitmap destination, Color clr, double x, double y, double radius, DrawingOptions opts);"
           ]
         }
@@ -21134,7 +21013,7 @@
             "procedure DrawCircleOnWindow(destination: Window; clr: Color; x: Double; y: Double; radius: Double)"
           ],
           "csharp": [
-            "public void Window.DrawCircleOnWindow(Color clr, double x, double y, double radius);",
+            "public void Window.DrawCircle(Color clr, double x, double y, double radius);",
             "public static void SplashKit.DrawCircleOnWindow(Window destination, Color clr, double x, double y, double radius);"
           ]
         }
@@ -21254,7 +21133,7 @@
             "procedure DrawCircleOnWindow(destination: Window; clr: Color; x: Double; y: Double; radius: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawCircleOnWindow(Color clr, double x, double y, double radius, DrawingOptions opts);",
+            "public void Window.DrawCircle(Color clr, double x, double y, double radius, DrawingOptions opts);",
             "public static void SplashKit.DrawCircleOnWindow(Window destination, Color clr, double x, double y, double radius, DrawingOptions opts);"
           ]
         }
@@ -21322,7 +21201,7 @@
             "procedure FillCircle(clr: Color; const c: Circle)"
           ],
           "csharp": [
-            "public void Circle.FillCircle(Color clr);",
+            "public void Circle.Fill(Color clr);",
             "public static void SplashKit.FillCircle(Color clr, Circle c);"
           ]
         }
@@ -21403,7 +21282,7 @@
             "procedure FillCircle(clr: Color; const c: Circle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Circle.FillCircle(Color clr, DrawingOptions opts);",
+            "public void Circle.Fill(Color clr, DrawingOptions opts);",
             "public static void SplashKit.FillCircle(Color clr, Circle c, DrawingOptions opts);"
           ]
         }
@@ -21701,7 +21580,7 @@
             "procedure FillCircleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; radius: Double)"
           ],
           "csharp": [
-            "public void Bitmap.FillCircleOnBitmap(Color clr, double x, double y, double radius);",
+            "public void Bitmap.FillCircle(Color clr, double x, double y, double radius);",
             "public static void SplashKit.FillCircleOnBitmap(Bitmap destination, Color clr, double x, double y, double radius);"
           ]
         }
@@ -21821,7 +21700,7 @@
             "procedure FillCircleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; radius: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillCircleOnBitmap(Color clr, double x, double y, double radius, DrawingOptions opts);",
+            "public void Bitmap.FillCircle(Color clr, double x, double y, double radius, DrawingOptions opts);",
             "public static void SplashKit.FillCircleOnBitmap(Bitmap destination, Color clr, double x, double y, double radius, DrawingOptions opts);"
           ]
         }
@@ -21927,7 +21806,7 @@
             "procedure FillCircleOnWindow(destination: Window; clr: Color; x: Double; y: Double; radius: Double)"
           ],
           "csharp": [
-            "public void Window.FillCircleOnWindow(Color clr, double x, double y, double radius);",
+            "public void Window.FillCircle(Color clr, double x, double y, double radius);",
             "public static void SplashKit.FillCircleOnWindow(Window destination, Color clr, double x, double y, double radius);"
           ]
         }
@@ -22047,7 +21926,7 @@
             "procedure FillCircleOnWindow(destination: Window; clr: Color; x: Double; y: Double; radius: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillCircleOnWindow(Color clr, double x, double y, double radius, DrawingOptions opts);",
+            "public void Window.FillCircle(Color clr, double x, double y, double radius, DrawingOptions opts);",
             "public static void SplashKit.FillCircleOnWindow(Window destination, Color clr, double x, double y, double radius, DrawingOptions opts);"
           ]
         }
@@ -25037,7 +24916,7 @@
             "procedure DrawEllipseOnBitmap(destination: Bitmap; clr: Color; rect: Rectangle)"
           ],
           "csharp": [
-            "public void Bitmap.DrawEllipseOnBitmap(Color clr, Rectangle rect);",
+            "public void Bitmap.DrawEllipse(Color clr, Rectangle rect);",
             "public static void SplashKit.DrawEllipseOnBitmap(Bitmap destination, Color clr, Rectangle rect);"
           ]
         }
@@ -25131,7 +25010,7 @@
             "procedure DrawEllipseOnBitmap(destination: Bitmap; clr: Color; rect: Rectangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawEllipseOnBitmap(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Bitmap.DrawEllipse(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.DrawEllipseOnBitmap(Bitmap destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -25250,7 +25129,7 @@
             "procedure DrawEllipseOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawEllipseOnBitmap(Color clr, double x, double y, double width, double height);",
+            "public void Bitmap.DrawEllipse(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.DrawEllipseOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -25383,7 +25262,7 @@
             "procedure DrawEllipseOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawEllipseOnBitmap(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Bitmap.DrawEllipse(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.DrawEllipseOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -25464,7 +25343,7 @@
             "procedure DrawEllipseOnWindow(destination: Window; clr: Color; rect: Rectangle)"
           ],
           "csharp": [
-            "public void Window.DrawEllipseOnWindow(Color clr, Rectangle rect);",
+            "public void Window.DrawEllipse(Color clr, Rectangle rect);",
             "public static void SplashKit.DrawEllipseOnWindow(Window destination, Color clr, Rectangle rect);"
           ]
         }
@@ -25558,7 +25437,7 @@
             "procedure DrawEllipseOnWindow(destination: Window; clr: Color; rect: Rectangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawEllipseOnWindow(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Window.DrawEllipse(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.DrawEllipseOnWindow(Window destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -25677,7 +25556,7 @@
             "procedure DrawEllipseOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Window.DrawEllipseOnWindow(Color clr, double x, double y, double width, double height);",
+            "public void Window.DrawEllipse(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.DrawEllipseOnWindow(Window destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -25810,7 +25689,7 @@
             "procedure DrawEllipseOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawEllipseOnWindow(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Window.DrawEllipse(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.DrawEllipseOnWindow(Window destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -26250,7 +26129,7 @@
             "procedure FillEllipseOnBitmap(destination: Bitmap; clr: Color; rect: Rectangle)"
           ],
           "csharp": [
-            "public void Bitmap.FillEllipseOnBitmap(Color clr, Rectangle rect);",
+            "public void Bitmap.FillEllipse(Color clr, Rectangle rect);",
             "public static void SplashKit.FillEllipseOnBitmap(Bitmap destination, Color clr, Rectangle rect);"
           ]
         }
@@ -26344,7 +26223,7 @@
             "procedure FillEllipseOnBitmap(destination: Bitmap; clr: Color; rect: Rectangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillEllipseOnBitmap(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Bitmap.FillEllipse(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.FillEllipseOnBitmap(Bitmap destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -26463,7 +26342,7 @@
             "procedure FillEllipseOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Bitmap.FillEllipseOnBitmap(Color clr, double x, double y, double width, double height);",
+            "public void Bitmap.FillEllipse(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.FillEllipseOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -26596,7 +26475,7 @@
             "procedure FillEllipseOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillEllipseOnBitmap(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Bitmap.FillEllipse(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.FillEllipseOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -26677,7 +26556,7 @@
             "procedure FillEllipseOnWindow(destination: Window; clr: Color; rect: Rectangle)"
           ],
           "csharp": [
-            "public void Window.FillEllipseOnWindow(Color clr, Rectangle rect);",
+            "public void Window.FillEllipse(Color clr, Rectangle rect);",
             "public static void SplashKit.FillEllipseOnWindow(Window destination, Color clr, Rectangle rect);"
           ]
         }
@@ -26771,7 +26650,7 @@
             "procedure FillEllipseOnWindow(destination: Window; clr: Color; rect: Rectangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillEllipseOnWindow(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Window.FillEllipse(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.FillEllipseOnWindow(Window destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -26890,7 +26769,7 @@
             "procedure FillEllipseOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Window.FillEllipseOnWindow(Color clr, double x, double y, double width, double height);",
+            "public void Window.FillEllipse(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.FillEllipseOnWindow(Window destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -27023,7 +26902,7 @@
             "procedure FillEllipseOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillEllipseOnWindow(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Window.FillEllipse(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.FillEllipseOnWindow(Window destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -27875,7 +27754,7 @@
             "function BitmapBoundingCircle(bmp: Bitmap; const pt: Point2D): Circle"
           ],
           "csharp": [
-            "public Circle Bitmap.BitmapBoundingCircle(Point2D pt);",
+            "public Circle Bitmap.BoundingCircle(Point2D pt);",
             "public static Circle SplashKit.BitmapBoundingCircle(Bitmap bmp, Point2D pt);"
           ]
         }
@@ -27930,7 +27809,7 @@
             "function BitmapBoundingRectangle(bmp: Bitmap): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Bitmap.BitmapBoundingRectangle();",
+            "public Rectangle Bitmap.BoundingRectangle();",
             "public static Rectangle SplashKit.BitmapBoundingRectangle(Bitmap bmp);"
           ]
         }
@@ -28012,7 +27891,7 @@
             "function BitmapBoundingRectangle(bmp: Bitmap; x: Double; y: Double): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Bitmap.BitmapBoundingRectangle(double x, double y);",
+            "public Rectangle Bitmap.BoundingRectangle(double x, double y);",
             "public static Rectangle SplashKit.BitmapBoundingRectangle(Bitmap bmp, double x, double y);"
           ]
         }
@@ -28148,7 +28027,7 @@
             "function BitmapCellCircle(bmp: Bitmap; x: Double; y: Double): Circle"
           ],
           "csharp": [
-            "public Circle Bitmap.BitmapCellCircle(double x, double y);",
+            "public Circle Bitmap.CellCircle(double x, double y);",
             "public static Circle SplashKit.BitmapCellCircle(Bitmap bmp, double x, double y);"
           ]
         }
@@ -28217,7 +28096,7 @@
             "function BitmapCellCircle(bmp: Bitmap; pt: Point2D): Circle"
           ],
           "csharp": [
-            "public Circle Bitmap.BitmapCellCircle(Point2D pt);",
+            "public Circle Bitmap.CellCircle(Point2D pt);",
             "public static Circle SplashKit.BitmapCellCircle(Bitmap bmp, Point2D pt);"
           ]
         }
@@ -28299,7 +28178,7 @@
             "function BitmapCellCircle(bmp: Bitmap; pt: Point2D; scale: Double): Circle"
           ],
           "csharp": [
-            "public Circle Bitmap.BitmapCellCircle(Point2D pt, double scale);",
+            "public Circle Bitmap.CellCircle(Point2D pt, double scale);",
             "public static Circle SplashKit.BitmapCellCircle(Bitmap bmp, Point2D pt, double scale);"
           ]
         }
@@ -28532,7 +28411,7 @@
             "function BitmapCellOffset(src: Bitmap; cell: Integer): Vector2D"
           ],
           "csharp": [
-            "public Vector2D Bitmap.BitmapCellOffset(int cell);",
+            "public Vector2D Bitmap.CellOffset(int cell);",
             "public static Vector2D SplashKit.BitmapCellOffset(Bitmap src, int cell);"
           ]
         }
@@ -28587,7 +28466,7 @@
             "function BitmapCellRectangle(src: Bitmap): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Bitmap.BitmapCellRectangle();",
+            "public Rectangle Bitmap.CellRectangle();",
             "public static Rectangle SplashKit.BitmapCellRectangle(Bitmap src);"
           ]
         }
@@ -28656,7 +28535,7 @@
             "function BitmapCellRectangle(src: Bitmap; const pt: Point2D): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Bitmap.BitmapCellRectangle(Point2D pt);",
+            "public Rectangle Bitmap.CellRectangle(Point2D pt);",
             "public static Rectangle SplashKit.BitmapCellRectangle(Bitmap src, Point2D pt);"
           ]
         }
@@ -28984,7 +28863,6 @@
             "function BitmapHeight(name: String): Integer"
           ],
           "csharp": [
-            "public static int Images.BitmapHeight(string name);",
             "public static int SplashKit.BitmapHeight(string name);"
           ]
         }
@@ -29091,7 +28969,6 @@
             "function BitmapNamed(name: String): Bitmap"
           ],
           "csharp": [
-            "public static Bitmap Images.BitmapNamed(string name);",
             "public static Bitmap SplashKit.BitmapNamed(string name);"
           ]
         }
@@ -29159,7 +29036,7 @@
             "function BitmapRectangleOfCell(src: Bitmap; cell: Integer): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Bitmap.BitmapRectangleOfCell(int cell);",
+            "public Rectangle Bitmap.RectangleOfCell(int cell);",
             "public static Rectangle SplashKit.BitmapRectangleOfCell(Bitmap src, int cell);"
           ]
         }
@@ -29279,7 +29156,7 @@
             "procedure BitmapSetCellDetails(bmp: Bitmap; width: Integer; height: Integer; columns: Integer; rows: Integer; count: Integer)"
           ],
           "csharp": [
-            "public void Bitmap.BitmapSetCellDetails(int width, int height, int columns, int rows, int count);",
+            "public void Bitmap.SetCellDetails(int width, int height, int columns, int rows, int count);",
             "public static void SplashKit.BitmapSetCellDetails(Bitmap bmp, int width, int height, int columns, int rows, int count);"
           ]
         }
@@ -29331,7 +29208,6 @@
             "function BitmapValid(bmp: Bitmap): Boolean"
           ],
           "csharp": [
-            "public static bool Images.BitmapValid(Bitmap bmp);",
             "public static bool SplashKit.BitmapValid(Bitmap bmp);"
           ]
         }
@@ -29439,7 +29315,6 @@
             "function BitmapWidth(name: String): Integer"
           ],
           "csharp": [
-            "public static int Images.BitmapWidth(string name);",
             "public static int SplashKit.BitmapWidth(string name);"
           ]
         }
@@ -29507,7 +29382,7 @@
             "procedure ClearBitmap(bmp: Bitmap; clr: Color)"
           ],
           "csharp": [
-            "public void Bitmap.ClearBitmap(Color clr);",
+            "public void Bitmap.Clear(Color clr);",
             "public static void SplashKit.ClearBitmap(Bitmap bmp, Color clr);"
           ]
         }
@@ -29573,7 +29448,6 @@
             "procedure ClearBitmap(name: String; clr: Color)"
           ],
           "csharp": [
-            "public static void Images.ClearBitmap(string name, Color clr);",
             "public static void SplashKit.ClearBitmap(string name, Color clr);"
           ]
         }
@@ -29734,7 +29608,7 @@
             "procedure DrawBitmap(bmp: Bitmap; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawBitmap(double x, double y);",
+            "public void Bitmap.Draw(double x, double y);",
             "public static void SplashKit.DrawBitmap(Bitmap bmp, double x, double y);"
           ]
         }
@@ -29829,7 +29703,7 @@
             "procedure DrawBitmap(bmp: Bitmap; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawBitmap(double x, double y, DrawingOptions opts);",
+            "public void Bitmap.Draw(double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawBitmap(Bitmap bmp, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -29908,7 +29782,6 @@
             "procedure DrawBitmap(name: String; x: Double; y: Double)"
           ],
           "csharp": [
-            "public static void Images.DrawBitmap(string name, double x, double y);",
             "public static void SplashKit.DrawBitmap(string name, double x, double y);"
           ]
         }
@@ -30000,7 +29873,6 @@
             "procedure DrawBitmap(name: String; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public static void Images.DrawBitmap(string name, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawBitmap(string name, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -30095,7 +29967,7 @@
             "procedure DrawBitmapOnBitmap(destination: Bitmap; bmp: Bitmap; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawBitmapOnBitmap(Bitmap destination, double x, double y);",
+            "public void Bitmap.DrawBitmap(Bitmap destination, double x, double y);",
             "public static void SplashKit.DrawBitmapOnBitmap(Bitmap destination, Bitmap bmp, double x, double y);"
           ]
         }
@@ -30203,7 +30075,7 @@
             "procedure DrawBitmapOnBitmap(destination: Bitmap; bmp: Bitmap; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawBitmapOnBitmap(Bitmap destination, double x, double y, DrawingOptions opts);",
+            "public void Bitmap.DrawBitmap(Bitmap destination, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawBitmapOnBitmap(Bitmap destination, Bitmap bmp, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -30297,7 +30169,7 @@
             "procedure DrawBitmapOnWindow(destination: Window; bmp: Bitmap; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Window.DrawBitmapOnWindow(Bitmap bmp, double x, double y);",
+            "public void Window.DrawBitmap(Bitmap bmp, double x, double y);",
             "public static void SplashKit.DrawBitmapOnWindow(Window destination, Bitmap bmp, double x, double y);"
           ]
         }
@@ -30405,7 +30277,7 @@
             "procedure DrawBitmapOnWindow(destination: Window; bmp: Bitmap; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawBitmapOnWindow(Bitmap bmp, double x, double y, DrawingOptions opts);",
+            "public void Window.DrawBitmap(Bitmap bmp, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawBitmapOnWindow(Window destination, Bitmap bmp, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -30444,7 +30316,6 @@
             "procedure FreeAllBitmaps()"
           ],
           "csharp": [
-            "public static void Images.FreeAllBitmaps();",
             "public static void SplashKit.FreeAllBitmaps();"
           ]
         }
@@ -30500,7 +30371,7 @@
             "procedure FreeBitmap(toDelete: Bitmap)"
           ],
           "csharp": [
-            "public void Bitmap.FreeBitmap();",
+            "public void Bitmap.Free();",
             "public static void SplashKit.FreeBitmap(Bitmap toDelete);"
           ]
         }
@@ -30552,7 +30423,6 @@
             "function HasBitmap(name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Images.HasBitmap(string name);",
             "public static bool SplashKit.HasBitmap(string name);"
           ]
         }
@@ -30851,7 +30721,7 @@
             "function PixelDrawnAtPoint(bmp: Bitmap; cell: Integer; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.PixelDrawnAtPoint(int cell, Point2D pt);",
+            "public bool Bitmap.PixelDrawnAtPointInCell(int cell, Point2D pt);",
             "public static bool SplashKit.PixelDrawnAtPoint(Bitmap bmp, int cell, Point2D pt);"
           ]
         }
@@ -31608,7 +31478,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; const l: Line)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, Line l);",
+            "public void Bitmap.DrawLine(Color clr, Line l);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, Line l);"
           ]
         }
@@ -31702,7 +31572,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; const l: Line; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, Line l, DrawingOptions opts);",
+            "public void Bitmap.DrawLine(Color clr, Line l, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, Line l, DrawingOptions opts);"
           ]
         }
@@ -31796,7 +31666,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; const fromPt: Point2D; const toPt: Point2D)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, Point2D fromPt, Point2D toPt);",
+            "public void Bitmap.DrawLine(Color clr, Point2D fromPt, Point2D toPt);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, Point2D fromPt, Point2D toPt);"
           ]
         }
@@ -31903,7 +31773,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; const fromPt: Point2D; const toPt: Point2D; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);",
+            "public void Bitmap.DrawLine(Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);"
           ]
         }
@@ -32022,7 +31892,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, double x1, double y1, double x2, double y2);",
+            "public void Bitmap.DrawLine(Color clr, double x1, double y1, double x2, double y2);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2);"
           ]
         }
@@ -32155,7 +32025,7 @@
             "procedure DrawLineOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawLineOnBitmap(Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);",
+            "public void Bitmap.DrawLine(Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);"
           ]
         }
@@ -32236,7 +32106,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; const l: Line)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, Line l);",
+            "public void Window.DrawLine(Color clr, Line l);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, Line l);"
           ]
         }
@@ -32330,7 +32200,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; const l: Line; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, Line l, DrawingOptions opts);",
+            "public void Window.DrawLine(Color clr, Line l, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, Line l, DrawingOptions opts);"
           ]
         }
@@ -32424,7 +32294,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; const fromPt: Point2D; const toPt: Point2D)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, Point2D fromPt, Point2D toPt);",
+            "public void Window.DrawLine(Color clr, Point2D fromPt, Point2D toPt);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, Point2D fromPt, Point2D toPt);"
           ]
         }
@@ -32531,7 +32401,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; const fromPt: Point2D; const toPt: Point2D; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);",
+            "public void Window.DrawLine(Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, Point2D fromPt, Point2D toPt, DrawingOptions opts);"
           ]
         }
@@ -32650,7 +32520,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, double x1, double y1, double x2, double y2);",
+            "public void Window.DrawLine(Color clr, double x1, double y1, double x2, double y2);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2);"
           ]
         }
@@ -32783,7 +32653,7 @@
             "procedure DrawLineOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawLineOnWindow(Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);",
+            "public void Window.DrawLine(Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);",
             "public static void SplashKit.DrawLineOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2, DrawingOptions opts);"
           ]
         }
@@ -33171,7 +33041,7 @@
             "procedure DrawPixelOnBitmap(destination: Bitmap; clr: Color; const pt: Point2D)"
           ],
           "csharp": [
-            "public void Bitmap.DrawPixelOnBitmap(Color clr, Point2D pt);",
+            "public void Bitmap.DrawPixel(Color clr, Point2D pt);",
             "public static void SplashKit.DrawPixelOnBitmap(Bitmap destination, Color clr, Point2D pt);"
           ]
         }
@@ -33265,7 +33135,7 @@
             "procedure DrawPixelOnBitmap(destination: Bitmap; clr: Color; const pt: Point2D; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawPixelOnBitmap(Color clr, Point2D pt, DrawingOptions opts);",
+            "public void Bitmap.DrawPixel(Color clr, Point2D pt, DrawingOptions opts);",
             "public static void SplashKit.DrawPixelOnBitmap(Bitmap destination, Color clr, Point2D pt, DrawingOptions opts);"
           ]
         }
@@ -33358,7 +33228,7 @@
             "procedure DrawPixelOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawPixelOnBitmap(Color clr, double x, double y);",
+            "public void Bitmap.DrawPixel(Color clr, double x, double y);",
             "public static void SplashKit.DrawPixelOnBitmap(Bitmap destination, Color clr, double x, double y);"
           ]
         }
@@ -33465,7 +33335,7 @@
             "procedure DrawPixelOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawPixelOnBitmap(Color clr, double x, double y, DrawingOptions opts);",
+            "public void Bitmap.DrawPixel(Color clr, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawPixelOnBitmap(Bitmap destination, Color clr, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -33544,7 +33414,6 @@
             "procedure DrawPixelOnWindow(destination: Window; clr: Color; const pt: Point2D)"
           ],
           "csharp": [
-            "public void Window.DrawPixelOnWindow(Window destination, Color clr, Point2D pt);",
             "public static void SplashKit.DrawPixelOnWindow(Window destination, Color clr, Point2D pt);"
           ]
         }
@@ -33636,7 +33505,6 @@
             "procedure DrawPixelOnWindow(destination: Window; clr: Color; const pt: Point2D; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawPixelOnWindow(Window destination, Color clr, Point2D pt, DrawingOptions opts);",
             "public static void SplashKit.DrawPixelOnWindow(Window destination, Color clr, Point2D pt, DrawingOptions opts);"
           ]
         }
@@ -33727,7 +33595,6 @@
             "procedure DrawPixelOnWindow(destination: Window; clr: Color; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Window.DrawPixelOnWindow(Window destination, Color clr, double x, double y);",
             "public static void SplashKit.DrawPixelOnWindow(Window destination, Color clr, double x, double y);"
           ]
         }
@@ -33832,7 +33699,6 @@
             "procedure DrawPixelOnWindow(destination: Window; clr: Color; x: Double; y: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawPixelOnWindow(Window destination, Color clr, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawPixelOnWindow(Window destination, Color clr, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -34371,7 +34237,6 @@
             "function GetPixelFromWindow(destination: Window; x: Double; y: Double): Color"
           ],
           "csharp": [
-            "public Color Window.GetPixelFromWindow(Window destination, double x, double y);",
             "public static Color SplashKit.GetPixelFromWindow(Window destination, double x, double y);"
           ]
         }
@@ -34591,7 +34456,7 @@
             "procedure DrawQuadOnBitmap(destination: Bitmap; clr: Color; const q: Quad)"
           ],
           "csharp": [
-            "public void Bitmap.DrawQuadOnBitmap(Color clr, Quad q);",
+            "public void Bitmap.DrawQuad(Color clr, Quad q);",
             "public static void SplashKit.DrawQuadOnBitmap(Bitmap destination, Color clr, Quad q);"
           ]
         }
@@ -34685,7 +34550,7 @@
             "procedure DrawQuadOnBitmap(destination: Bitmap; clr: Color; const q: Quad; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawQuadOnBitmap(Color clr, Quad q, DrawingOptions opts);",
+            "public void Bitmap.DrawQuad(Color clr, Quad q, DrawingOptions opts);",
             "public static void SplashKit.DrawQuadOnBitmap(Bitmap destination, Color clr, Quad q, DrawingOptions opts);"
           ]
         }
@@ -34765,7 +34630,7 @@
             "procedure DrawQuadOnWindow(destination: Window; clr: Color; const q: Quad)"
           ],
           "csharp": [
-            "public void Window.DrawQuadOnWindow(Color clr, Quad q);",
+            "public void Window.DrawQuad(Color clr, Quad q);",
             "public static void SplashKit.DrawQuadOnWindow(Window destination, Color clr, Quad q);"
           ]
         }
@@ -34859,7 +34724,7 @@
             "procedure DrawQuadOnWindow(destination: Window; clr: Color; const q: Quad; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawQuadOnWindow(Color clr, Quad q, DrawingOptions opts);",
+            "public void Window.DrawQuad(Color clr, Quad q, DrawingOptions opts);",
             "public static void SplashKit.DrawQuadOnWindow(Window destination, Color clr, Quad q, DrawingOptions opts);"
           ]
         }
@@ -35299,7 +35164,7 @@
             "procedure DrawRectangleOnBitmap(destination: Bitmap; clr: Color; const rect: Rectangle)"
           ],
           "csharp": [
-            "public void Bitmap.DrawRectangleOnBitmap(Color clr, Rectangle rect);",
+            "public void Bitmap.DrawRectangle(Color clr, Rectangle rect);",
             "public static void SplashKit.DrawRectangleOnBitmap(Bitmap destination, Color clr, Rectangle rect);"
           ]
         }
@@ -35393,7 +35258,7 @@
             "procedure DrawRectangleOnBitmap(destination: Bitmap; clr: Color; const rect: Rectangle; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawRectangleOnBitmap(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Bitmap.DrawRectangle(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.DrawRectangleOnBitmap(Bitmap destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -35512,7 +35377,7 @@
             "procedure DrawRectangleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawRectangleOnBitmap(Color clr, double x, double y, double width, double height);",
+            "public void Bitmap.DrawRectangle(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.DrawRectangleOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -35645,7 +35510,7 @@
             "procedure DrawRectangleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawRectangleOnBitmap(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Bitmap.DrawRectangle(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.DrawRectangleOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -35726,7 +35591,7 @@
             "procedure DrawRectangleOnWindow(destination: Window; clr: Color; const rect: Rectangle)"
           ],
           "csharp": [
-            "public void Window.DrawRectangleOnWindow(Color clr, Rectangle rect);",
+            "public void Window.DrawRectangle(Color clr, Rectangle rect);",
             "public static void SplashKit.DrawRectangleOnWindow(Window destination, Color clr, Rectangle rect);"
           ]
         }
@@ -35820,7 +35685,7 @@
             "procedure DrawRectangleOnWindow(destination: Window; clr: Color; const rect: Rectangle; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawRectangleOnWindow(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Window.DrawRectangle(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.DrawRectangleOnWindow(Window destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -35939,7 +35804,7 @@
             "procedure DrawRectangleOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Window.DrawRectangleOnWindow(Color clr, double x, double y, double width, double height);",
+            "public void Window.DrawRectangle(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.DrawRectangleOnWindow(Window destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -36072,7 +35937,7 @@
             "procedure DrawRectangleOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawRectangleOnWindow(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Window.DrawRectangle(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.DrawRectangleOnWindow(Window destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -36292,7 +36157,7 @@
             "procedure FillQuadOnBitmap(destination: Bitmap; clr: Color; const q: Quad)"
           ],
           "csharp": [
-            "public void Bitmap.FillQuadOnBitmap(Color clr, Quad q);",
+            "public void Bitmap.FillQuad(Color clr, Quad q);",
             "public static void SplashKit.FillQuadOnBitmap(Bitmap destination, Color clr, Quad q);"
           ]
         }
@@ -36386,7 +36251,7 @@
             "procedure FillQuadOnBitmap(destination: Bitmap; clr: Color; const q: Quad; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillQuadOnBitmap(Color clr, Quad q, DrawingOptions opts);",
+            "public void Bitmap.FillQuad(Color clr, Quad q, DrawingOptions opts);",
             "public static void SplashKit.FillQuadOnBitmap(Bitmap destination, Color clr, Quad q, DrawingOptions opts);"
           ]
         }
@@ -36466,7 +36331,7 @@
             "procedure FillQuadOnWindow(destination: Window; clr: Color; const q: Quad)"
           ],
           "csharp": [
-            "public void Window.FillQuadOnWindow(Color clr, Quad q);",
+            "public void Window.FillQuad(Color clr, Quad q);",
             "public static void SplashKit.FillQuadOnWindow(Window destination, Color clr, Quad q);"
           ]
         }
@@ -36558,7 +36423,6 @@
             "procedure FillQuadOnWindow(destination: Window; clr: Color; const q: Quad; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillQuadOnWindow(Window destination, Color clr, Quad q, DrawingOptions opts);",
             "public static void SplashKit.FillQuadOnWindow(Window destination, Color clr, Quad q, DrawingOptions opts);"
           ]
         }
@@ -36998,7 +36862,7 @@
             "procedure FillRectangleOnBitmap(destination: Bitmap; clr: Color; const rect: Rectangle)"
           ],
           "csharp": [
-            "public void Bitmap.FillRectangleOnBitmap(Color clr, Rectangle rect);",
+            "public void Bitmap.FillRectangle(Color clr, Rectangle rect);",
             "public static void SplashKit.FillRectangleOnBitmap(Bitmap destination, Color clr, Rectangle rect);"
           ]
         }
@@ -37092,7 +36956,7 @@
             "procedure FillRectangleOnBitmap(destination: Bitmap; clr: Color; const rect: Rectangle; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillRectangleOnBitmap(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Bitmap.FillRectangle(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.FillRectangleOnBitmap(Bitmap destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -37211,7 +37075,7 @@
             "procedure FillRectangleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Bitmap.FillRectangleOnBitmap(Color clr, double x, double y, double width, double height);",
+            "public void Bitmap.FillRectangle(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.FillRectangleOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -37344,7 +37208,7 @@
             "procedure FillRectangleOnBitmap(destination: Bitmap; clr: Color; x: Double; y: Double; width: Double; height: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillRectangleOnBitmap(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Bitmap.FillRectangle(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.FillRectangleOnBitmap(Bitmap destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -37425,7 +37289,7 @@
             "procedure FillRectangleOnWindow(destination: Window; clr: Color; const rect: Rectangle)"
           ],
           "csharp": [
-            "public void Window.FillRectangleOnWindow(Color clr, Rectangle rect);",
+            "public void Window.FillRectangle(Color clr, Rectangle rect);",
             "public static void SplashKit.FillRectangleOnWindow(Window destination, Color clr, Rectangle rect);"
           ]
         }
@@ -37519,7 +37383,7 @@
             "procedure FillRectangleOnWindow(destination: Window; clr: Color; const rect: Rectangle; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillRectangleOnWindow(Color clr, Rectangle rect, DrawingOptions opts);",
+            "public void Window.FillRectangle(Color clr, Rectangle rect, DrawingOptions opts);",
             "public static void SplashKit.FillRectangleOnWindow(Window destination, Color clr, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -37638,7 +37502,7 @@
             "procedure FillRectangleOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double)"
           ],
           "csharp": [
-            "public void Window.FillRectangleOnWindow(Color clr, double x, double y, double width, double height);",
+            "public void Window.FillRectangle(Color clr, double x, double y, double width, double height);",
             "public static void SplashKit.FillRectangleOnWindow(Window destination, Color clr, double x, double y, double width, double height);"
           ]
         }
@@ -37771,7 +37635,7 @@
             "procedure FillRectangleOnWindow(destination: Window; clr: Color; x: Double; y: Double; width: Double; height: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillRectangleOnWindow(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
+            "public void Window.FillRectangle(Color clr, double x, double y, double width, double height, DrawingOptions opts);",
             "public static void SplashKit.FillRectangleOnWindow(Window destination, Color clr, double x, double y, double width, double height, DrawingOptions opts);"
           ]
         }
@@ -37889,7 +37753,6 @@
             "procedure DrawText(const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y);"
           ]
         }
@@ -38020,7 +37883,6 @@
             "procedure DrawText(const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -38112,7 +37974,6 @@
             "procedure DrawText(const text: String; const clr: Color; x: Double; y: Double)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, double x, double y);",
             "public static void SplashKit.DrawText(string text, Color clr, double x, double y);"
           ]
         }
@@ -38217,7 +38078,6 @@
             "procedure DrawText(const text: String; const clr: Color; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawText(string text, Color clr, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -38334,7 +38194,6 @@
             "procedure DrawText(const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y);"
           ]
         }
@@ -38465,7 +38324,6 @@
             "procedure DrawText(const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public static void Text.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -38599,7 +38457,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, string fnt, int fontSize, double x, double y);",
+            "public void Bitmap.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, string fnt, int fontSize, double x, double y);"
           ]
         }
@@ -38746,7 +38604,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);",
+            "public void Bitmap.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -38854,7 +38712,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, double x, double y);",
+            "public void Bitmap.DrawText(string text, Color clr, double x, double y);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, double x, double y);"
           ]
         }
@@ -38975,7 +38833,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, double x, double y, DrawingOptions opts);",
+            "public void Bitmap.DrawText(string text, Color clr, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -39108,7 +38966,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, Font fnt, int fontSize, double x, double y);",
+            "public void Bitmap.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, Font fnt, int fontSize, double x, double y);"
           ]
         }
@@ -39255,7 +39113,7 @@
             "procedure DrawTextOnBitmap(bmp: Bitmap; const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTextOnBitmap(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);",
+            "public void Bitmap.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnBitmap(Bitmap bmp, string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -39389,7 +39247,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, string fnt, int fontSize, double x, double y);",
+            "public void Window.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, string fnt, int fontSize, double x, double y);"
           ]
         }
@@ -39536,7 +39394,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; const fnt: String; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);",
+            "public void Window.DrawText(string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, string fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -39644,7 +39502,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, double x, double y);",
+            "public void Window.DrawText(string text, Color clr, double x, double y);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, double x, double y);"
           ]
         }
@@ -39765,7 +39623,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, double x, double y, DrawingOptions opts);",
+            "public void Window.DrawText(string text, Color clr, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -39898,7 +39756,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, Font fnt, int fontSize, double x, double y);",
+            "public void Window.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, Font fnt, int fontSize, double x, double y);"
           ]
         }
@@ -40045,7 +39903,7 @@
             "procedure DrawTextOnWindow(wnd: Window; const text: String; const clr: Color; fnt: Font; fontSize: Integer; x: Double; y: Double; const opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawTextOnWindow(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);",
+            "public void Window.DrawText(string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);",
             "public static void SplashKit.DrawTextOnWindow(Window wnd, string text, Color clr, Font fnt, int fontSize, double x, double y, DrawingOptions opts);"
           ]
         }
@@ -40111,7 +39969,6 @@
             "function FontHasSize(const name: String; fontSize: Integer): Boolean"
           ],
           "csharp": [
-            "public static bool Text.FontHasSize(string name, int fontSize);",
             "public static bool SplashKit.FontHasSize(string name, int fontSize);"
           ]
         }
@@ -40179,7 +40036,7 @@
             "function FontHasSize(fnt: Font; fontSize: Integer): Boolean"
           ],
           "csharp": [
-            "public bool Font.FontHasSize(int fontSize);",
+            "public bool Font.HasSize(int fontSize);",
             "public static bool SplashKit.FontHasSize(Font fnt, int fontSize);"
           ]
         }
@@ -40245,7 +40102,6 @@
             "procedure FontLoadSize(const name: String; fontSize: Integer)"
           ],
           "csharp": [
-            "public static void Text.FontLoadSize(string name, int fontSize);",
             "public static void SplashKit.FontLoadSize(string name, int fontSize);"
           ]
         }
@@ -40313,7 +40169,7 @@
             "procedure FontLoadSize(fnt: Font; fontSize: Integer)"
           ],
           "csharp": [
-            "public void Font.FontLoadSize(int fontSize);",
+            "public void Font.LoadSize(int fontSize);",
             "public static void SplashKit.FontLoadSize(Font fnt, int fontSize);"
           ]
         }
@@ -40365,7 +40221,6 @@
             "function FontNamed(name: String): Font"
           ],
           "csharp": [
-            "public static Font Text.FontNamed(string name);",
             "public static Font SplashKit.FontNamed(string name);"
           ]
         }
@@ -40405,7 +40260,7 @@
             "procedure FreeAllFonts()"
           ],
           "csharp": [
-            "public static void Text.FreeAllFonts();",
+            "public static void Text.FreeAll();",
             "public static void SplashKit.FreeAllFonts();"
           ]
         }
@@ -40461,7 +40316,7 @@
             "procedure FreeFont(fnt: Font)"
           ],
           "csharp": [
-            "public void Font.FreeFont();",
+            "public void Font.Free();",
             "public static void SplashKit.FreeFont(Font fnt);"
           ]
         }
@@ -40514,7 +40369,6 @@
             "function GetFontStyle(const name: String): FontStyle"
           ],
           "csharp": [
-            "public static FontStyle Text.GetFontStyle(string name);",
             "public static FontStyle SplashKit.GetFontStyle(string name);"
           ]
         }
@@ -40608,7 +40462,6 @@
             "function GetSystemFont(): Font"
           ],
           "csharp": [
-            "public static Font Text.GetSystemFont();",
             "public static Font SplashKit.GetSystemFont();"
           ]
         }
@@ -40660,7 +40513,6 @@
             "function HasFont(fnt: Font): Boolean"
           ],
           "csharp": [
-            "public static bool Text.HasFont(Font fnt);",
             "public static bool SplashKit.HasFont(Font fnt);"
           ]
         }
@@ -40713,7 +40565,6 @@
             "function HasFont(name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Text.HasFont(string name);",
             "public static bool SplashKit.HasFont(string name);"
           ]
         }
@@ -40846,7 +40697,6 @@
             "procedure SetFontStyle(const name: String; style: FontStyle)"
           ],
           "csharp": [
-            "public static void Text.SetFontStyle(string name, FontStyle style);",
             "public static void SplashKit.SetFontStyle(string name, FontStyle style);"
           ]
         }
@@ -40994,7 +40844,7 @@
             "function TextHeight(const text: String; const fnt: String; fontSize: Integer): Integer"
           ],
           "csharp": [
-            "public static int Text.TextHeight(string text, string fnt, int fontSize);",
+            "public static int Text.Height(string text, string fnt, int fontSize);",
             "public static int SplashKit.TextHeight(string text, string fnt, int fontSize);"
           ]
         }
@@ -41073,7 +40923,7 @@
             "function TextHeight(const text: String; fnt: Font; fontSize: Integer): Integer"
           ],
           "csharp": [
-            "public static int Text.TextHeight(string text, Font fnt, int fontSize);",
+            "public static int Text.Height(string text, Font fnt, int fontSize);",
             "public static int SplashKit.TextHeight(string text, Font fnt, int fontSize);"
           ]
         }
@@ -41153,7 +41003,7 @@
             "function TextWidth(const text: String; const fnt: String; fontSize: Integer): Integer"
           ],
           "csharp": [
-            "public static int Text.TextWidth(string text, string fnt, int fontSize);",
+            "public static int Text.Width(string text, string fnt, int fontSize);",
             "public static int SplashKit.TextWidth(string text, string fnt, int fontSize);"
           ]
         }
@@ -41232,7 +41082,7 @@
             "function TextWidth(const text: String; fnt: Font; fontSize: Integer): Integer"
           ],
           "csharp": [
-            "public static int Text.TextWidth(string text, Font fnt, int fontSize);",
+            "public static int Text.Width(string text, Font fnt, int fontSize);",
             "public static int SplashKit.TextWidth(string text, Font fnt, int fontSize);"
           ]
         }
@@ -41724,7 +41574,7 @@
             "procedure DrawTriangleOnBitmap(destination: Bitmap; clr: Color; const tri: Triangle)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTriangleOnBitmap(Color clr, Triangle tri);",
+            "public void Bitmap.DrawTriangle(Color clr, Triangle tri);",
             "public static void SplashKit.DrawTriangleOnBitmap(Bitmap destination, Color clr, Triangle tri);"
           ]
         }
@@ -41818,7 +41668,7 @@
             "procedure DrawTriangleOnBitmap(destination: Bitmap; clr: Color; const tri: Triangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTriangleOnBitmap(Color clr, Triangle tri, DrawingOptions opts);",
+            "public void Bitmap.DrawTriangle(Color clr, Triangle tri, DrawingOptions opts);",
             "public static void SplashKit.DrawTriangleOnBitmap(Bitmap destination, Color clr, Triangle tri, DrawingOptions opts);"
           ]
         }
@@ -41963,7 +41813,7 @@
             "procedure DrawTriangleOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTriangleOnBitmap(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
+            "public void Bitmap.DrawTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
             "public static void SplashKit.DrawTriangleOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3);"
           ]
         }
@@ -42122,7 +41972,7 @@
             "procedure DrawTriangleOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.DrawTriangleOnBitmap(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
+            "public void Bitmap.DrawTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
             "public static void SplashKit.DrawTriangleOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);"
           ]
         }
@@ -42203,7 +42053,7 @@
             "procedure DrawTriangleOnWindow(destination: Window; clr: Color; const tri: Triangle)"
           ],
           "csharp": [
-            "public void Window.DrawTriangleOnWindow(Color clr, Triangle tri);",
+            "public void Window.DrawTriangle(Color clr, Triangle tri);",
             "public static void SplashKit.DrawTriangleOnWindow(Window destination, Color clr, Triangle tri);"
           ]
         }
@@ -42297,7 +42147,7 @@
             "procedure DrawTriangleOnWindow(destination: Window; clr: Color; const tri: Triangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawTriangleOnWindow(Color clr, Triangle tri, DrawingOptions opts);",
+            "public void Window.DrawTriangle(Color clr, Triangle tri, DrawingOptions opts);",
             "public static void SplashKit.DrawTriangleOnWindow(Window destination, Color clr, Triangle tri, DrawingOptions opts);"
           ]
         }
@@ -42442,7 +42292,7 @@
             "procedure DrawTriangleOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double)"
           ],
           "csharp": [
-            "public void Window.DrawTriangleOnWindow(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
+            "public void Window.DrawTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
             "public static void SplashKit.DrawTriangleOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3);"
           ]
         }
@@ -42601,7 +42451,7 @@
             "procedure DrawTriangleOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.DrawTriangleOnWindow(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
+            "public void Window.DrawTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
             "public static void SplashKit.DrawTriangleOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);"
           ]
         }
@@ -43093,7 +42943,7 @@
             "procedure FillTriangleOnBitmap(destination: Bitmap; clr: Color; const tri: Triangle)"
           ],
           "csharp": [
-            "public void Bitmap.FillTriangleOnBitmap(Color clr, Triangle tri);",
+            "public void Bitmap.FillTriangle(Color clr, Triangle tri);",
             "public static void SplashKit.FillTriangleOnBitmap(Bitmap destination, Color clr, Triangle tri);"
           ]
         }
@@ -43187,7 +43037,7 @@
             "procedure FillTriangleOnBitmap(destination: Bitmap; clr: Color; const tri: Triangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillTriangleOnBitmap(Color clr, Triangle tri, DrawingOptions opts);",
+            "public void Bitmap.FillTriangle(Color clr, Triangle tri, DrawingOptions opts);",
             "public static void SplashKit.FillTriangleOnBitmap(Bitmap destination, Color clr, Triangle tri, DrawingOptions opts);"
           ]
         }
@@ -43332,7 +43182,7 @@
             "procedure FillTriangleOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double)"
           ],
           "csharp": [
-            "public void Bitmap.FillTriangleOnBitmap(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
+            "public void Bitmap.FillTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
             "public static void SplashKit.FillTriangleOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3);"
           ]
         }
@@ -43491,7 +43341,7 @@
             "procedure FillTriangleOnBitmap(destination: Bitmap; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Bitmap.FillTriangleOnBitmap(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
+            "public void Bitmap.FillTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
             "public static void SplashKit.FillTriangleOnBitmap(Bitmap destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);"
           ]
         }
@@ -43572,7 +43422,7 @@
             "procedure FillTriangleOnWindow(destination: Window; clr: Color; const tri: Triangle)"
           ],
           "csharp": [
-            "public void Window.FillTriangleOnWindow(Color clr, Triangle tri);",
+            "public void Window.FillTriangle(Color clr, Triangle tri);",
             "public static void SplashKit.FillTriangleOnWindow(Window destination, Color clr, Triangle tri);"
           ]
         }
@@ -43666,7 +43516,7 @@
             "procedure FillTriangleOnWindow(destination: Window; clr: Color; const tri: Triangle; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillTriangleOnWindow(Color clr, Triangle tri, DrawingOptions opts);",
+            "public void Window.FillTriangle(Color clr, Triangle tri, DrawingOptions opts);",
             "public static void SplashKit.FillTriangleOnWindow(Window destination, Color clr, Triangle tri, DrawingOptions opts);"
           ]
         }
@@ -43811,7 +43661,7 @@
             "procedure FillTriangleOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double)"
           ],
           "csharp": [
-            "public void Window.FillTriangleOnWindow(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
+            "public void Window.FillTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3);",
             "public static void SplashKit.FillTriangleOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3);"
           ]
         }
@@ -43970,7 +43820,7 @@
             "procedure FillTriangleOnWindow(destination: Window; clr: Color; x1: Double; y1: Double; x2: Double; y2: Double; x3: Double; y3: Double; opts: DrawingOptions)"
           ],
           "csharp": [
-            "public void Window.FillTriangleOnWindow(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
+            "public void Window.FillTriangle(Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);",
             "public static void SplashKit.FillTriangleOnWindow(Window destination, Color clr, double x1, double y1, double x2, double y2, double x3, double y3, DrawingOptions opts);"
           ]
         }
@@ -44027,7 +43877,6 @@
             "procedure ProcessEvents()"
           ],
           "csharp": [
-            "public static void Input.ProcessEvents();",
             "public static void SplashKit.ProcessEvents();"
           ]
         }
@@ -44066,7 +43915,6 @@
             "function QuitRequested(): Boolean"
           ],
           "csharp": [
-            "public static bool Input.QuitRequested();",
             "public static bool SplashKit.QuitRequested();"
           ]
         }
@@ -44105,7 +43953,6 @@
             "procedure ResetQuit()"
           ],
           "csharp": [
-            "public static void Input.ResetQuit();",
             "public static void SplashKit.ResetQuit();"
           ]
         }
@@ -46693,7 +46540,6 @@
             "procedure AddColumn(width: Integer)"
           ],
           "csharp": [
-            "public static void Interface.AddColumn(int width);",
             "public static void SplashKit.AddColumn(int width);"
           ]
         }
@@ -46745,7 +46591,6 @@
             "procedure AddColumnRelative(width: Double)"
           ],
           "csharp": [
-            "public static void Interface.AddColumnRelative(double width);",
             "public static void SplashKit.AddColumnRelative(double width);"
           ]
         }
@@ -46797,7 +46642,6 @@
             "function BitmapButton(bmp: Bitmap): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(Bitmap bmp);",
             "public static bool SplashKit.BitmapButton(Bitmap bmp);"
           ]
         }
@@ -46863,7 +46707,6 @@
             "function BitmapButton(bmp: Bitmap; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(Bitmap bmp, Rectangle rect);",
             "public static bool SplashKit.BitmapButton(Bitmap bmp, Rectangle rect);"
           ]
         }
@@ -46942,7 +46785,6 @@
             "function BitmapButton(bmp: Bitmap; const rect: Rectangle; opts: DrawingOptions): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(Bitmap bmp, Rectangle rect, DrawingOptions opts);",
             "public static bool SplashKit.BitmapButton(Bitmap bmp, Rectangle rect, DrawingOptions opts);"
           ]
         }
@@ -47008,7 +46850,6 @@
             "function BitmapButton(bmp: Bitmap; opts: DrawingOptions): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(Bitmap bmp, DrawingOptions opts);",
             "public static bool SplashKit.BitmapButton(Bitmap bmp, DrawingOptions opts);"
           ]
         }
@@ -47074,7 +46915,6 @@
             "function BitmapButton(const labelText: String; bmp: Bitmap): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(string labelText, Bitmap bmp);",
             "public static bool SplashKit.BitmapButton(string labelText, Bitmap bmp);"
           ]
         }
@@ -47153,7 +46993,6 @@
             "function BitmapButton(const labelText: String; bmp: Bitmap; opts: DrawingOptions): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.BitmapButton(string labelText, Bitmap bmp, DrawingOptions opts);",
             "public static bool SplashKit.BitmapButton(string labelText, Bitmap bmp, DrawingOptions opts);"
           ]
         }
@@ -47219,7 +47058,6 @@
             "function Button(const text: String; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Button(string text, Rectangle rect);",
             "public static bool SplashKit.Button(string text, Rectangle rect);"
           ]
         }
@@ -47271,7 +47109,6 @@
             "function Button(const text: String): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Button(string text);",
             "public static bool SplashKit.Button(string text);"
           ]
         }
@@ -47337,7 +47174,6 @@
             "function Button(const labelText: String; const text: String): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Button(string labelText, string text);",
             "public static bool SplashKit.Button(string labelText, string text);"
           ]
         }
@@ -47416,7 +47252,6 @@
             "function Checkbox(const text: String; const value: Boolean; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Checkbox(string text, bool value, Rectangle rect);",
             "public static bool SplashKit.Checkbox(string text, bool value, Rectangle rect);"
           ]
         }
@@ -47481,7 +47316,6 @@
             "function Checkbox(const text: String; const value: Boolean): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Checkbox(string text, bool value);",
             "public static bool SplashKit.Checkbox(string text, bool value);"
           ]
         }
@@ -47560,7 +47394,6 @@
             "function Checkbox(const labelText: String; const text: String; const value: Boolean): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Checkbox(string labelText, string text, bool value);",
             "public static bool SplashKit.Checkbox(string labelText, string text, bool value);"
           ]
         }
@@ -47626,7 +47459,6 @@
             "function ColorSlider(const clr: Color; const rect: Rectangle): Color"
           ],
           "csharp": [
-            "public static Color Interface.ColorSlider(Color clr, Rectangle rect);",
             "public static Color SplashKit.ColorSlider(Color clr, Rectangle rect);"
           ]
         }
@@ -47678,7 +47510,6 @@
             "function ColorSlider(const clr: Color): Color"
           ],
           "csharp": [
-            "public static Color Interface.ColorSlider(Color clr);",
             "public static Color SplashKit.ColorSlider(Color clr);"
           ]
         }
@@ -47744,7 +47575,6 @@
             "function ColorSlider(const labelText: String; const clr: Color): Color"
           ],
           "csharp": [
-            "public static Color Interface.ColorSlider(string labelText, Color clr);",
             "public static Color SplashKit.ColorSlider(string labelText, Color clr);"
           ]
         }
@@ -47783,7 +47613,6 @@
             "procedure DisableInterface()"
           ],
           "csharp": [
-            "public static void Interface.DisableInterface();",
             "public static void SplashKit.DisableInterface();"
           ]
         }
@@ -47822,7 +47651,6 @@
             "procedure DrawInterface()"
           ],
           "csharp": [
-            "public static void Interface.DrawInterface();",
             "public static void SplashKit.DrawInterface();"
           ]
         }
@@ -47861,7 +47689,6 @@
             "procedure EnableInterface()"
           ],
           "csharp": [
-            "public static void Interface.EnableInterface();",
             "public static void SplashKit.EnableInterface();"
           ]
         }
@@ -47913,7 +47740,6 @@
             "procedure EndInset(const name: String)"
           ],
           "csharp": [
-            "public static void Interface.EndInset(string name);",
             "public static void SplashKit.EndInset(string name);"
           ]
         }
@@ -47965,7 +47791,6 @@
             "procedure EndPanel(const name: String)"
           ],
           "csharp": [
-            "public static void Interface.EndPanel(string name);",
             "public static void SplashKit.EndPanel(string name);"
           ]
         }
@@ -48017,7 +47842,6 @@
             "procedure EndPopup(const name: String)"
           ],
           "csharp": [
-            "public static void Interface.EndPopup(string name);",
             "public static void SplashKit.EndPopup(string name);"
           ]
         }
@@ -48069,7 +47893,6 @@
             "procedure EndTreenode(const labelText: String)"
           ],
           "csharp": [
-            "public static void Interface.EndTreenode(string labelText);",
             "public static void SplashKit.EndTreenode(string labelText);"
           ]
         }
@@ -48108,7 +47931,6 @@
             "procedure EnterColumn()"
           ],
           "csharp": [
-            "public static void Interface.EnterColumn();",
             "public static void SplashKit.EnterColumn();"
           ]
         }
@@ -48147,7 +47969,6 @@
             "function GetInterfaceLabelWidth(): Integer"
           ],
           "csharp": [
-            "public static int Interface.GetInterfaceLabelWidth();",
             "public static int SplashKit.GetInterfaceLabelWidth();"
           ]
         }
@@ -48199,7 +48020,6 @@
             "function Header(const labelText: String): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.Header(string labelText);",
             "public static bool SplashKit.Header(string labelText);"
           ]
         }
@@ -48265,7 +48085,6 @@
             "function HSBColorSlider(const clr: Color; const rect: Rectangle): Color"
           ],
           "csharp": [
-            "public static Color Interface.HSBColorSlider(Color clr, Rectangle rect);",
             "public static Color SplashKit.HSBColorSlider(Color clr, Rectangle rect);"
           ]
         }
@@ -48317,7 +48136,6 @@
             "function HSBColorSlider(const clr: Color): Color"
           ],
           "csharp": [
-            "public static Color Interface.HSBColorSlider(Color clr);",
             "public static Color SplashKit.HSBColorSlider(Color clr);"
           ]
         }
@@ -48383,7 +48201,6 @@
             "function HSBColorSlider(const labelText: String; const clr: Color): Color"
           ],
           "csharp": [
-            "public static Color Interface.HSBColorSlider(string labelText, Color clr);",
             "public static Color SplashKit.HSBColorSlider(string labelText, Color clr);"
           ]
         }
@@ -48422,7 +48239,6 @@
             "function InterfaceEnabled(): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.InterfaceEnabled();",
             "public static bool SplashKit.InterfaceEnabled();"
           ]
         }
@@ -48474,7 +48290,6 @@
             "procedure InterfaceStylePanel(const initialRectangle: Rectangle)"
           ],
           "csharp": [
-            "public static void Interface.InterfaceStylePanel(Rectangle initialRectangle);",
             "public static void SplashKit.InterfaceStylePanel(Rectangle initialRectangle);"
           ]
         }
@@ -48526,7 +48341,6 @@
             "procedure LabelElement(const text: String)"
           ],
           "csharp": [
-            "public static void Interface.LabelElement(string text);",
             "public static void SplashKit.LabelElement(string text);"
           ]
         }
@@ -48592,7 +48406,6 @@
             "procedure LabelElement(const text: String; const rect: Rectangle)"
           ],
           "csharp": [
-            "public static void Interface.LabelElement(string text, Rectangle rect);",
             "public static void SplashKit.LabelElement(string text, Rectangle rect);"
           ]
         }
@@ -48631,7 +48444,6 @@
             "function LastElementChanged(): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.LastElementChanged();",
             "public static bool SplashKit.LastElementChanged();"
           ]
         }
@@ -48670,7 +48482,6 @@
             "function LastElementConfirmed(): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.LastElementConfirmed();",
             "public static bool SplashKit.LastElementConfirmed();"
           ]
         }
@@ -48709,7 +48520,6 @@
             "procedure LeaveColumn()"
           ],
           "csharp": [
-            "public static void Interface.LeaveColumn();",
             "public static void SplashKit.LeaveColumn();"
           ]
         }
@@ -48788,7 +48598,6 @@
             "function NumberBox(const value: Single; step: Single; const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Interface.NumberBox(float value, float step, Rectangle rect);",
             "public static float SplashKit.NumberBox(float value, float step, Rectangle rect);"
           ]
         }
@@ -48853,7 +48662,6 @@
             "function NumberBox(const value: Single; step: Single): Single"
           ],
           "csharp": [
-            "public static float Interface.NumberBox(float value, float step);",
             "public static float SplashKit.NumberBox(float value, float step);"
           ]
         }
@@ -48932,7 +48740,6 @@
             "function NumberBox(const labelText: String; const value: Single; step: Single): Single"
           ],
           "csharp": [
-            "public static float Interface.NumberBox(string labelText, float value, float step);",
             "public static float SplashKit.NumberBox(string labelText, float value, float step);"
           ]
         }
@@ -48984,7 +48791,6 @@
             "procedure OpenPopup(const name: String)"
           ],
           "csharp": [
-            "public static void Interface.OpenPopup(string name);",
             "public static void SplashKit.OpenPopup(string name);"
           ]
         }
@@ -49036,7 +48842,6 @@
             "procedure Paragraph(const text: String)"
           ],
           "csharp": [
-            "public static void Interface.Paragraph(string text);",
             "public static void SplashKit.Paragraph(string text);"
           ]
         }
@@ -49102,7 +48907,6 @@
             "procedure Paragraph(const text: String; const rect: Rectangle)"
           ],
           "csharp": [
-            "public static void Interface.Paragraph(string text, Rectangle rect);",
             "public static void SplashKit.Paragraph(string text, Rectangle rect);"
           ]
         }
@@ -49141,7 +48945,6 @@
             "procedure ResetLayout()"
           ],
           "csharp": [
-            "public static void Interface.ResetLayout();",
             "public static void SplashKit.ResetLayout();"
           ]
         }
@@ -49206,7 +49009,6 @@
             "procedure SetInterfaceAccentColor(clr: Color; contrast: Single)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceAccentColor(Color clr, float contrast);",
             "public static void SplashKit.SetInterfaceAccentColor(Color clr, float contrast);"
           ]
         }
@@ -49258,7 +49060,6 @@
             "procedure SetInterfaceBorderColor(clr: Color)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceBorderColor(Color clr);",
             "public static void SplashKit.SetInterfaceBorderColor(Color clr);"
           ]
         }
@@ -49362,7 +49163,6 @@
             "procedure SetInterfaceColorsAuto(mainClr: Color; accentClr: Color; contrast: Single; accentContrast: Single; borderContrast: Single)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceColorsAuto(Color mainClr, Color accentClr, float contrast, float accentContrast, float borderContrast);",
             "public static void SplashKit.SetInterfaceColorsAuto(Color mainClr, Color accentClr, float contrast, float accentContrast, float borderContrast);"
           ]
         }
@@ -49427,7 +49227,6 @@
             "procedure SetInterfaceElementColor(clr: Color; contrast: Single)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceElementColor(Color clr, float contrast);",
             "public static void SplashKit.SetInterfaceElementColor(Color clr, float contrast);"
           ]
         }
@@ -49505,7 +49304,6 @@
             "procedure SetInterfaceElementShadows(radius: Integer; clr: Color; offset: Point2D)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceElementShadows(int radius, Color clr, Point2D offset);",
             "public static void SplashKit.SetInterfaceElementShadows(int radius, Color clr, Point2D offset);"
           ]
         }
@@ -49558,7 +49356,6 @@
             "procedure SetInterfaceFont(const fnt: String)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceFont(string fnt);",
             "public static void SplashKit.SetInterfaceFont(string fnt);"
           ]
         }
@@ -49610,7 +49407,6 @@
             "procedure SetInterfaceFont(fnt: Font)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceFont(Font fnt);",
             "public static void SplashKit.SetInterfaceFont(Font fnt);"
           ]
         }
@@ -49662,7 +49458,6 @@
             "procedure SetInterfaceFontSize(size: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceFontSize(int size);",
             "public static void SplashKit.SetInterfaceFontSize(int size);"
           ]
         }
@@ -49714,7 +49509,6 @@
             "procedure SetInterfaceLabelWidth(width: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceLabelWidth(int width);",
             "public static void SplashKit.SetInterfaceLabelWidth(int width);"
           ]
         }
@@ -49792,7 +49586,6 @@
             "procedure SetInterfacePanelShadows(radius: Integer; clr: Color; offset: Point2D)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfacePanelShadows(int radius, Color clr, Point2D offset);",
             "public static void SplashKit.SetInterfacePanelShadows(int radius, Color clr, Point2D offset);"
           ]
         }
@@ -49844,7 +49637,6 @@
             "procedure SetInterfaceRootTextColor(clr: Color)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceRootTextColor(Color clr);",
             "public static void SplashKit.SetInterfaceRootTextColor(Color clr);"
           ]
         }
@@ -49922,7 +49714,6 @@
             "procedure SetInterfaceShadows(radius: Integer; clr: Color; offset: Point2D)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceShadows(int radius, Color clr, Point2D offset);",
             "public static void SplashKit.SetInterfaceShadows(int radius, Color clr, Point2D offset);"
           ]
         }
@@ -49987,7 +49778,6 @@
             "procedure SetInterfaceSpacing(spacing: Integer; padding: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceSpacing(int spacing, int padding);",
             "public static void SplashKit.SetInterfaceSpacing(int spacing, int padding);"
           ]
         }
@@ -50039,7 +49829,6 @@
             "procedure SetInterfaceStyle(style: InterfaceStyle)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceStyle(InterfaceStyle style);",
             "public static void SplashKit.SetInterfaceStyle(InterfaceStyle style);"
           ]
         }
@@ -50105,7 +49894,6 @@
             "procedure SetInterfaceStyle(style: InterfaceStyle; clr: Color)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceStyle(InterfaceStyle style, Color clr);",
             "public static void SplashKit.SetInterfaceStyle(InterfaceStyle style, Color clr);"
           ]
         }
@@ -50157,7 +49945,6 @@
             "procedure SetInterfaceTextColor(clr: Color)"
           ],
           "csharp": [
-            "public static void Interface.SetInterfaceTextColor(Color clr);",
             "public static void SplashKit.SetInterfaceTextColor(Color clr);"
           ]
         }
@@ -50209,7 +49996,6 @@
             "procedure SetLayoutHeight(height: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SetLayoutHeight(int height);",
             "public static void SplashKit.SetLayoutHeight(int height);"
           ]
         }
@@ -50248,7 +50034,6 @@
             "procedure SingleLineLayout()"
           ],
           "csharp": [
-            "public static void Interface.SingleLineLayout();",
             "public static void SplashKit.SingleLineLayout();"
           ]
         }
@@ -50340,7 +50125,6 @@
             "function Slider(const value: Single; minValue: Single; maxValue: Single; const rect: Rectangle): Single"
           ],
           "csharp": [
-            "public static float Interface.Slider(float value, float minValue, float maxValue, Rectangle rect);",
             "public static float SplashKit.Slider(float value, float minValue, float maxValue, Rectangle rect);"
           ]
         }
@@ -50418,7 +50202,6 @@
             "function Slider(const value: Single; minValue: Single; maxValue: Single): Single"
           ],
           "csharp": [
-            "public static float Interface.Slider(float value, float minValue, float maxValue);",
             "public static float SplashKit.Slider(float value, float minValue, float maxValue);"
           ]
         }
@@ -50510,7 +50293,6 @@
             "function Slider(const labelText: String; const value: Single; minValue: Single; maxValue: Single): Single"
           ],
           "csharp": [
-            "public static float Interface.Slider(string labelText, float value, float minValue, float maxValue);",
             "public static float SplashKit.Slider(string labelText, float value, float minValue, float maxValue);"
           ]
         }
@@ -50562,7 +50344,6 @@
             "procedure SplitIntoColumns(count: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SplitIntoColumns(int count);",
             "public static void SplashKit.SplitIntoColumns(int count);"
           ]
         }
@@ -50628,7 +50409,6 @@
             "procedure SplitIntoColumns(count: Integer; lastWidth: Integer)"
           ],
           "csharp": [
-            "public static void Interface.SplitIntoColumns(int count, int lastWidth);",
             "public static void SplashKit.SplitIntoColumns(int count, int lastWidth);"
           ]
         }
@@ -50694,7 +50474,6 @@
             "procedure SplitIntoColumnsRelative(count: Integer; lastWidth: Double)"
           ],
           "csharp": [
-            "public static void Interface.SplitIntoColumnsRelative(int count, double lastWidth);",
             "public static void SplashKit.SplitIntoColumnsRelative(int count, double lastWidth);"
           ]
         }
@@ -50733,7 +50512,6 @@
             "procedure StartCustomLayout()"
           ],
           "csharp": [
-            "public static void Interface.StartCustomLayout();",
             "public static void SplashKit.StartCustomLayout();"
           ]
         }
@@ -50799,7 +50577,6 @@
             "procedure StartInset(const name: String; const rect: Rectangle)"
           ],
           "csharp": [
-            "public static void Interface.StartInset(string name, Rectangle rect);",
             "public static void SplashKit.StartInset(string name, Rectangle rect);"
           ]
         }
@@ -50864,7 +50641,6 @@
             "procedure StartInset(const name: String; height: Integer)"
           ],
           "csharp": [
-            "public static void Interface.StartInset(string name, int height);",
             "public static void SplashKit.StartInset(string name, int height);"
           ]
         }
@@ -50929,7 +50705,6 @@
             "function StartPanel(const name: String; initialRectangle: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.StartPanel(string name, Rectangle initialRectangle);",
             "public static bool SplashKit.StartPanel(string name, Rectangle initialRectangle);"
           ]
         }
@@ -50981,7 +50756,6 @@
             "function StartPopup(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.StartPopup(string name);",
             "public static bool SplashKit.StartPopup(string name);"
           ]
         }
@@ -51033,7 +50807,6 @@
             "function StartTreenode(const labelText: String): Boolean"
           ],
           "csharp": [
-            "public static bool Interface.StartTreenode(string labelText);",
             "public static bool SplashKit.StartTreenode(string labelText);"
           ]
         }
@@ -51085,7 +50858,6 @@
             "function TextBox(const value: String): String"
           ],
           "csharp": [
-            "public static string Interface.TextBox(string value);",
             "public static string SplashKit.TextBox(string value);"
           ]
         }
@@ -51151,7 +50923,6 @@
             "function TextBox(const value: String; const rect: Rectangle): String"
           ],
           "csharp": [
-            "public static string Interface.TextBox(string value, Rectangle rect);",
             "public static string SplashKit.TextBox(string value, Rectangle rect);"
           ]
         }
@@ -51217,7 +50988,6 @@
             "function TextBox(const labelText: String; const value: String): String"
           ],
           "csharp": [
-            "public static string Interface.TextBox(string labelText, string value);",
             "public static string SplashKit.TextBox(string labelText, string value);"
           ]
         }
@@ -51371,7 +51141,7 @@
             "procedure FreeAllJson()"
           ],
           "csharp": [
-            "public static void Json.FreeAllJson();",
+            "public static void Json.FreeAll();",
             "public static void SplashKit.FreeAllJson();"
           ]
         }
@@ -51426,7 +51196,6 @@
             "procedure FreeJson(j: Json)"
           ],
           "csharp": [
-            "public void Json.FreeJson();",
             "public static void SplashKit.FreeJson(Json j);"
           ]
         }
@@ -51481,7 +51250,7 @@
             "function JsonCountKeys(j: Json): Integer"
           ],
           "csharp": [
-            "public int Json.JsonCountKeys();",
+            "public int Json.CountKeys();",
             "public static int SplashKit.JsonCountKeys(Json j);"
           ]
         }
@@ -51533,7 +51302,6 @@
             "function JsonFromColor(clr: Color): Json"
           ],
           "csharp": [
-            "public static Json Json.JsonFromColor(Color clr);",
             "public static Json SplashKit.JsonFromColor(Color clr);"
           ]
         }
@@ -51586,7 +51354,7 @@
             "function JsonFromFile(const filename: String): Json"
           ],
           "csharp": [
-            "public static Json Json.JsonFromFile(string filename);",
+            "public static Json Json.FromFile(string filename);",
             "public static Json SplashKit.JsonFromFile(string filename);"
           ]
         }
@@ -51639,7 +51407,7 @@
             "function JsonFromString(const jString: String): Json"
           ],
           "csharp": [
-            "public static Json Json.JsonFromString(string jString);",
+            "public static Json Json.FromJsonString(string jString);",
             "public static Json SplashKit.JsonFromString(string jString);"
           ]
         }
@@ -51707,7 +51475,7 @@
             "function JsonHasKey(j: Json; key: String): Boolean"
           ],
           "csharp": [
-            "public bool Json.JsonHasKey(string key);",
+            "public bool Json.HasKey(string key);",
             "public static bool SplashKit.JsonHasKey(Json j, string key);"
           ]
         }
@@ -51789,7 +51557,7 @@
             "procedure JsonReadArray(j: Json; key: String; var outResult: ArrayOfDouble)"
           ],
           "csharp": [
-            "public void Json.JsonReadArray(string key, ref List<double> outResult);",
+            "public void Json.ReadArray(string key, ref List<double> outResult);",
             "public static void SplashKit.JsonReadArray(Json j, string key, ref List<double> outResult);"
           ]
         }
@@ -51871,7 +51639,7 @@
             "procedure JsonReadArray(j: Json; key: String; var outResult: ArrayOfJson)"
           ],
           "csharp": [
-            "public void Json.JsonReadArray(string key, ref List<Json> outResult);",
+            "public void Json.ReadArray(string key, ref List<Json> outResult);",
             "public static void SplashKit.JsonReadArray(Json j, string key, ref List<Json> outResult);"
           ]
         }
@@ -51953,7 +51721,7 @@
             "procedure JsonReadArray(j: Json; key: String; var outResult: ArrayOfString)"
           ],
           "csharp": [
-            "public void Json.JsonReadArray(string key, ref List<string> outResult);",
+            "public void Json.ReadArray(string key, ref List<string> outResult);",
             "public static void SplashKit.JsonReadArray(Json j, string key, ref List<string> outResult);"
           ]
         }
@@ -52035,7 +51803,7 @@
             "procedure JsonReadArray(j: Json; key: String; var outResult: ArrayOfBoolean)"
           ],
           "csharp": [
-            "public void Json.JsonReadArray(string key, ref List<bool> outResult);",
+            "public void Json.ReadArray(string key, ref List<bool> outResult);",
             "public static void SplashKit.JsonReadArray(Json j, string key, ref List<bool> outResult);"
           ]
         }
@@ -52103,7 +51871,7 @@
             "function JsonReadBool(j: Json; key: String): Boolean"
           ],
           "csharp": [
-            "public bool Json.JsonReadBool(string key);",
+            "public bool Json.ReadBool(string key);",
             "public static bool SplashKit.JsonReadBool(Json j, string key);"
           ]
         }
@@ -52171,7 +51939,7 @@
             "function JsonReadNumber(j: Json; key: String): Single"
           ],
           "csharp": [
-            "public float Json.JsonReadNumber(string key);",
+            "public float Json.ReadNumber(string key);",
             "public static float SplashKit.JsonReadNumber(Json j, string key);"
           ]
         }
@@ -52239,7 +52007,7 @@
             "function JsonReadNumberAsDouble(j: Json; key: String): Double"
           ],
           "csharp": [
-            "public double Json.JsonReadNumberAsDouble(string key);",
+            "public double Json.ReadDouble(string key);",
             "public static double SplashKit.JsonReadNumberAsDouble(Json j, string key);"
           ]
         }
@@ -52307,7 +52075,7 @@
             "function JsonReadNumberAsInt(j: Json; key: String): Integer"
           ],
           "csharp": [
-            "public int Json.JsonReadNumberAsInt(string key);",
+            "public int Json.ReadInteger(string key);",
             "public static int SplashKit.JsonReadNumberAsInt(Json j, string key);"
           ]
         }
@@ -52375,7 +52143,7 @@
             "function JsonReadObject(j: Json; key: String): Json"
           ],
           "csharp": [
-            "public Json Json.JsonReadObject(string key);",
+            "public Json Json.ReadObject(string key);",
             "public static Json SplashKit.JsonReadObject(Json j, string key);"
           ]
         }
@@ -52443,7 +52211,7 @@
             "function JsonReadString(j: Json; key: String): String"
           ],
           "csharp": [
-            "public string Json.JsonReadString(string key);",
+            "public string Json.ReadString(string key);",
             "public static string SplashKit.JsonReadString(Json j, string key);"
           ]
         }
@@ -52525,7 +52293,7 @@
             "procedure JsonSetArray(j: Json; key: String; value: ArrayOfString)"
           ],
           "csharp": [
-            "public void Json.JsonSetArray(string key, List<string> value);",
+            "public void Json.AddArray(string key, List<string> value);",
             "public static void SplashKit.JsonSetArray(Json j, string key, List<string> value);"
           ]
         }
@@ -52607,7 +52375,7 @@
             "procedure JsonSetArray(j: Json; key: String; value: ArrayOfDouble)"
           ],
           "csharp": [
-            "public void Json.JsonSetArray(string key, List<double> value);",
+            "public void Json.AddArray(string key, List<double> value);",
             "public static void SplashKit.JsonSetArray(Json j, string key, List<double> value);"
           ]
         }
@@ -52689,7 +52457,7 @@
             "procedure JsonSetArray(j: Json; key: String; value: ArrayOfBoolean)"
           ],
           "csharp": [
-            "public void Json.JsonSetArray(string key, List<bool> value);",
+            "public void Json.AddArray(string key, List<bool> value);",
             "public static void SplashKit.JsonSetArray(Json j, string key, List<bool> value);"
           ]
         }
@@ -52771,7 +52539,7 @@
             "procedure JsonSetArray(j: Json; key: String; value: ArrayOfJson)"
           ],
           "csharp": [
-            "public void Json.JsonSetArray(string key, List<Json> value);",
+            "public void Json.AddArray(string key, List<Json> value);",
             "public static void SplashKit.JsonSetArray(Json j, string key, List<Json> value);"
           ]
         }
@@ -52852,7 +52620,7 @@
             "procedure JsonSetBool(j: Json; key: String; value: Boolean)"
           ],
           "csharp": [
-            "public void Json.JsonSetBool(string key, bool value);",
+            "public void Json.AddBool(string key, bool value);",
             "public static void SplashKit.JsonSetBool(Json j, string key, bool value);"
           ]
         }
@@ -52934,7 +52702,7 @@
             "procedure JsonSetNumber(j: Json; key: String; value: Integer)"
           ],
           "csharp": [
-            "public void Json.JsonSetNumber(string key, int value);",
+            "public void Json.AddNumber(string key, int value);",
             "public static void SplashKit.JsonSetNumber(Json j, string key, int value);"
           ]
         }
@@ -53016,7 +52784,7 @@
             "procedure JsonSetNumber(j: Json; key: String; value: Double)"
           ],
           "csharp": [
-            "public void Json.JsonSetNumber(string key, double value);",
+            "public void Json.AddNumber(string key, double value);",
             "public static void SplashKit.JsonSetNumber(Json j, string key, double value);"
           ]
         }
@@ -53098,7 +52866,7 @@
             "procedure JsonSetNumber(j: Json; key: String; value: Single)"
           ],
           "csharp": [
-            "public void Json.JsonSetNumber(string key, float value);",
+            "public void Json.AddNumber(string key, float value);",
             "public static void SplashKit.JsonSetNumber(Json j, string key, float value);"
           ]
         }
@@ -53179,7 +52947,7 @@
             "procedure JsonSetObject(j: Json; key: String; obj: Json)"
           ],
           "csharp": [
-            "public void Json.JsonSetObject(string key, Json obj);",
+            "public void Json.AddObject(string key, Json obj);",
             "public static void SplashKit.JsonSetObject(Json j, string key, Json obj);"
           ]
         }
@@ -53260,7 +53028,7 @@
             "procedure JsonSetString(j: Json; key: String; value: String)"
           ],
           "csharp": [
-            "public void Json.JsonSetString(string key, string value);",
+            "public void Json.AddString(string key, string value);",
             "public static void SplashKit.JsonSetString(Json j, string key, string value);"
           ]
         }
@@ -53312,7 +53080,6 @@
             "function JsonToColor(j: Json): Color"
           ],
           "csharp": [
-            "public static Color Json.JsonToColor(Json j);",
             "public static Color SplashKit.JsonToColor(Json j);"
           ]
         }
@@ -53378,7 +53145,7 @@
             "procedure JsonToFile(j: Json; const filename: String)"
           ],
           "csharp": [
-            "public static void Json.JsonToFile(Json j, string filename);",
+            "public static void Json.ToFile(Json j, string filename);",
             "public static void SplashKit.JsonToFile(Json j, string filename);"
           ]
         }
@@ -53431,7 +53198,7 @@
             "function JsonToString(j: Json): String"
           ],
           "csharp": [
-            "public static string Json.JsonToString(Json j);",
+            "public static string Json.ToJsonString(Json j);",
             "public static string SplashKit.JsonToString(Json j);"
           ]
         }
@@ -53503,7 +53270,6 @@
             "procedure CloseLogProcess()"
           ],
           "csharp": [
-            "public static void Logging.CloseLogProcess();",
             "public static void SplashKit.CloseLogProcess();"
           ]
         }
@@ -53555,7 +53321,6 @@
             "procedure InitCustomLogger(mode: LogMode)"
           ],
           "csharp": [
-            "public static void Logging.InitCustomLogger(LogMode mode);",
             "public static void SplashKit.InitCustomLogger(LogMode mode);"
           ]
         }
@@ -53634,7 +53399,6 @@
             "procedure InitCustomLogger(appName: String; overridePrevLog: Boolean; mode: LogMode)"
           ],
           "csharp": [
-            "public static void Logging.InitCustomLogger(string appName, bool overridePrevLog, LogMode mode);",
             "public static void SplashKit.InitCustomLogger(string appName, bool overridePrevLog, LogMode mode);"
           ]
         }
@@ -53699,7 +53463,6 @@
             "procedure Log(level: LogLevel; message: String)"
           ],
           "csharp": [
-            "public static void Logging.Log(LogLevel level, string message);",
             "public static void SplashKit.Log(LogLevel level, string message);"
           ]
         }
@@ -53809,7 +53572,6 @@
             "function AcceptAllNewConnections(): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.AcceptAllNewConnections();",
             "public static bool SplashKit.AcceptAllNewConnections();"
           ]
         }
@@ -53985,7 +53747,6 @@
             "procedure BroadcastMessage(const aMsg: String)"
           ],
           "csharp": [
-            "public static void Networking.BroadcastMessage(string aMsg);",
             "public static void SplashKit.BroadcastMessage(string aMsg);"
           ]
         }
@@ -54051,7 +53812,6 @@
             "procedure BroadcastMessage(const aMsg: String; const name: String)"
           ],
           "csharp": [
-            "public static void Networking.BroadcastMessage(string aMsg, string name);",
             "public static void SplashKit.BroadcastMessage(string aMsg, string name);"
           ]
         }
@@ -54090,7 +53850,6 @@
             "procedure CheckNetworkActivity()"
           ],
           "csharp": [
-            "public static void Networking.CheckNetworkActivity();",
             "public static void SplashKit.CheckNetworkActivity();"
           ]
         }
@@ -54143,7 +53902,6 @@
             "procedure ClearMessages(const name: String)"
           ],
           "csharp": [
-            "public static void Networking.ClearMessages(string name);",
             "public static void SplashKit.ClearMessages(string name);"
           ]
         }
@@ -54294,7 +54052,6 @@
             "procedure CloseAllConnections()"
           ],
           "csharp": [
-            "public static void Networking.CloseAllConnections();",
             "public static void SplashKit.CloseAllConnections();"
           ]
         }
@@ -54333,7 +54090,6 @@
             "procedure CloseAllServers()"
           ],
           "csharp": [
-            "public static void Networking.CloseAllServers();",
             "public static void SplashKit.CloseAllServers();"
           ]
         }
@@ -54389,7 +54145,7 @@
             "function CloseConnection(aConnection: Connection): Boolean"
           ],
           "csharp": [
-            "public bool Connection.CloseConnection();",
+            "public bool Connection.Close();",
             "public static bool SplashKit.CloseConnection(Connection aConnection);"
           ]
         }
@@ -54442,7 +54198,6 @@
             "function CloseConnection(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.CloseConnection(string name);",
             "public static bool SplashKit.CloseConnection(string name);"
           ]
         }
@@ -54498,7 +54253,7 @@
             "procedure CloseMessage(msg: Message)"
           ],
           "csharp": [
-            "public void Message.CloseMessage();",
+            "public void Message.Close();",
             "public static void SplashKit.CloseMessage(Message msg);"
           ]
         }
@@ -54551,7 +54306,6 @@
             "function CloseServer(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.CloseServer(string name);",
             "public static bool SplashKit.CloseServer(string name);"
           ]
         }
@@ -54607,7 +54361,7 @@
             "function CloseServer(svr: ServerSocket): Boolean"
           ],
           "csharp": [
-            "public bool ServerSocket.CloseServer();",
+            "public bool ServerSocket.Close();",
             "public static bool SplashKit.CloseServer(ServerSocket svr);"
           ]
         }
@@ -54660,7 +54414,6 @@
             "function ConnectionCount(const name: String): Cardinal"
           ],
           "csharp": [
-            "public static uint Networking.ConnectionCount(string name);",
             "public static uint SplashKit.ConnectionCount(string name);"
           ]
         }
@@ -54823,7 +54576,6 @@
             "function ConnectionIP(const name: String): Cardinal"
           ],
           "csharp": [
-            "public static uint Networking.ConnectionIP(string name);",
             "public static uint SplashKit.ConnectionIP(string name);"
           ]
         }
@@ -54875,7 +54627,6 @@
             "function ConnectionNamed(const name: String): Connection"
           ],
           "csharp": [
-            "public static Connection Networking.ConnectionNamed(string name);",
             "public static Connection SplashKit.ConnectionNamed(string name);"
           ]
         }
@@ -54983,7 +54734,6 @@
             "function ConnectionPort(const name: String): Word"
           ],
           "csharp": [
-            "public static ushort Networking.ConnectionPort(string name);",
             "public static ushort SplashKit.ConnectionPort(string name);"
           ]
         }
@@ -55184,7 +54934,6 @@
             "function DecToHex(aDec: Cardinal): String"
           ],
           "csharp": [
-            "public static string Networking.DecToHex(uint aDec);",
             "public static string SplashKit.DecToHex(uint aDec);"
           ]
         }
@@ -55291,7 +55040,6 @@
             "function HasConnection(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.HasConnection(string name);",
             "public static bool SplashKit.HasConnection(string name);"
           ]
         }
@@ -55440,7 +55188,6 @@
             "function HasMessages(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.HasMessages(string name);",
             "public static bool SplashKit.HasMessages(string name);"
           ]
         }
@@ -55535,7 +55282,6 @@
             "function HasNewConnections(): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.HasNewConnections();",
             "public static bool SplashKit.HasNewConnections();"
           ]
         }
@@ -55587,7 +55333,6 @@
             "function HasServer(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.HasServer(string name);",
             "public static bool SplashKit.HasServer(string name);"
           ]
         }
@@ -55639,7 +55384,6 @@
             "function HexStrToIpv4(const aHex: String): String"
           ],
           "csharp": [
-            "public static string Networking.HexStrToIpv4(string aHex);",
             "public static string SplashKit.HexStrToIpv4(string aHex);"
           ]
         }
@@ -55691,7 +55435,6 @@
             "function HexToDecString(const aHex: String): String"
           ],
           "csharp": [
-            "public static string Networking.HexToDecString(string aHex);",
             "public static string SplashKit.HexToDecString(string aHex);"
           ]
         }
@@ -55743,7 +55486,6 @@
             "function Ipv4ToDec(const aIP: String): Cardinal"
           ],
           "csharp": [
-            "public static uint Networking.Ipv4ToDec(string aIP);",
             "public static uint SplashKit.Ipv4ToDec(string aIP);"
           ]
         }
@@ -55795,7 +55537,6 @@
             "function Ipv4ToHex(const aIP: String): String"
           ],
           "csharp": [
-            "public static string Networking.Ipv4ToHex(string aIP);",
             "public static string SplashKit.Ipv4ToHex(string aIP);"
           ]
         }
@@ -55847,7 +55588,6 @@
             "function Ipv4ToStr(ip: Cardinal): String"
           ],
           "csharp": [
-            "public static string Networking.Ipv4ToStr(uint ip);",
             "public static string SplashKit.Ipv4ToStr(uint ip);"
           ]
         }
@@ -55955,7 +55695,6 @@
             "function IsConnectionOpen(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.IsConnectionOpen(string name);",
             "public static bool SplashKit.IsConnectionOpen(string name);"
           ]
         }
@@ -56008,7 +55747,6 @@
             "function LastConnection(const name: String): Connection"
           ],
           "csharp": [
-            "public static Connection Networking.LastConnection(string name);",
             "public static Connection SplashKit.LastConnection(string name);"
           ]
         }
@@ -56115,7 +55853,6 @@
             "function MessageConnection(msg: Message): Connection"
           ],
           "csharp": [
-            "public static Connection Networking.MessageConnection(Message msg);",
             "public static Connection SplashKit.MessageConnection(Message msg);"
           ]
         }
@@ -56280,7 +56017,6 @@
             "function MessageCount(const name: String): Cardinal"
           ],
           "csharp": [
-            "public static uint Networking.MessageCount(string name);",
             "public static uint SplashKit.MessageCount(string name);"
           ]
         }
@@ -56594,7 +56330,6 @@
             "function MyIP(): String"
           ],
           "csharp": [
-            "public static string Networking.MyIP();",
             "public static string SplashKit.MyIP();"
           ]
         }
@@ -56659,7 +56394,6 @@
             "function NameForConnection(host: String; port: Cardinal): String"
           ],
           "csharp": [
-            "public static string Networking.NameForConnection(string host, uint port);",
             "public static string SplashKit.NameForConnection(string host, uint port);"
           ]
         }
@@ -56927,7 +56661,6 @@
             "function ReadMessage(): Message"
           ],
           "csharp": [
-            "public static Message Networking.ReadMessage();",
             "public static Message SplashKit.ReadMessage();"
           ]
         }
@@ -57036,7 +56769,6 @@
             "function ReadMessage(const name: String): Message"
           ],
           "csharp": [
-            "public static Message Networking.ReadMessage(string name);",
             "public static Message SplashKit.ReadMessage(string name);"
           ]
         }
@@ -57145,7 +56877,6 @@
             "function ReadMessageData(const name: String): String"
           ],
           "csharp": [
-            "public static string Networking.ReadMessageData(string name);",
             "public static string SplashKit.ReadMessageData(string name);"
           ]
         }
@@ -57365,7 +57096,6 @@
             "procedure Reconnect(const name: String)"
           ],
           "csharp": [
-            "public static void Networking.Reconnect(string name);",
             "public static void SplashKit.Reconnect(string name);"
           ]
         }
@@ -57404,7 +57134,6 @@
             "procedure ReleaseAllConnections()"
           ],
           "csharp": [
-            "public static void Networking.ReleaseAllConnections();",
             "public static void SplashKit.ReleaseAllConnections();"
           ]
         }
@@ -57525,7 +57254,6 @@
             "function RetrieveConnection(const name: String; idx: Integer): Connection"
           ],
           "csharp": [
-            "public static Connection Networking.RetrieveConnection(string name, int idx);",
             "public static Connection SplashKit.RetrieveConnection(string name, int idx);"
           ]
         }
@@ -57662,7 +57390,7 @@
             "function SendMessageTo(const aMsg: String; aConnection: Connection): Boolean"
           ],
           "csharp": [
-            "public bool Connection.SendMessageTo(string aMsg);",
+            "public bool Connection.SendMessage(string aMsg);",
             "public static bool SplashKit.SendMessageTo(string aMsg, Connection aConnection);"
           ]
         }
@@ -57728,7 +57456,6 @@
             "function SendMessageTo(const aMsg: String; const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.SendMessageTo(string aMsg, string name);",
             "public static bool SplashKit.SendMessageTo(string aMsg, string name);"
           ]
         }
@@ -57781,7 +57508,6 @@
             "function ServerHasNewConnection(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Networking.ServerHasNewConnection(string name);",
             "public static bool SplashKit.ServerHasNewConnection(string name);"
           ]
         }
@@ -57888,7 +57614,6 @@
             "function ServerNamed(const name: String): ServerSocket"
           ],
           "csharp": [
-            "public static ServerSocket Networking.ServerNamed(string name);",
             "public static ServerSocket SplashKit.ServerNamed(string name);"
           ]
         }
@@ -58340,7 +58065,7 @@
             "procedure FreeResponse(response: HttpResponse)"
           ],
           "csharp": [
-            "public void HttpResponse.FreeResponse();",
+            "public void HttpResponse.Free();",
             "public static void SplashKit.FreeResponse(HttpResponse response);"
           ]
         }
@@ -59404,7 +59129,7 @@
             "function RequestHasQueryParameter(r: HttpRequest; const name: String): Boolean"
           ],
           "csharp": [
-            "public bool HttpRequest.RequestHasQueryParameter(string name);",
+            "public bool HttpRequest.HasQueryParameter(string name);",
             "public static bool SplashKit.RequestHasQueryParameter(HttpRequest r, string name);"
           ]
         }
@@ -59595,7 +59320,7 @@
             "function RequestQueryParameter(r: HttpRequest; const name: String; const defaultValue: String): String"
           ],
           "csharp": [
-            "public string HttpRequest.RequestQueryParameter(string name, string defaultValue);",
+            "public string HttpRequest.QueryParameter(string name, string defaultValue);",
             "public static string SplashKit.RequestQueryParameter(HttpRequest r, string name, string defaultValue);"
           ]
         }
@@ -60644,7 +60369,6 @@
             "function SplitURIStubs(const uri: String): ArrayOfString"
           ],
           "csharp": [
-            "public static List<string> WebServer.SplitURIStubs(string uri);",
             "public static List<string> SplashKit.SplitURIStubs(string uri);"
           ]
         }
@@ -60796,7 +60520,7 @@
             "procedure StopWebServer(server: WebServer)"
           ],
           "csharp": [
-            "public void WebServer.StopWebServer();",
+            "public void WebServer.Stop();",
             "public static void SplashKit.StopWebServer(WebServer server);"
           ]
         }
@@ -61044,7 +60768,7 @@
             "function BitmapCircleCollision(bmp: Bitmap; const pt: Point2D; const circ: Circle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapCircleCollision(Point2D pt, Circle circ);",
+            "public bool Bitmap.CircleCollision(Point2D pt, Circle circ);",
             "public static bool SplashKit.BitmapCircleCollision(Bitmap bmp, Point2D pt, Circle circ);"
           ]
         }
@@ -61138,7 +60862,7 @@
             "function BitmapCircleCollision(bmp: Bitmap; x: Double; y: Double; const circ: Circle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapCircleCollision(double x, double y, Circle circ);",
+            "public bool Bitmap.CircleCollision(double x, double y, Circle circ);",
             "public static bool SplashKit.BitmapCircleCollision(Bitmap bmp, double x, double y, Circle circ);"
           ]
         }
@@ -61233,7 +60957,7 @@
             "function BitmapCircleCollision(bmp: Bitmap; cell: Integer; const translation: Matrix2D; const circ: Circle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapCircleCollision(int cell, Matrix2D translation, Circle circ);",
+            "public bool Bitmap.CircleCollision(int cell, Matrix2D translation, Circle circ);",
             "public static bool SplashKit.BitmapCircleCollision(Bitmap bmp, int cell, Matrix2D translation, Circle circ);"
           ]
         }
@@ -61328,7 +61052,7 @@
             "function BitmapCircleCollision(bmp: Bitmap; cell: Integer; const pt: Point2D; const circ: Circle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapCircleCollision(int cell, Point2D pt, Circle circ);",
+            "public bool Bitmap.CircleCollision(int cell, Point2D pt, Circle circ);",
             "public static bool SplashKit.BitmapCircleCollision(Bitmap bmp, int cell, Point2D pt, Circle circ);"
           ]
         }
@@ -61436,7 +61160,7 @@
             "function BitmapCircleCollision(bmp: Bitmap; cell: Integer; x: Double; y: Double; const circ: Circle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapCircleCollision(int cell, double x, double y, Circle circ);",
+            "public bool Bitmap.CircleCollision(int cell, double x, double y, Circle circ);",
             "public static bool SplashKit.BitmapCircleCollision(Bitmap bmp, int cell, double x, double y, Circle circ);"
           ]
         }
@@ -62122,7 +61846,7 @@
             "function BitmapPointCollision(bmp: Bitmap; const translation: Matrix2D; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(Matrix2D translation, Point2D pt);",
+            "public bool Bitmap.PointCollision(Matrix2D translation, Point2D pt);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, Matrix2D translation, Point2D pt);"
           ]
         }
@@ -62204,7 +61928,7 @@
             "function BitmapPointCollision(bmp: Bitmap; const bmpPt: Point2D; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(Point2D bmpPt, Point2D pt);",
+            "public bool Bitmap.PointCollision(Point2D bmpPt, Point2D pt);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, Point2D bmpPt, Point2D pt);"
           ]
         }
@@ -62311,7 +62035,7 @@
             "function BitmapPointCollision(bmp: Bitmap; bmpX: Double; bmpY: Double; x: Double; y: Double): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(double bmpX, double bmpY, double x, double y);",
+            "public bool Bitmap.PointCollision(double bmpX, double bmpY, double x, double y);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, double bmpX, double bmpY, double x, double y);"
           ]
         }
@@ -62406,7 +62130,7 @@
             "function BitmapPointCollision(bmp: Bitmap; cell: Integer; const translation: Matrix2D; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(int cell, Matrix2D translation, Point2D pt);",
+            "public bool Bitmap.PointCollision(int cell, Matrix2D translation, Point2D pt);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, int cell, Matrix2D translation, Point2D pt);"
           ]
         }
@@ -62501,7 +62225,7 @@
             "function BitmapPointCollision(bmp: Bitmap; cell: Integer; const bmpPt: Point2D; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(int cell, Point2D bmpPt, Point2D pt);",
+            "public bool Bitmap.PointCollision(int cell, Point2D bmpPt, Point2D pt);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, int cell, Point2D bmpPt, Point2D pt);"
           ]
         }
@@ -62622,7 +62346,7 @@
             "function BitmapPointCollision(bmp: Bitmap; cell: Integer; bmpX: Double; bmpY: Double; x: Double; y: Double): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapPointCollision(int cell, double bmpX, double bmpY, double x, double y);",
+            "public bool Bitmap.PointCollision(int cell, double bmpX, double bmpY, double x, double y);",
             "public static bool SplashKit.BitmapPointCollision(Bitmap bmp, int cell, double bmpX, double bmpY, double x, double y);"
           ]
         }
@@ -62704,7 +62428,7 @@
             "function BitmapRectangleCollision(bmp: Bitmap; const pt: Point2D; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapRectangleCollision(Point2D pt, Rectangle rect);",
+            "public bool Bitmap.RectangleCollision(Point2D pt, Rectangle rect);",
             "public static bool SplashKit.BitmapRectangleCollision(Bitmap bmp, Point2D pt, Rectangle rect);"
           ]
         }
@@ -62798,7 +62522,7 @@
             "function BitmapRectangleCollision(bmp: Bitmap; x: Double; y: Double; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapRectangleCollision(double x, double y, Rectangle rect);",
+            "public bool Bitmap.RectangleCollision(double x, double y, Rectangle rect);",
             "public static bool SplashKit.BitmapRectangleCollision(Bitmap bmp, double x, double y, Rectangle rect);"
           ]
         }
@@ -62893,7 +62617,7 @@
             "function BitmapRectangleCollision(bmp: Bitmap; cell: Integer; const translation: Matrix2D; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapRectangleCollision(int cell, Matrix2D translation, Rectangle rect);",
+            "public bool Bitmap.RectangleCollision(int cell, Matrix2D translation, Rectangle rect);",
             "public static bool SplashKit.BitmapRectangleCollision(Bitmap bmp, int cell, Matrix2D translation, Rectangle rect);"
           ]
         }
@@ -62988,7 +62712,7 @@
             "function BitmapRectangleCollision(bmp: Bitmap; cell: Integer; const pt: Point2D; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapRectangleCollision(int cell, Point2D pt, Rectangle rect);",
+            "public bool Bitmap.RectangleCollision(int cell, Point2D pt, Rectangle rect);",
             "public static bool SplashKit.BitmapRectangleCollision(Bitmap bmp, int cell, Point2D pt, Rectangle rect);"
           ]
         }
@@ -63096,7 +62820,7 @@
             "function BitmapRectangleCollision(bmp: Bitmap; cell: Integer; x: Double; y: Double; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Bitmap.BitmapRectangleCollision(int cell, double x, double y, Rectangle rect);",
+            "public bool Bitmap.RectangleCollision(int cell, double x, double y, Rectangle rect);",
             "public static bool SplashKit.BitmapRectangleCollision(Bitmap bmp, int cell, double x, double y, Rectangle rect);"
           ]
         }
@@ -63190,7 +62914,7 @@
             "function SpriteBitmapCollision(s: Sprite; bmp: Bitmap; x: Double; y: Double): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteBitmapCollision(Bitmap bmp, double x, double y);",
+            "public bool Sprite.BitmapCollision(Bitmap bmp, double x, double y);",
             "public static bool SplashKit.SpriteBitmapCollision(Sprite s, Bitmap bmp, double x, double y);"
           ]
         }
@@ -63285,7 +63009,7 @@
             "function SpriteBitmapCollision(s: Sprite; bmp: Bitmap; cell: Integer; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteBitmapCollision(Bitmap bmp, int cell, Point2D pt);",
+            "public bool Sprite.BitmapCollision(Bitmap bmp, int cell, Point2D pt);",
             "public static bool SplashKit.SpriteBitmapCollision(Sprite s, Bitmap bmp, int cell, Point2D pt);"
           ]
         }
@@ -63393,7 +63117,7 @@
             "function SpriteBitmapCollision(s: Sprite; bmp: Bitmap; cell: Integer; x: Double; y: Double): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteBitmapCollision(Bitmap bmp, int cell, double x, double y);",
+            "public bool Sprite.BitmapCollision(Bitmap bmp, int cell, double x, double y);",
             "public static bool SplashKit.SpriteBitmapCollision(Sprite s, Bitmap bmp, int cell, double x, double y);"
           ]
         }
@@ -63529,7 +63253,7 @@
             "function SpritePointCollision(s: Sprite; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpritePointCollision(Point2D pt);",
+            "public bool Sprite.PointCollision(Point2D pt);",
             "public static bool SplashKit.SpritePointCollision(Sprite s, Point2D pt);"
           ]
         }
@@ -63597,7 +63321,7 @@
             "function SpriteRectangleCollision(s: Sprite; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteRectangleCollision(Rectangle rect);",
+            "public bool Sprite.RectangleCollision(Rectangle rect);",
             "public static bool SplashKit.SpriteRectangleCollision(Sprite s, Rectangle rect);"
           ]
         }
@@ -63663,7 +63387,6 @@
             "procedure ApplyMatrix(const matrix: Matrix2D; var q: Quad)"
           ],
           "csharp": [
-            "public static void Matrix2D.ApplyMatrix(Matrix2D matrix, ref Quad q);",
             "public static void SplashKit.ApplyMatrix(Matrix2D matrix, ref Quad q);"
           ]
         }
@@ -63729,7 +63452,6 @@
             "procedure ApplyMatrix(const m: Matrix2D; var tri: Triangle)"
           ],
           "csharp": [
-            "public static void Matrix2D.ApplyMatrix(Matrix2D m, ref Triangle tri);",
             "public static void SplashKit.ApplyMatrix(Matrix2D m, ref Triangle tri);"
           ]
         }
@@ -63768,7 +63490,6 @@
             "function IdentityMatrix(): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.IdentityMatrix();",
             "public static Matrix2D SplashKit.IdentityMatrix();"
           ]
         }
@@ -63820,7 +63541,6 @@
             "function MatrixInverse(const m: Matrix2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.MatrixInverse(Matrix2D m);",
             "public static Matrix2D SplashKit.MatrixInverse(Matrix2D m);"
           ]
         }
@@ -63886,7 +63606,6 @@
             "function MatrixMultiply(const m: Matrix2D; const pt: Point2D): Point2D"
           ],
           "csharp": [
-            "public static Point2D Matrix2D.MatrixMultiply(Matrix2D m, Point2D pt);",
             "public static Point2D SplashKit.MatrixMultiply(Matrix2D m, Point2D pt);"
           ]
         }
@@ -63952,7 +63671,6 @@
             "function MatrixMultiply(const m1: Matrix2D; const m2: Matrix2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.MatrixMultiply(Matrix2D m1, Matrix2D m2);",
             "public static Matrix2D SplashKit.MatrixMultiply(Matrix2D m1, Matrix2D m2);"
           ]
         }
@@ -64018,7 +63736,6 @@
             "function MatrixMultiply(const m: Matrix2D; const v: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Matrix2D.MatrixMultiply(Matrix2D m, Vector2D v);",
             "public static Vector2D SplashKit.MatrixMultiply(Matrix2D m, Vector2D v);"
           ]
         }
@@ -64070,7 +63787,6 @@
             "function MatrixToString(const matrix: Matrix2D): String"
           ],
           "csharp": [
-            "public static string Matrix2D.MatrixToString(Matrix2D matrix);",
             "public static string SplashKit.MatrixToString(Matrix2D matrix);"
           ]
         }
@@ -64122,7 +63838,6 @@
             "function RotationMatrix(deg: Double): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.RotationMatrix(double deg);",
             "public static Matrix2D SplashKit.RotationMatrix(double deg);"
           ]
         }
@@ -64175,7 +63890,6 @@
             "function ScaleMatrix(const scale: Point2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.ScaleMatrix(Point2D scale);",
             "public static Matrix2D SplashKit.ScaleMatrix(Point2D scale);"
           ]
         }
@@ -64228,7 +63942,6 @@
             "function ScaleMatrix(const scale: Vector2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.ScaleMatrix(Vector2D scale);",
             "public static Matrix2D SplashKit.ScaleMatrix(Vector2D scale);"
           ]
         }
@@ -64280,7 +63993,6 @@
             "function ScaleMatrix(scale: Double): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.ScaleMatrix(double scale);",
             "public static Matrix2D SplashKit.ScaleMatrix(double scale);"
           ]
         }
@@ -64358,7 +64070,6 @@
             "function ScaleRotateTranslateMatrix(const scale: Point2D; deg: Double; const translate: Point2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.ScaleRotateTranslateMatrix(Point2D scale, double deg, Point2D translate);",
             "public static Matrix2D SplashKit.ScaleRotateTranslateMatrix(Point2D scale, double deg, Point2D translate);"
           ]
         }
@@ -64411,7 +64122,6 @@
             "function TranslationMatrix(const pt: Point2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.TranslationMatrix(Point2D pt);",
             "public static Matrix2D SplashKit.TranslationMatrix(Point2D pt);"
           ]
         }
@@ -64464,7 +64174,6 @@
             "function TranslationMatrix(const pt: Vector2D): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.TranslationMatrix(Vector2D pt);",
             "public static Matrix2D SplashKit.TranslationMatrix(Vector2D pt);"
           ]
         }
@@ -64529,7 +64238,6 @@
             "function TranslationMatrix(dx: Double; dy: Double): Matrix2D"
           ],
           "csharp": [
-            "public static Matrix2D Matrix2D.TranslationMatrix(double dx, double dy);",
             "public static Matrix2D SplashKit.TranslationMatrix(double dx, double dy);"
           ]
         }
@@ -64594,7 +64302,6 @@
             "function AngleBetween(const v1: Vector2D; const v2: Vector2D): Double"
           ],
           "csharp": [
-            "public static double Vector2D.AngleBetween(Vector2D v1, Vector2D v2);",
             "public static double SplashKit.AngleBetween(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -64659,7 +64366,6 @@
             "function DotProduct(const v1: Vector2D; const v2: Vector2D): Double"
           ],
           "csharp": [
-            "public static double Vector2D.DotProduct(Vector2D v1, Vector2D v2);",
             "public static double SplashKit.DotProduct(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -64711,7 +64417,6 @@
             "function IsZeroVector(const v: Vector2D): Boolean"
           ],
           "csharp": [
-            "public static bool Vector2D.IsZeroVector(Vector2D v);",
             "public static bool SplashKit.IsZeroVector(Vector2D v);"
           ]
         }
@@ -64802,7 +64507,6 @@
             "function RayIntersectionPoint(const fromPt: Point2D; const heading: Vector2D; const l: Line; var pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Vector2D.RayIntersectionPoint(Point2D fromPt, Vector2D heading, Line l, ref Point2D pt);",
             "public static bool SplashKit.RayIntersectionPoint(Point2D fromPt, Vector2D heading, Line l, ref Point2D pt);"
           ]
         }
@@ -64854,7 +64558,6 @@
             "function UnitVector(const v: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.UnitVector(Vector2D v);",
             "public static Vector2D SplashKit.UnitVector(Vector2D v);"
           ]
         }
@@ -64919,7 +64622,6 @@
             "function VectorAdd(const v1: Vector2D; const v2: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorAdd(Vector2D v1, Vector2D v2);",
             "public static Vector2D SplashKit.VectorAdd(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -64971,7 +64673,6 @@
             "function VectorAngle(v: Vector2D): Double"
           ],
           "csharp": [
-            "public static double Vector2D.VectorAngle(Vector2D v);",
             "public static double SplashKit.VectorAngle(Vector2D v);"
           ]
         }
@@ -65036,7 +64737,6 @@
             "function VectorFromAngle(angle: Double; magnitude: Double): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorFromAngle(double angle, double magnitude);",
             "public static Vector2D SplashKit.VectorFromAngle(double angle, double magnitude);"
           ]
         }
@@ -65088,7 +64788,6 @@
             "function VectorFromLine(const l: Line): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorFromLine(Line l);",
             "public static Vector2D SplashKit.VectorFromLine(Line l);"
           ]
         }
@@ -65153,7 +64852,6 @@
             "function VectorFromPointToRect(const pt: Point2D; const rect: Rectangle): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorFromPointToRect(Point2D pt, Rectangle rect);",
             "public static Vector2D SplashKit.VectorFromPointToRect(Point2D pt, Rectangle rect);"
           ]
         }
@@ -65218,7 +64916,6 @@
             "function VectorInRect(const v: Vector2D; const rect: Rectangle): Boolean"
           ],
           "csharp": [
-            "public static bool Vector2D.VectorInRect(Vector2D v, Rectangle rect);",
             "public static bool SplashKit.VectorInRect(Vector2D v, Rectangle rect);"
           ]
         }
@@ -65270,7 +64967,6 @@
             "function VectorInvert(const v: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorInvert(Vector2D v);",
             "public static Vector2D SplashKit.VectorInvert(Vector2D v);"
           ]
         }
@@ -65335,7 +65031,6 @@
             "function VectorLimit(const v: Vector2D; limit: Double): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorLimit(Vector2D v, double limit);",
             "public static Vector2D SplashKit.VectorLimit(Vector2D v, double limit);"
           ]
         }
@@ -65387,7 +65082,6 @@
             "function VectorMagnitude(const v: Vector2D): Double"
           ],
           "csharp": [
-            "public static double Vector2D.VectorMagnitude(Vector2D v);",
             "public static double SplashKit.VectorMagnitude(Vector2D v);"
           ]
         }
@@ -65439,7 +65133,6 @@
             "function VectorMagnitudeSquared(const v: Vector2D): Double"
           ],
           "csharp": [
-            "public static double Vector2D.VectorMagnitudeSquared(Vector2D v);",
             "public static double SplashKit.VectorMagnitudeSquared(Vector2D v);"
           ]
         }
@@ -65504,7 +65197,6 @@
             "function VectorMultiply(const v1: Vector2D; s: Double): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorMultiply(Vector2D v1, double s);",
             "public static Vector2D SplashKit.VectorMultiply(Vector2D v1, double s);"
           ]
         }
@@ -65556,7 +65248,6 @@
             "function VectorNormal(const v: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorNormal(Vector2D v);",
             "public static Vector2D SplashKit.VectorNormal(Vector2D v);"
           ]
         }
@@ -65634,7 +65325,6 @@
             "function VectorOutOfCircleFromCircle(const src: Circle; const bounds: Circle; const velocity: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorOutOfCircleFromCircle(Circle src, Circle bounds, Vector2D velocity);",
             "public static Vector2D SplashKit.VectorOutOfCircleFromCircle(Circle src, Circle bounds, Vector2D velocity);"
           ]
         }
@@ -65712,7 +65402,6 @@
             "function VectorOutOfCircleFromPoint(const pt: Point2D; const c: Circle; const velocity: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorOutOfCircleFromPoint(Point2D pt, Circle c, Vector2D velocity);",
             "public static Vector2D SplashKit.VectorOutOfCircleFromPoint(Point2D pt, Circle c, Vector2D velocity);"
           ]
         }
@@ -65790,7 +65479,6 @@
             "function VectorOutOfRectFromCircle(const c: Circle; const rect: Rectangle; const velocity: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorOutOfRectFromCircle(Circle c, Rectangle rect, Vector2D velocity);",
             "public static Vector2D SplashKit.VectorOutOfRectFromCircle(Circle c, Rectangle rect, Vector2D velocity);"
           ]
         }
@@ -65868,7 +65556,6 @@
             "function VectorOutOfRectFromPoint(const pt: Point2D; const rect: Rectangle; const velocity: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorOutOfRectFromPoint(Point2D pt, Rectangle rect, Vector2D velocity);",
             "public static Vector2D SplashKit.VectorOutOfRectFromPoint(Point2D pt, Rectangle rect, Vector2D velocity);"
           ]
         }
@@ -65946,7 +65633,6 @@
             "function VectorOutOfRectFromRect(const src: Rectangle; const bounds: Rectangle; const velocity: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorOutOfRectFromRect(Rectangle src, Rectangle bounds, Vector2D velocity);",
             "public static Vector2D SplashKit.VectorOutOfRectFromRect(Rectangle src, Rectangle bounds, Vector2D velocity);"
           ]
         }
@@ -66011,7 +65697,6 @@
             "function VectorPointToPoint(const start: Point2D; const endPt: Point2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorPointToPoint(Point2D start, Point2D endPt);",
             "public static Vector2D SplashKit.VectorPointToPoint(Point2D start, Point2D endPt);"
           ]
         }
@@ -66076,7 +65761,6 @@
             "function VectorSubtract(const v1: Vector2D; const v2: Vector2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorSubtract(Vector2D v1, Vector2D v2);",
             "public static Vector2D SplashKit.VectorSubtract(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -66129,7 +65813,6 @@
             "function VectorTo(const p1: Point2D): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorTo(Point2D p1);",
             "public static Vector2D SplashKit.VectorTo(Point2D p1);"
           ]
         }
@@ -66194,7 +65877,6 @@
             "function VectorTo(x: Double; y: Double): Vector2D"
           ],
           "csharp": [
-            "public static Vector2D Vector2D.VectorTo(double x, double y);",
             "public static Vector2D SplashKit.VectorTo(double x, double y);"
           ]
         }
@@ -66246,7 +65928,6 @@
             "function VectorToString(const v: Vector2D): String"
           ],
           "csharp": [
-            "public static string Vector2D.VectorToString(Vector2D v);",
             "public static string SplashKit.VectorToString(Vector2D v);"
           ]
         }
@@ -66311,7 +65992,6 @@
             "function VectorsEqual(const v1: Vector2D; v2: Vector2D): Boolean"
           ],
           "csharp": [
-            "public static bool Vector2D.VectorsEqual(Vector2D v1, Vector2D v2);",
             "public static bool SplashKit.VectorsEqual(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -66376,7 +66056,6 @@
             "function VectorsNotEqual(const v1: Vector2D; v2: Vector2D): Boolean"
           ],
           "csharp": [
-            "public static bool Vector2D.VectorsNotEqual(Vector2D v1, Vector2D v2);",
             "public static bool SplashKit.VectorsNotEqual(Vector2D v1, Vector2D v2);"
           ]
         }
@@ -66468,7 +66147,6 @@
             "function HasGpio(): Boolean"
           ],
           "csharp": [
-            "public static bool Raspberry.HasGpio();",
             "public static bool SplashKit.HasGpio();"
           ]
         }
@@ -66507,7 +66185,6 @@
             "procedure RaspiCleanup()"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiCleanup();",
             "public static void SplashKit.RaspiCleanup();"
           ]
         }
@@ -66559,7 +66236,6 @@
             "function RaspiGetMode(pin: Pins): PinModes"
           ],
           "csharp": [
-            "public static PinModes Raspberry.RaspiGetMode(Pins pin);",
             "public static PinModes SplashKit.RaspiGetMode(Pins pin);"
           ]
         }
@@ -66598,7 +66274,6 @@
             "procedure RaspiInit()"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiInit();",
             "public static void SplashKit.RaspiInit();"
           ]
         }
@@ -66650,7 +66325,6 @@
             "function RaspiRead(pin: Pins): PinValues"
           ],
           "csharp": [
-            "public static PinValues Raspberry.RaspiRead(Pins pin);",
             "public static PinValues SplashKit.RaspiRead(Pins pin);"
           ]
         }
@@ -66715,7 +66389,6 @@
             "procedure RaspiSetMode(pin: Pins; mode: PinModes)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiSetMode(Pins pin, PinModes mode);",
             "public static void SplashKit.RaspiSetMode(Pins pin, PinModes mode);"
           ]
         }
@@ -66780,7 +66453,6 @@
             "procedure RaspiSetPullUpDown(pin: Pins; pud: PullUpDown)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiSetPullUpDown(Pins pin, PullUpDown pud);",
             "public static void SplashKit.RaspiSetPullUpDown(Pins pin, PullUpDown pud);"
           ]
         }
@@ -66845,7 +66517,6 @@
             "procedure RaspiSetPwmDutycycle(pin: Pins; dutycycle: Integer)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiSetPwmDutycycle(Pins pin, int dutycycle);",
             "public static void SplashKit.RaspiSetPwmDutycycle(Pins pin, int dutycycle);"
           ]
         }
@@ -66910,7 +66581,6 @@
             "procedure RaspiSetPwmFrequency(pin: Pins; frequency: Integer)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiSetPwmFrequency(Pins pin, int frequency);",
             "public static void SplashKit.RaspiSetPwmFrequency(Pins pin, int frequency);"
           ]
         }
@@ -66975,7 +66645,6 @@
             "procedure RaspiSetPwmRange(pin: Pins; range: Integer)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiSetPwmRange(Pins pin, int range);",
             "public static void SplashKit.RaspiSetPwmRange(Pins pin, int range);"
           ]
         }
@@ -67040,7 +66709,6 @@
             "procedure RaspiWrite(pin: Pins; value: PinValues)"
           ],
           "csharp": [
-            "public static void Raspberry.RaspiWrite(Pins pin, PinValues value);",
             "public static void SplashKit.RaspiWrite(Pins pin, PinValues value);"
           ]
         }
@@ -67110,7 +66778,6 @@
             "procedure FreeResourceBundle(name: String)"
           ],
           "csharp": [
-            "public static void ResourceBundle.FreeResourceBundle(string name);",
             "public static void SplashKit.FreeResourceBundle(string name);"
           ]
         }
@@ -67162,7 +66829,6 @@
             "function HasResourceBundle(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool ResourceBundle.HasResourceBundle(string name);",
             "public static bool SplashKit.HasResourceBundle(string name);"
           ]
         }
@@ -67227,7 +66893,6 @@
             "procedure LoadResourceBundle(const name: String; const filename: String)"
           ],
           "csharp": [
-            "public static void ResourceBundle.LoadResourceBundle(string name, string filename);",
             "public static void SplashKit.LoadResourceBundle(string name, string filename);"
           ]
         }
@@ -67297,7 +66962,6 @@
             "procedure DeregisterFreeNotifier(handler: FreeNotifier)"
           ],
           "csharp": [
-            "public static void Resources.DeregisterFreeNotifier(FreeNotifier handler);",
             "public static void SplashKit.DeregisterFreeNotifier(FreeNotifier handler);"
           ]
         }
@@ -67362,7 +67026,6 @@
             "function PathToResource(const filename: String; kind: ResourceKind): String"
           ],
           "csharp": [
-            "public static string Resources.PathToResource(string filename, ResourceKind kind);",
             "public static string SplashKit.PathToResource(string filename, ResourceKind kind);"
           ]
         }
@@ -67401,7 +67064,6 @@
             "function PathToResources(): String"
           ],
           "csharp": [
-            "public static string Resources.PathToResources();",
             "public static string SplashKit.PathToResources();"
           ]
         }
@@ -67454,7 +67116,6 @@
             "function PathToResources(kind: ResourceKind): String"
           ],
           "csharp": [
-            "public static string Resources.PathToResources(ResourceKind kind);",
             "public static string SplashKit.PathToResources(ResourceKind kind);"
           ]
         }
@@ -67506,7 +67167,6 @@
             "procedure RegisterFreeNotifier(fn: FreeNotifier)"
           ],
           "csharp": [
-            "public static void Resources.RegisterFreeNotifier(FreeNotifier fn);",
             "public static void SplashKit.RegisterFreeNotifier(FreeNotifier fn);"
           ]
         }
@@ -67558,7 +67218,6 @@
             "procedure SetResourcesPath(const path: String)"
           ],
           "csharp": [
-            "public static void Resources.SetResourcesPath(string path);",
             "public static void SplashKit.SetResourcesPath(string path);"
           ]
         }
@@ -67716,7 +67375,6 @@
             "procedure CallForAllSprites(fn: SpriteFloatFunction; val: Single)"
           ],
           "csharp": [
-            "public static void Sprite.CallForAllSprites(SpriteFloatFunction fn, float val);",
             "public static void SplashKit.CallForAllSprites(SpriteFloatFunction fn, float val);"
           ]
         }
@@ -67768,7 +67426,6 @@
             "procedure CallForAllSprites(fn: SpriteFunction)"
           ],
           "csharp": [
-            "public static void Sprite.CallForAllSprites(SpriteFunction fn);",
             "public static void SplashKit.CallForAllSprites(SpriteFunction fn);"
           ]
         }
@@ -67820,7 +67477,6 @@
             "procedure CallOnSpriteEvent(handler: SpriteEventHandler)"
           ],
           "csharp": [
-            "public static void Sprite.CallOnSpriteEvent(SpriteEventHandler handler);",
             "public static void SplashKit.CallOnSpriteEvent(SpriteEventHandler handler);"
           ]
         }
@@ -68321,7 +67977,6 @@
             "procedure CreateSpritePack(const name: String)"
           ],
           "csharp": [
-            "public static void Sprite.CreateSpritePack(string name);",
             "public static void SplashKit.CreateSpritePack(string name);"
           ]
         }
@@ -68360,7 +68015,6 @@
             "function CurrentSpritePack(): String"
           ],
           "csharp": [
-            "public static string Sprite.CurrentSpritePack();",
             "public static string SplashKit.CurrentSpritePack();"
           ]
         }
@@ -68399,7 +68053,6 @@
             "procedure DrawAllSprites()"
           ],
           "csharp": [
-            "public static void Sprite.DrawAllSprites();",
             "public static void SplashKit.DrawAllSprites();"
           ]
         }
@@ -68468,7 +68121,7 @@
             "procedure DrawSprite(s: Sprite; const offset: Vector2D)"
           ],
           "csharp": [
-            "public void Sprite.DrawSprite(Vector2D offset);",
+            "public void Sprite.Draw(Vector2D offset);",
             "public static void SplashKit.DrawSprite(Sprite s, Vector2D offset);"
           ]
         }
@@ -68523,7 +68176,7 @@
             "procedure DrawSprite(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.DrawSprite();",
+            "public void Sprite.Draw();",
             "public static void SplashKit.DrawSprite(Sprite s);"
           ]
         }
@@ -68605,7 +68258,7 @@
             "procedure DrawSprite(s: Sprite; xOffset: Double; yOffset: Double)"
           ],
           "csharp": [
-            "public void Sprite.DrawSprite(double xOffset, double yOffset);",
+            "public void Sprite.Draw(double xOffset, double yOffset);",
             "public static void SplashKit.DrawSprite(Sprite s, double xOffset, double yOffset);"
           ]
         }
@@ -68644,7 +68297,6 @@
             "procedure FreeAllSprites()"
           ],
           "csharp": [
-            "public static void Sprite.FreeAllSprites();",
             "public static void SplashKit.FreeAllSprites();"
           ]
         }
@@ -68699,7 +68351,6 @@
             "procedure FreeSprite(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.FreeSprite();",
             "public static void SplashKit.FreeSprite(Sprite s);"
           ]
         }
@@ -68751,7 +68402,6 @@
             "procedure FreeSpritePack(const name: String)"
           ],
           "csharp": [
-            "public static void Sprite.FreeSpritePack(string name);",
             "public static void SplashKit.FreeSpritePack(string name);"
           ]
         }
@@ -68803,7 +68453,6 @@
             "function HasSprite(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Sprite.HasSprite(string name);",
             "public static bool SplashKit.HasSprite(string name);"
           ]
         }
@@ -68855,7 +68504,6 @@
             "function HasSpritePack(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Sprite.HasSpritePack(string name);",
             "public static bool SplashKit.HasSpritePack(string name);"
           ]
         }
@@ -68910,7 +68558,7 @@
             "procedure MoveSprite(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.MoveSprite();",
+            "public void Sprite.Move();",
             "public static void SplashKit.MoveSprite(Sprite s);"
           ]
         }
@@ -68979,7 +68627,7 @@
             "procedure MoveSprite(s: Sprite; const distance: Vector2D)"
           ],
           "csharp": [
-            "public void Sprite.MoveSprite(Vector2D distance);",
+            "public void Sprite.Move(Vector2D distance);",
             "public static void SplashKit.MoveSprite(Sprite s, Vector2D distance);"
           ]
         }
@@ -69061,7 +68709,7 @@
             "procedure MoveSprite(s: Sprite; const distance: Vector2D; pct: Single)"
           ],
           "csharp": [
-            "public void Sprite.MoveSprite(Vector2D distance, float pct);",
+            "public void Sprite.Move(Vector2D distance, float pct);",
             "public static void SplashKit.MoveSprite(Sprite s, Vector2D distance, float pct);"
           ]
         }
@@ -69130,7 +68778,7 @@
             "procedure MoveSprite(s: Sprite; pct: Single)"
           ],
           "csharp": [
-            "public void Sprite.MoveSprite(float pct);",
+            "public void Sprite.Move(float pct);",
             "public static void SplashKit.MoveSprite(Sprite s, float pct);"
           ]
         }
@@ -69211,7 +68859,7 @@
             "procedure MoveSpriteTo(s: Sprite; x: Double; y: Double)"
           ],
           "csharp": [
-            "public void Sprite.MoveSpriteTo(double x, double y);",
+            "public void Sprite.MoveTo(double x, double y);",
             "public static void SplashKit.MoveSpriteTo(Sprite s, double x, double y);"
           ]
         }
@@ -69263,7 +68911,6 @@
             "procedure SelectSpritePack(const name: String)"
           ],
           "csharp": [
-            "public static void Sprite.SelectSpritePack(string name);",
             "public static void SplashKit.SelectSpritePack(string name);"
           ]
         }
@@ -69344,7 +68991,7 @@
             "function SpriteAddLayer(s: Sprite; newLayer: Bitmap; const layerName: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteAddLayer(Bitmap newLayer, string layerName);",
+            "public int Sprite.AddLayer(Bitmap newLayer, string layerName);",
             "public static int SplashKit.SpriteAddLayer(Sprite s, Bitmap newLayer, string layerName);"
           ]
         }
@@ -69412,7 +69059,7 @@
             "procedure SpriteAddToVelocity(s: Sprite; const value: Vector2D)"
           ],
           "csharp": [
-            "public void Sprite.SpriteAddToVelocity(Vector2D value);",
+            "public void Sprite.AddToVelocity(Vector2D value);",
             "public static void SplashKit.SpriteAddToVelocity(Sprite s, Vector2D value);"
           ]
         }
@@ -69480,7 +69127,7 @@
             "procedure SpriteAddValue(s: Sprite; const name: String)"
           ],
           "csharp": [
-            "public void Sprite.SpriteAddValue(string name);",
+            "public void Sprite.AddValue(string name);",
             "public static void SplashKit.SpriteAddValue(Sprite s, string name);"
           ]
         }
@@ -69562,7 +69209,7 @@
             "procedure SpriteAddValue(s: Sprite; const name: String; initVal: Single)"
           ],
           "csharp": [
-            "public void Sprite.SpriteAddValue(string name, float initVal);",
+            "public void Sprite.AddValue(string name, float initVal);",
             "public static void SplashKit.SpriteAddValue(Sprite s, string name, float initVal);"
           ]
         }
@@ -69669,7 +69316,6 @@
             "function SpriteAnchorPosition(s: Sprite): Point2D"
           ],
           "csharp": [
-            "public static Point2D Sprite.SpriteAnchorPosition(Sprite s);",
             "public static Point2D SplashKit.SpriteAnchorPosition(Sprite s);"
           ]
         }
@@ -69779,7 +69425,7 @@
             "function SpriteAnimationName(s: Sprite): String"
           ],
           "csharp": [
-            "public string Sprite.SpriteAnimationName();",
+            "public string Sprite.AnimationName();",
             "public static string SplashKit.SpriteAnimationName(Sprite s);"
           ]
         }
@@ -69844,7 +69490,6 @@
             "function SpriteAt(s: Sprite; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public static bool Sprite.SpriteAt(Sprite s, Point2D pt);",
             "public static bool SplashKit.SpriteAt(Sprite s, Point2D pt);"
           ]
         }
@@ -69912,7 +69557,7 @@
             "procedure SpriteBringLayerForward(s: Sprite; visibleLayer: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteBringLayerForward(int visibleLayer);",
+            "public void Sprite.SendLayerForward(int visibleLayer);",
             "public static void SplashKit.SpriteBringLayerForward(Sprite s, int visibleLayer);"
           ]
         }
@@ -69980,7 +69625,7 @@
             "procedure SpriteBringLayerToFront(s: Sprite; visibleLayer: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteBringLayerToFront(int visibleLayer);",
+            "public void Sprite.SendLayerTofront(int visibleLayer);",
             "public static void SplashKit.SpriteBringLayerToFront(Sprite s, int visibleLayer);"
           ]
         }
@@ -70048,7 +69693,7 @@
             "procedure SpriteCallOnEvent(s: Sprite; handler: SpriteEventHandler)"
           ],
           "csharp": [
-            "public void Sprite.SpriteCallOnEvent(SpriteEventHandler handler);",
+            "public void Sprite.CallOnEvent(SpriteEventHandler handler);",
             "public static void SplashKit.SpriteCallOnEvent(Sprite s, SpriteEventHandler handler);"
           ]
         }
@@ -70103,7 +69748,7 @@
             "function SpriteCircle(s: Sprite): Circle"
           ],
           "csharp": [
-            "public Circle Sprite.SpriteCircle();",
+            "public Circle Sprite.Circle();",
             "public static Circle SplashKit.SpriteCircle(Sprite s);"
           ]
         }
@@ -70213,7 +69858,7 @@
             "function SpriteCollisionCircle(s: Sprite): Circle"
           ],
           "csharp": [
-            "public Circle Sprite.SpriteCollisionCircle();",
+            "public Circle Sprite.CollisionCircle();",
             "public static Circle SplashKit.SpriteCollisionCircle(Sprite s);"
           ]
         }
@@ -70608,7 +70253,6 @@
             "function SpriteHasValue(s: Sprite; name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Sprite.SpriteHasValue(Sprite s, string name);",
             "public static bool SplashKit.SpriteHasValue(Sprite s, string name);"
           ]
         }
@@ -70787,7 +70431,7 @@
             "procedure SpriteHideLayer(s: Sprite; const name: String)"
           ],
           "csharp": [
-            "public void Sprite.SpriteHideLayer(string name);",
+            "public void Sprite.HideLayer(string name);",
             "public static void SplashKit.SpriteHideLayer(Sprite s, string name);"
           ]
         }
@@ -70855,7 +70499,7 @@
             "procedure SpriteHideLayer(s: Sprite; id: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteHideLayer(int id);",
+            "public void Sprite.HideLayer(int id);",
             "public static void SplashKit.SpriteHideLayer(Sprite s, int id);"
           ]
         }
@@ -70924,7 +70568,7 @@
             "function SpriteLayer(s: Sprite; const name: String): Bitmap"
           ],
           "csharp": [
-            "public Bitmap Sprite.SpriteLayer(string name);",
+            "public Bitmap Sprite.Layer(string name);",
             "public static Bitmap SplashKit.SpriteLayer(Sprite s, string name);"
           ]
         }
@@ -70993,7 +70637,7 @@
             "function SpriteLayer(s: Sprite; idx: Integer): Bitmap"
           ],
           "csharp": [
-            "public Bitmap Sprite.SpriteLayer(int idx);",
+            "public Bitmap Sprite.Layer(int idx);",
             "public static Bitmap SplashKit.SpriteLayer(Sprite s, int idx);"
           ]
         }
@@ -71062,7 +70706,7 @@
             "function SpriteLayerCircle(s: Sprite; const name: String): Circle"
           ],
           "csharp": [
-            "public Circle Sprite.SpriteLayerCircle(string name);",
+            "public Circle Sprite.LayerCircle(string name);",
             "public static Circle SplashKit.SpriteLayerCircle(Sprite s, string name);"
           ]
         }
@@ -71131,7 +70775,7 @@
             "function SpriteLayerCircle(s: Sprite; idx: Integer): Circle"
           ],
           "csharp": [
-            "public Circle Sprite.SpriteLayerCircle(int idx);",
+            "public Circle Sprite.LayerCircle(int idx);",
             "public static Circle SplashKit.SpriteLayerCircle(Sprite s, int idx);"
           ]
         }
@@ -71255,7 +70899,7 @@
             "function SpriteLayerHeight(s: Sprite; const name: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteLayerHeight(string name);",
+            "public int Sprite.LayerHeight(string name);",
             "public static int SplashKit.SpriteLayerHeight(Sprite s, string name);"
           ]
         }
@@ -71323,7 +70967,7 @@
             "function SpriteLayerHeight(s: Sprite; idx: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteLayerHeight(int idx);",
+            "public int Sprite.LayerHeight(int idx);",
             "public static int SplashKit.SpriteLayerHeight(Sprite s, int idx);"
           ]
         }
@@ -71391,7 +71035,7 @@
             "function SpriteLayerIndex(s: Sprite; const name: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteLayerIndex(string name);",
+            "public int Sprite.IndexOfLayer(string name);",
             "public static int SplashKit.SpriteLayerIndex(Sprite s, string name);"
           ]
         }
@@ -71459,7 +71103,7 @@
             "function SpriteLayerName(s: Sprite; idx: Integer): String"
           ],
           "csharp": [
-            "public string Sprite.SpriteLayerName(int idx);",
+            "public string Sprite.LayerName(int idx);",
             "public static string SplashKit.SpriteLayerName(Sprite s, int idx);"
           ]
         }
@@ -71528,7 +71172,7 @@
             "function SpriteLayerOffset(s: Sprite; const name: String): Vector2D"
           ],
           "csharp": [
-            "public Vector2D Sprite.SpriteLayerOffset(string name);",
+            "public Vector2D Sprite.LayerOffset(string name);",
             "public static Vector2D SplashKit.SpriteLayerOffset(Sprite s, string name);"
           ]
         }
@@ -71596,7 +71240,7 @@
             "function SpriteLayerOffset(s: Sprite; idx: Integer): Vector2D"
           ],
           "csharp": [
-            "public Vector2D Sprite.SpriteLayerOffset(int idx);",
+            "public Vector2D Sprite.LayerOffset(int idx);",
             "public static Vector2D SplashKit.SpriteLayerOffset(Sprite s, int idx);"
           ]
         }
@@ -71665,7 +71309,7 @@
             "function SpriteLayerRectangle(s: Sprite; const name: String): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Sprite.SpriteLayerRectangle(string name);",
+            "public Rectangle Sprite.LayerRectangle(string name);",
             "public static Rectangle SplashKit.SpriteLayerRectangle(Sprite s, string name);"
           ]
         }
@@ -71734,7 +71378,7 @@
             "function SpriteLayerRectangle(s: Sprite; idx: Integer): Rectangle"
           ],
           "csharp": [
-            "public Rectangle Sprite.SpriteLayerRectangle(int idx);",
+            "public Rectangle Sprite.LayerRectangle(int idx);",
             "public static Rectangle SplashKit.SpriteLayerRectangle(Sprite s, int idx);"
           ]
         }
@@ -71803,7 +71447,7 @@
             "function SpriteLayerWidth(s: Sprite; const name: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteLayerWidth(string name);",
+            "public int Sprite.LayerWidth(string name);",
             "public static int SplashKit.SpriteLayerWidth(Sprite s, string name);"
           ]
         }
@@ -71871,7 +71515,7 @@
             "function SpriteLayerWidth(s: Sprite; idx: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteLayerWidth(int idx);",
+            "public int Sprite.LayerWidth(int idx);",
             "public static int SplashKit.SpriteLayerWidth(Sprite s, int idx);"
           ]
         }
@@ -72118,7 +71762,7 @@
             "procedure SpriteMoveTo(s: Sprite; const pt: Point2D; takingSeconds: Single)"
           ],
           "csharp": [
-            "public void Sprite.SpriteMoveTo(Point2D pt, float takingSeconds);",
+            "public void Sprite.MoveTo(Point2D pt, float takingSeconds);",
             "public static void SplashKit.SpriteMoveTo(Sprite s, Point2D pt, float takingSeconds);"
           ]
         }
@@ -72225,7 +71869,6 @@
             "function SpriteNamed(const name: String): Sprite"
           ],
           "csharp": [
-            "public static Sprite Sprite.SpriteNamed(string name);",
             "public static Sprite SplashKit.SpriteNamed(string name);"
           ]
         }
@@ -72280,7 +71923,7 @@
             "function SpriteOffscreen(s: Sprite): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteOffscreen();",
+            "public bool Sprite.Offscreen();",
             "public static bool SplashKit.SpriteOffscreen(Sprite s);"
           ]
         }
@@ -72349,7 +71992,7 @@
             "function SpriteOnScreenAt(s: Sprite; const pt: Point2D): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteOnScreenAt(Point2D pt);",
+            "public bool Sprite.OnScreenAt(Point2D pt);",
             "public static bool SplashKit.SpriteOnScreenAt(Sprite s, Point2D pt);"
           ]
         }
@@ -72430,7 +72073,7 @@
             "function SpriteOnScreenAt(s: Sprite; x: Double; y: Double): Boolean"
           ],
           "csharp": [
-            "public bool Sprite.SpriteOnScreenAt(double x, double y);",
+            "public bool Sprite.OnScreenAt(double x, double y);",
             "public static bool SplashKit.SpriteOnScreenAt(Sprite s, double x, double y);"
           ]
         }
@@ -72540,7 +72183,7 @@
             "procedure SpriteReplayAnimation(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.SpriteReplayAnimation();",
+            "public void Sprite.ReplayAnimation();",
             "public static void SplashKit.SpriteReplayAnimation(Sprite s);"
           ]
         }
@@ -72609,7 +72252,7 @@
             "procedure SpriteReplayAnimation(s: Sprite; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.SpriteReplayAnimation(bool withSound);",
+            "public void Sprite.ReplayAnimation(bool withSound);",
             "public static void SplashKit.SpriteReplayAnimation(Sprite s, bool withSound);"
           ]
         }
@@ -72842,7 +72485,7 @@
             "procedure SpriteSendLayerBackward(s: Sprite; visibleLayer: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteSendLayerBackward(int visibleLayer);",
+            "public void Sprite.SendLayerTobackward(int visibleLayer);",
             "public static void SplashKit.SpriteSendLayerBackward(Sprite s, int visibleLayer);"
           ]
         }
@@ -72910,7 +72553,7 @@
             "procedure SpriteSendLayerToBack(s: Sprite; visibleLayer: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteSendLayerToBack(int visibleLayer);",
+            "public void Sprite.SendLayerToBack(int visibleLayer);",
             "public static void SplashKit.SpriteSendLayerToBack(Sprite s, int visibleLayer);"
           ]
         }
@@ -73400,7 +73043,7 @@
             "procedure SpriteSetLayerOffset(s: Sprite; const name: String; const value: Vector2D)"
           ],
           "csharp": [
-            "public void Sprite.SpriteSetLayerOffset(string name, Vector2D value);",
+            "public void Sprite.SetLayerOffset(string name, Vector2D value);",
             "public static void SplashKit.SpriteSetLayerOffset(Sprite s, string name, Vector2D value);"
           ]
         }
@@ -73482,7 +73125,7 @@
             "procedure SpriteSetLayerOffset(s: Sprite; idx: Integer; const value: Vector2D)"
           ],
           "csharp": [
-            "public void Sprite.SpriteSetLayerOffset(int idx, Vector2D value);",
+            "public void Sprite.SetLayerOffset(int idx, Vector2D value);",
             "public static void SplashKit.SpriteSetLayerOffset(Sprite s, int idx, Vector2D value);"
           ]
         }
@@ -73972,7 +73615,7 @@
             "procedure SpriteSetValue(s: Sprite; const name: String; val: Single)"
           ],
           "csharp": [
-            "public void Sprite.SpriteSetValue(string name, float val);",
+            "public void Sprite.SetValue(string name, float val);",
             "public static void SplashKit.SpriteSetValue(Sprite s, string name, float val);"
           ]
         }
@@ -74245,7 +73888,7 @@
             "function SpriteShowLayer(s: Sprite; const name: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteShowLayer(string name);",
+            "public int Sprite.ShowLayer(string name);",
             "public static int SplashKit.SpriteShowLayer(Sprite s, string name);"
           ]
         }
@@ -74313,7 +73956,7 @@
             "function SpriteShowLayer(s: Sprite; id: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteShowLayer(int id);",
+            "public int Sprite.ShowLayer(int id);",
             "public static int SplashKit.SpriteShowLayer(Sprite s, int id);"
           ]
         }
@@ -74437,7 +74080,7 @@
             "procedure SpriteStartAnimation(s: Sprite; const named: String)"
           ],
           "csharp": [
-            "public void Sprite.SpriteStartAnimation(string named);",
+            "public void Sprite.StartAnimation(string named);",
             "public static void SplashKit.SpriteStartAnimation(Sprite s, string named);"
           ]
         }
@@ -74519,7 +74162,7 @@
             "procedure SpriteStartAnimation(s: Sprite; const named: String; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.SpriteStartAnimation(string named, bool withSound);",
+            "public void Sprite.StartAnimation(string named, bool withSound);",
             "public static void SplashKit.SpriteStartAnimation(Sprite s, string named, bool withSound);"
           ]
         }
@@ -74587,7 +74230,7 @@
             "procedure SpriteStartAnimation(s: Sprite; idx: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteStartAnimation(int idx);",
+            "public void Sprite.StartAnimation(int idx);",
             "public static void SplashKit.SpriteStartAnimation(Sprite s, int idx);"
           ]
         }
@@ -74669,7 +74312,7 @@
             "procedure SpriteStartAnimation(s: Sprite; idx: Integer; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.SpriteStartAnimation(int idx, bool withSound);",
+            "public void Sprite.StartAnimation(int idx, bool withSound);",
             "public static void SplashKit.SpriteStartAnimation(Sprite s, int idx, bool withSound);"
           ]
         }
@@ -74737,7 +74380,7 @@
             "procedure SpriteStopCallingOnEvent(s: Sprite; handler: SpriteEventHandler)"
           ],
           "csharp": [
-            "public void Sprite.SpriteStopCallingOnEvent(SpriteEventHandler handler);",
+            "public void Sprite.StopCallingOnEvent(SpriteEventHandler handler);",
             "public static void SplashKit.SpriteStopCallingOnEvent(Sprite s, SpriteEventHandler handler);"
           ]
         }
@@ -74806,7 +74449,7 @@
             "procedure SpriteToggleLayerVisible(s: Sprite; const name: String)"
           ],
           "csharp": [
-            "public void Sprite.SpriteToggleLayerVisible(string name);",
+            "public void Sprite.ToggleLayerVisible(string name);",
             "public static void SplashKit.SpriteToggleLayerVisible(Sprite s, string name);"
           ]
         }
@@ -74874,7 +74517,7 @@
             "procedure SpriteToggleLayerVisible(s: Sprite; id: Integer)"
           ],
           "csharp": [
-            "public void Sprite.SpriteToggleLayerVisible(int id);",
+            "public void Sprite.ToggleLayerVisible(int id);",
             "public static void SplashKit.SpriteToggleLayerVisible(Sprite s, int id);"
           ]
         }
@@ -74942,7 +74585,7 @@
             "function SpriteValue(s: Sprite; const name: String): Single"
           ],
           "csharp": [
-            "public float Sprite.SpriteValue(string name);",
+            "public float Sprite.Value(string name);",
             "public static float SplashKit.SpriteValue(Sprite s, string name);"
           ]
         }
@@ -75121,7 +74764,7 @@
             "function SpriteVisibleIndexOfLayer(s: Sprite; const name: String): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteVisibleIndexOfLayer(string name);",
+            "public int Sprite.VisibleIndexOfLayer(string name);",
             "public static int SplashKit.SpriteVisibleIndexOfLayer(Sprite s, string name);"
           ]
         }
@@ -75189,7 +74832,7 @@
             "function SpriteVisibleIndexOfLayer(s: Sprite; id: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteVisibleIndexOfLayer(int id);",
+            "public int Sprite.VisibleIndexOfLayer(int id);",
             "public static int SplashKit.SpriteVisibleIndexOfLayer(Sprite s, int id);"
           ]
         }
@@ -75257,7 +74900,7 @@
             "function SpriteVisibleLayer(s: Sprite; idx: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteVisibleLayer(int idx);",
+            "public int Sprite.VisibleLayer(int idx);",
             "public static int SplashKit.SpriteVisibleLayer(Sprite s, int idx);"
           ]
         }
@@ -75380,7 +75023,7 @@
             "function SpriteVisibleLayerId(s: Sprite; idx: Integer): Integer"
           ],
           "csharp": [
-            "public int Sprite.SpriteVisibleLayerId(int idx);",
+            "public int Sprite.VisibleLayerIdAt(int idx);",
             "public static int SplashKit.SpriteVisibleLayerId(Sprite s, int idx);"
           ]
         }
@@ -75597,7 +75240,6 @@
             "procedure StopCallingOnSpriteEvent(handler: SpriteEventHandler)"
           ],
           "csharp": [
-            "public static void Sprite.StopCallingOnSpriteEvent(SpriteEventHandler handler);",
             "public static void SplashKit.StopCallingOnSpriteEvent(SpriteEventHandler handler);"
           ]
         }
@@ -75636,7 +75278,6 @@
             "procedure UpdateAllSprites()"
           ],
           "csharp": [
-            "public static void Sprite.UpdateAllSprites();",
             "public static void SplashKit.UpdateAllSprites();"
           ]
         }
@@ -75689,7 +75330,6 @@
             "procedure UpdateAllSprites(pct: Single)"
           ],
           "csharp": [
-            "public static void Sprite.UpdateAllSprites(float pct);",
             "public static void SplashKit.UpdateAllSprites(float pct);"
           ]
         }
@@ -75744,7 +75384,7 @@
             "procedure UpdateSprite(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSprite();",
+            "public void Sprite.Update();",
             "public static void SplashKit.UpdateSprite(Sprite s);"
           ]
         }
@@ -75813,7 +75453,7 @@
             "procedure UpdateSprite(s: Sprite; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSprite(bool withSound);",
+            "public void Sprite.Update(bool withSound);",
             "public static void SplashKit.UpdateSprite(Sprite s, bool withSound);"
           ]
         }
@@ -75882,7 +75522,7 @@
             "procedure UpdateSprite(s: Sprite; pct: Single)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSprite(float pct);",
+            "public void Sprite.Update(float pct);",
             "public static void SplashKit.UpdateSprite(Sprite s, float pct);"
           ]
         }
@@ -75964,7 +75604,7 @@
             "procedure UpdateSprite(s: Sprite; pct: Single; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSprite(float pct, bool withSound);",
+            "public void Sprite.Update(float pct, bool withSound);",
             "public static void SplashKit.UpdateSprite(Sprite s, float pct, bool withSound);"
           ]
         }
@@ -76019,7 +75659,7 @@
             "procedure UpdateSpriteAnimation(s: Sprite)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSpriteAnimation();",
+            "public void Sprite.UpdateAnimation();",
             "public static void SplashKit.UpdateSpriteAnimation(Sprite s);"
           ]
         }
@@ -76088,7 +75728,7 @@
             "procedure UpdateSpriteAnimation(s: Sprite; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSpriteAnimation(bool withSound);",
+            "public void Sprite.UpdateAnimation(bool withSound);",
             "public static void SplashKit.UpdateSpriteAnimation(Sprite s, bool withSound);"
           ]
         }
@@ -76157,7 +75797,7 @@
             "procedure UpdateSpriteAnimation(s: Sprite; pct: Single)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSpriteAnimation(float pct);",
+            "public void Sprite.UpdateAnimation(float pct);",
             "public static void SplashKit.UpdateSpriteAnimation(Sprite s, float pct);"
           ]
         }
@@ -76239,7 +75879,7 @@
             "procedure UpdateSpriteAnimation(s: Sprite; pct: Single; withSound: Boolean)"
           ],
           "csharp": [
-            "public void Sprite.UpdateSpriteAnimation(float pct, bool withSound);",
+            "public void Sprite.UpdateAnimation(float pct, bool withSound);",
             "public static void SplashKit.UpdateSpriteAnimation(Sprite s, float pct, bool withSound);"
           ]
         }
@@ -76308,7 +75948,7 @@
             "function VectorFromCenterSpriteToPoint(s: Sprite; const pt: Point2D): Vector2D"
           ],
           "csharp": [
-            "public Vector2D Sprite.VectorFromCenterSpriteToPoint(Point2D pt);",
+            "public Vector2D Sprite.VectorTo(Point2D pt);",
             "public static Vector2D SplashKit.VectorFromCenterSpriteToPoint(Sprite s, Point2D pt);"
           ]
         }
@@ -76376,7 +76016,7 @@
             "function VectorFromTo(s1: Sprite; s2: Sprite): Vector2D"
           ],
           "csharp": [
-            "public Vector2D Sprite.VectorFromTo(Sprite s2);",
+            "public Vector2D Sprite.VectorTo(Sprite s2);",
             "public static Vector2D SplashKit.VectorFromTo(Sprite s1, Sprite s2);"
           ]
         }
@@ -76617,7 +76257,6 @@
             "function ReadChar(): Char"
           ],
           "csharp": [
-            "public static char Terminal.ReadChar();",
             "public static char SplashKit.ReadChar();"
           ]
         }
@@ -76656,7 +76295,6 @@
             "function ReadLine(): String"
           ],
           "csharp": [
-            "public static string Terminal.ReadLine();",
             "public static string SplashKit.ReadLine();"
           ]
         }
@@ -76695,7 +76333,6 @@
             "function TerminalHasInput(): Boolean"
           ],
           "csharp": [
-            "public static bool Terminal.TerminalHasInput();",
             "public static bool SplashKit.TerminalHasInput();"
           ]
         }
@@ -76748,7 +76385,6 @@
             "procedure Write(data: Char)"
           ],
           "csharp": [
-            "public static void Terminal.Write(char data);",
             "public static void SplashKit.Write(char data);"
           ]
         }
@@ -76801,7 +76437,6 @@
             "procedure Write(data: Double)"
           ],
           "csharp": [
-            "public static void Terminal.Write(double data);",
             "public static void SplashKit.Write(double data);"
           ]
         }
@@ -76854,7 +76489,6 @@
             "procedure Write(data: Integer)"
           ],
           "csharp": [
-            "public static void Terminal.Write(int data);",
             "public static void SplashKit.Write(int data);"
           ]
         }
@@ -76906,7 +76540,6 @@
             "procedure Write(text: String)"
           ],
           "csharp": [
-            "public static void Terminal.Write(string text);",
             "public static void SplashKit.Write(string text);"
           ]
         }
@@ -76959,7 +76592,6 @@
             "procedure WriteLine(data: Char)"
           ],
           "csharp": [
-            "public static void Terminal.WriteLine(char data);",
             "public static void SplashKit.WriteLine(char data);"
           ]
         }
@@ -76999,7 +76631,6 @@
             "procedure WriteLine()"
           ],
           "csharp": [
-            "public static void Terminal.WriteLine();",
             "public static void SplashKit.WriteLine();"
           ]
         }
@@ -77052,7 +76683,6 @@
             "procedure WriteLine(data: Double)"
           ],
           "csharp": [
-            "public static void Terminal.WriteLine(double data);",
             "public static void SplashKit.WriteLine(double data);"
           ]
         }
@@ -77105,7 +76735,6 @@
             "procedure WriteLine(data: Integer)"
           ],
           "csharp": [
-            "public static void Terminal.WriteLine(int data);",
             "public static void SplashKit.WriteLine(int data);"
           ]
         }
@@ -77157,7 +76786,6 @@
             "procedure WriteLine(line: String)"
           ],
           "csharp": [
-            "public static void Terminal.WriteLine(string line);",
             "public static void SplashKit.WriteLine(string line);"
           ]
         }
@@ -77268,7 +76896,6 @@
             "procedure FreeAllTimers()"
           ],
           "csharp": [
-            "public static void Timers.FreeAllTimers();",
             "public static void SplashKit.FreeAllTimers();"
           ]
         }
@@ -77323,7 +76950,6 @@
             "procedure FreeTimer(toFree: Timer)"
           ],
           "csharp": [
-            "public void Timer.FreeTimer();",
             "public static void SplashKit.FreeTimer(Timer toFree);"
           ]
         }
@@ -77376,7 +77002,6 @@
             "function HasTimer(name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Timers.HasTimer(string name);",
             "public static bool SplashKit.HasTimer(string name);"
           ]
         }
@@ -77429,7 +77054,6 @@
             "procedure PauseTimer(name: String)"
           ],
           "csharp": [
-            "public static void Timers.PauseTimer(string name);",
             "public static void SplashKit.PauseTimer(string name);"
           ]
         }
@@ -77484,7 +77108,7 @@
             "procedure PauseTimer(toPause: Timer)"
           ],
           "csharp": [
-            "public void Timer.PauseTimer();",
+            "public void Timer.Pause();",
             "public static void SplashKit.PauseTimer(Timer toPause);"
           ]
         }
@@ -77537,7 +77161,6 @@
             "procedure ResetTimer(name: String)"
           ],
           "csharp": [
-            "public static void Timers.ResetTimer(string name);",
             "public static void SplashKit.ResetTimer(string name);"
           ]
         }
@@ -77592,7 +77215,7 @@
             "procedure ResetTimer(tmr: Timer)"
           ],
           "csharp": [
-            "public void Timer.ResetTimer();",
+            "public void Timer.Reset();",
             "public static void SplashKit.ResetTimer(Timer tmr);"
           ]
         }
@@ -77645,7 +77268,6 @@
             "procedure ResumeTimer(name: String)"
           ],
           "csharp": [
-            "public static void Timers.ResumeTimer(string name);",
             "public static void SplashKit.ResumeTimer(string name);"
           ]
         }
@@ -77700,7 +77322,7 @@
             "procedure ResumeTimer(toResume: Timer)"
           ],
           "csharp": [
-            "public void Timer.ResumeTimer();",
+            "public void Timer.Resume();",
             "public static void SplashKit.ResumeTimer(Timer toResume);"
           ]
         }
@@ -77753,7 +77375,6 @@
             "procedure StartTimer(name: String)"
           ],
           "csharp": [
-            "public static void Timers.StartTimer(string name);",
             "public static void SplashKit.StartTimer(string name);"
           ]
         }
@@ -77808,7 +77429,7 @@
             "procedure StartTimer(toStart: Timer)"
           ],
           "csharp": [
-            "public void Timer.StartTimer();",
+            "public void Timer.Start();",
             "public static void SplashKit.StartTimer(Timer toStart);"
           ]
         }
@@ -77861,7 +77482,6 @@
             "procedure StopTimer(name: String)"
           ],
           "csharp": [
-            "public static void Timers.StopTimer(string name);",
             "public static void SplashKit.StopTimer(string name);"
           ]
         }
@@ -77916,7 +77536,7 @@
             "procedure StopTimer(toStop: Timer)"
           ],
           "csharp": [
-            "public void Timer.StopTimer();",
+            "public void Timer.Stop();",
             "public static void SplashKit.StopTimer(Timer toStop);"
           ]
         }
@@ -77968,7 +77588,6 @@
             "function TimerNamed(name: String): Timer"
           ],
           "csharp": [
-            "public static Timer Timers.TimerNamed(string name);",
             "public static Timer SplashKit.TimerNamed(string name);"
           ]
         }
@@ -78021,7 +77640,6 @@
             "function TimerPaused(name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Timers.TimerPaused(string name);",
             "public static bool SplashKit.TimerPaused(string name);"
           ]
         }
@@ -78129,7 +77747,6 @@
             "function TimerStarted(name: String): Boolean"
           ],
           "csharp": [
-            "public static bool Timers.TimerStarted(string name);",
             "public static bool SplashKit.TimerStarted(string name);"
           ]
         }
@@ -78237,7 +77854,6 @@
             "function TimerTicks(name: String): Cardinal"
           ],
           "csharp": [
-            "public static uint Timers.TimerTicks(string name);",
             "public static uint SplashKit.TimerTicks(string name);"
           ]
         }
@@ -78516,7 +78132,7 @@
                 "procedure DrawCircle(clr: Color; const c: Circle)"
               ],
               "csharp": [
-                "public void Circle.DrawCircle(Color clr);",
+                "public void Circle.Draw(Color clr);",
                 "public static void SplashKit.DrawCircle(Color clr, Circle c);"
               ]
             }
@@ -78597,7 +78213,7 @@
                 "procedure DrawCircle(clr: Color; const c: Circle; opts: DrawingOptions)"
               ],
               "csharp": [
-                "public void Circle.DrawCircle(Color clr, DrawingOptions opts);",
+                "public void Circle.Draw(Color clr, DrawingOptions opts);",
                 "public static void SplashKit.DrawCircle(Color clr, Circle c, DrawingOptions opts);"
               ]
             }
@@ -78665,7 +78281,7 @@
                 "procedure FillCircle(clr: Color; const c: Circle)"
               ],
               "csharp": [
-                "public void Circle.FillCircle(Color clr);",
+                "public void Circle.Fill(Color clr);",
                 "public static void SplashKit.FillCircle(Color clr, Circle c);"
               ]
             }
@@ -78746,7 +78362,7 @@
                 "procedure FillCircle(clr: Color; const c: Circle; opts: DrawingOptions)"
               ],
               "csharp": [
-                "public void Circle.FillCircle(Color clr, DrawingOptions opts);",
+                "public void Circle.Fill(Color clr, DrawingOptions opts);",
                 "public static void SplashKit.FillCircle(Color clr, Circle c, DrawingOptions opts);"
               ]
             }
@@ -85229,7 +84845,7 @@
                 "function RandomColor(): Color"
               ],
               "csharp": [
-                "public static Color Color.RandomColor();",
+                "public static Color Color.Random();",
                 "public static Color SplashKit.RandomColor();"
               ]
             }
@@ -85282,7 +84898,7 @@
                 "function RandomRGBColor(alpha: Integer): Color"
               ],
               "csharp": [
-                "public static Color Color.RandomRGBColor(int alpha);",
+                "public static Color Color.RandomRGB(int alpha);",
                 "public static Color SplashKit.RandomRGBColor(int alpha);"
               ]
             }
@@ -86612,7 +86228,6 @@
             "function Contains(const text: String; const subtext: String): Boolean"
           ],
           "csharp": [
-            "public static bool Utilities.Contains(string text, string subtext);",
             "public static bool SplashKit.Contains(string text, string subtext);"
           ]
         }
@@ -86664,7 +86279,6 @@
             "function ConvertToDouble(const text: String): Double"
           ],
           "csharp": [
-            "public static double Utilities.ConvertToDouble(string text);",
             "public static double SplashKit.ConvertToDouble(string text);"
           ]
         }
@@ -86716,7 +86330,6 @@
             "function ConvertToInteger(const text: String): Integer"
           ],
           "csharp": [
-            "public static int Utilities.ConvertToInteger(string text);",
             "public static int SplashKit.ConvertToInteger(string text);"
           ]
         }
@@ -86781,7 +86394,6 @@
             "function IndexOf(const text: String; const subtext: String): Integer"
           ],
           "csharp": [
-            "public static int Utilities.IndexOf(string text, string subtext);",
             "public static int SplashKit.IndexOf(string text, string subtext);"
           ]
         }
@@ -86833,7 +86445,6 @@
             "function IsDouble(const text: String): Boolean"
           ],
           "csharp": [
-            "public static bool Utilities.IsDouble(string text);",
             "public static bool SplashKit.IsDouble(string text);"
           ]
         }
@@ -86885,7 +86496,6 @@
             "function IsInteger(const text: String): Boolean"
           ],
           "csharp": [
-            "public static bool Utilities.IsInteger(string text);",
             "public static bool SplashKit.IsInteger(string text);"
           ]
         }
@@ -86937,7 +86547,6 @@
             "function IsNumber(const text: String): Boolean"
           ],
           "csharp": [
-            "public static bool Utilities.IsNumber(string text);",
             "public static bool SplashKit.IsNumber(string text);"
           ]
         }
@@ -86989,7 +86598,6 @@
             "function LengthOf(const text: String): Integer"
           ],
           "csharp": [
-            "public static int Utilities.LengthOf(string text);",
             "public static int SplashKit.LengthOf(string text);"
           ]
         }
@@ -87067,7 +86675,6 @@
             "function ReplaceAll(const text: String; const substr: String; const newtext: String): String"
           ],
           "csharp": [
-            "public static string Utilities.ReplaceAll(string text, string substr, string newtext);",
             "public static string SplashKit.ReplaceAll(string text, string substr, string newtext);"
           ]
         }
@@ -87132,7 +86739,6 @@
             "function Split(const text: String; delimiter: Char): ArrayOfString"
           ],
           "csharp": [
-            "public static List<string> Utilities.Split(string text, char delimiter);",
             "public static List<string> SplashKit.Split(string text, char delimiter);"
           ]
         }
@@ -87184,7 +86790,6 @@
             "function ToLowercase(const text: String): String"
           ],
           "csharp": [
-            "public static string Utilities.ToLowercase(string text);",
             "public static string SplashKit.ToLowercase(string text);"
           ]
         }
@@ -87236,7 +86841,6 @@
             "function ToUppercase(const text: String): String"
           ],
           "csharp": [
-            "public static string Utilities.ToUppercase(string text);",
             "public static string SplashKit.ToUppercase(string text);"
           ]
         }
@@ -87288,7 +86892,6 @@
             "function Trim(const text: String): String"
           ],
           "csharp": [
-            "public static string Utilities.Trim(string text);",
             "public static string SplashKit.Trim(string text);"
           ]
         }
@@ -87354,7 +86957,6 @@
             "function Rnd(min: Integer; max: Integer): Integer"
           ],
           "csharp": [
-            "public static int Random.Rnd(int min, int max);",
             "public static int SplashKit.Rnd(int min, int max);"
           ]
         }
@@ -87393,7 +86995,6 @@
             "function Rnd(): Single"
           ],
           "csharp": [
-            "public static float Random.Rnd();",
             "public static float SplashKit.Rnd();"
           ]
         }
@@ -87446,7 +87047,6 @@
             "function Rnd(ubound: Integer): Integer"
           ],
           "csharp": [
-            "public static int Random.Rnd(int ubound);",
             "public static int SplashKit.Rnd(int ubound);"
           ]
         }
@@ -87485,7 +87085,6 @@
             "function CurrentTicks(): Cardinal"
           ],
           "csharp": [
-            "public static uint Utilities.CurrentTicks();",
             "public static uint SplashKit.CurrentTicks();"
           ]
         }
@@ -87537,7 +87136,6 @@
             "procedure Delay(milliseconds: Integer)"
           ],
           "csharp": [
-            "public static void Utilities.Delay(int milliseconds);",
             "public static void SplashKit.Delay(int milliseconds);"
           ]
         }
@@ -87628,7 +87226,6 @@
             "procedure DisplayDialog(const title: String; const msg: String; outputFont: Font; fontSize: Integer)"
           ],
           "csharp": [
-            "public static void Utilities.DisplayDialog(string title, string msg, Font outputFont, int fontSize);",
             "public static void SplashKit.DisplayDialog(string title, string msg, Font outputFont, int fontSize);"
           ]
         }
@@ -87693,7 +87290,6 @@
             "function FileAsString(filename: String; kind: ResourceKind): String"
           ],
           "csharp": [
-            "public static string Utilities.FileAsString(string filename, ResourceKind kind);",
             "public static string SplashKit.FileAsString(string filename, ResourceKind kind);"
           ]
         }
@@ -87779,7 +87375,7 @@
             "procedure ClearWindow(wind: Window; clr: Color)"
           ],
           "csharp": [
-            "public void Window.ClearWindow(Color clr);",
+            "public void Window.Clear(Color clr);",
             "public static void SplashKit.ClearWindow(Window wind, Color clr);"
           ]
         }
@@ -87818,7 +87414,6 @@
             "procedure CloseAllWindows()"
           ],
           "csharp": [
-            "public static void WindowManager.CloseAllWindows();",
             "public static void SplashKit.CloseAllWindows();"
           ]
         }
@@ -87857,7 +87452,6 @@
             "procedure CloseCurrentWindow()"
           ],
           "csharp": [
-            "public static void WindowManager.CloseCurrentWindow();",
             "public static void SplashKit.CloseCurrentWindow();"
           ]
         }
@@ -87910,7 +87504,6 @@
             "procedure CloseWindow(const name: String)"
           ],
           "csharp": [
-            "public static void WindowManager.CloseWindow(string name);",
             "public static void SplashKit.CloseWindow(string name);"
           ]
         }
@@ -87966,7 +87559,7 @@
             "procedure CloseWindow(wind: Window)"
           ],
           "csharp": [
-            "public void Window.CloseWindow();",
+            "public void Window.Close();",
             "public static void SplashKit.CloseWindow(Window wind);"
           ]
         }
@@ -88005,7 +87598,6 @@
             "function CurrentWindow(): Window"
           ],
           "csharp": [
-            "public static Window WindowManager.CurrentWindow();",
             "public static Window SplashKit.CurrentWindow();"
           ]
         }
@@ -88044,7 +87636,6 @@
             "function CurrentWindowHasBorder(): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.CurrentWindowHasBorder();",
             "public static bool SplashKit.CurrentWindowHasBorder();"
           ]
         }
@@ -88083,7 +87674,6 @@
             "function CurrentWindowHeight(): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.CurrentWindowHeight();",
             "public static int SplashKit.CurrentWindowHeight();"
           ]
         }
@@ -88122,7 +87712,6 @@
             "function CurrentWindowIsFullscreen(): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.CurrentWindowIsFullscreen();",
             "public static bool SplashKit.CurrentWindowIsFullscreen();"
           ]
         }
@@ -88161,7 +87750,6 @@
             "function CurrentWindowPosition(): Point2D"
           ],
           "csharp": [
-            "public static Point2D WindowManager.CurrentWindowPosition();",
             "public static Point2D SplashKit.CurrentWindowPosition();"
           ]
         }
@@ -88200,7 +87788,6 @@
             "procedure CurrentWindowToggleBorder()"
           ],
           "csharp": [
-            "public static void WindowManager.CurrentWindowToggleBorder();",
             "public static void SplashKit.CurrentWindowToggleBorder();"
           ]
         }
@@ -88239,7 +87826,6 @@
             "procedure CurrentWindowToggleFullscreen()"
           ],
           "csharp": [
-            "public static void WindowManager.CurrentWindowToggleFullscreen();",
             "public static void SplashKit.CurrentWindowToggleFullscreen();"
           ]
         }
@@ -88278,7 +87864,6 @@
             "function CurrentWindowWidth(): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.CurrentWindowWidth();",
             "public static int SplashKit.CurrentWindowWidth();"
           ]
         }
@@ -88317,7 +87902,6 @@
             "function CurrentWindowX(): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.CurrentWindowX();",
             "public static int SplashKit.CurrentWindowX();"
           ]
         }
@@ -88356,7 +87940,6 @@
             "function CurrentWindowY(): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.CurrentWindowY();",
             "public static int SplashKit.CurrentWindowY();"
           ]
         }
@@ -88408,7 +87991,6 @@
             "function HasWindow(caption: String): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.HasWindow(string caption);",
             "public static bool SplashKit.HasWindow(string caption);"
           ]
         }
@@ -88528,7 +88110,6 @@
             "procedure MoveCurrentWindowTo(x: Integer; y: Integer)"
           ],
           "csharp": [
-            "public static void WindowManager.MoveCurrentWindowTo(int x, int y);",
             "public static void SplashKit.MoveCurrentWindowTo(int x, int y);"
           ]
         }
@@ -88607,7 +88188,6 @@
             "procedure MoveWindowTo(const name: String; x: Integer; y: Integer)"
           ],
           "csharp": [
-            "public static void WindowManager.MoveWindowTo(string name, int x, int y);",
             "public static void SplashKit.MoveWindowTo(string name, int x, int y);"
           ]
         }
@@ -88688,7 +88268,7 @@
             "procedure MoveWindowTo(wind: Window; x: Integer; y: Integer)"
           ],
           "csharp": [
-            "public void Window.MoveWindowTo(int x, int y);",
+            "public void Window.MoveTo(int x, int y);",
             "public static void SplashKit.MoveWindowTo(Window wind, int x, int y);"
           ]
         }
@@ -88823,7 +88403,7 @@
             "procedure RefreshWindow(wind: Window)"
           ],
           "csharp": [
-            "public void Window.RefreshWindow();",
+            "public void Window.Refresh();",
             "public static void SplashKit.RefreshWindow(Window wind);"
           ]
         }
@@ -88892,7 +88472,7 @@
             "procedure RefreshWindow(wind: Window; targetFps: Cardinal)"
           ],
           "csharp": [
-            "public void Window.RefreshWindow(uint targetFps);",
+            "public void Window.Refresh(uint targetFps);",
             "public static void SplashKit.RefreshWindow(Window wind, uint targetFps);"
           ]
         }
@@ -88957,7 +88537,6 @@
             "procedure ResizeCurrentWindow(width: Integer; height: Integer)"
           ],
           "csharp": [
-            "public static void WindowManager.ResizeCurrentWindow(int width, int height);",
             "public static void SplashKit.ResizeCurrentWindow(int width, int height);"
           ]
         }
@@ -89038,7 +88617,7 @@
             "procedure ResizeWindow(wnd: Window; width: Integer; height: Integer)"
           ],
           "csharp": [
-            "public void Window.ResizeWindow(int width, int height);",
+            "public void Window.Resize(int width, int height);",
             "public static void SplashKit.ResizeWindow(Window wnd, int width, int height);"
           ]
         }
@@ -89091,7 +88670,6 @@
             "procedure SetCurrentWindow(const name: String)"
           ],
           "csharp": [
-            "public static void WindowManager.SetCurrentWindow(string name);",
             "public static void SplashKit.SetCurrentWindow(string name);"
           ]
         }
@@ -89146,7 +88724,7 @@
             "procedure SetCurrentWindow(wind: Window)"
           ],
           "csharp": [
-            "public void Window.SetCurrentWindow();",
+            "public void Window.MakeCurrent();",
             "public static void SplashKit.SetCurrentWindow(Window wind);"
           ]
         }
@@ -89254,7 +88832,6 @@
             "function WindowCloseRequested(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.WindowCloseRequested(string name);",
             "public static bool SplashKit.WindowCloseRequested(string name);"
           ]
         }
@@ -89362,7 +88939,6 @@
             "function WindowHasBorder(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.WindowHasBorder(string name);",
             "public static bool SplashKit.WindowHasBorder(string name);"
           ]
         }
@@ -89525,7 +89101,6 @@
             "function WindowHeight(const name: String): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.WindowHeight(string name);",
             "public static int SplashKit.WindowHeight(string name);"
           ]
         }
@@ -89633,7 +89208,6 @@
             "function WindowIsFullscreen(const name: String): Boolean"
           ],
           "csharp": [
-            "public static bool WindowManager.WindowIsFullscreen(string name);",
             "public static bool SplashKit.WindowIsFullscreen(string name);"
           ]
         }
@@ -89740,7 +89314,6 @@
             "function WindowNamed(caption: String): Window"
           ],
           "csharp": [
-            "public static Window WindowManager.WindowNamed(string caption);",
             "public static Window SplashKit.WindowNamed(string caption);"
           ]
         }
@@ -89793,7 +89366,6 @@
             "function WindowPosition(const name: String): Point2D"
           ],
           "csharp": [
-            "public static Point2D WindowManager.WindowPosition(string name);",
             "public static Point2D SplashKit.WindowPosition(string name);"
           ]
         }
@@ -89969,7 +89541,6 @@
             "procedure WindowToggleBorder(const name: String)"
           ],
           "csharp": [
-            "public static void WindowManager.WindowToggleBorder(string name);",
             "public static void SplashKit.WindowToggleBorder(string name);"
           ]
         }
@@ -90024,7 +89595,7 @@
             "procedure WindowToggleBorder(wnd: Window)"
           ],
           "csharp": [
-            "public void Window.WindowToggleBorder();",
+            "public void Window.ToggleBorder();",
             "public static void SplashKit.WindowToggleBorder(Window wnd);"
           ]
         }
@@ -90077,7 +89648,6 @@
             "procedure WindowToggleFullscreen(const name: String)"
           ],
           "csharp": [
-            "public static void WindowManager.WindowToggleFullscreen(string name);",
             "public static void SplashKit.WindowToggleFullscreen(string name);"
           ]
         }
@@ -90132,7 +89702,7 @@
             "procedure WindowToggleFullscreen(wnd: Window)"
           ],
           "csharp": [
-            "public void Window.WindowToggleFullscreen();",
+            "public void Window.ToggleFullscreen();",
             "public static void SplashKit.WindowToggleFullscreen(Window wnd);"
           ]
         }
@@ -90185,7 +89755,6 @@
             "function WindowWidth(const name: String): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.WindowWidth(string name);",
             "public static int SplashKit.WindowWidth(string name);"
           ]
         }
@@ -90279,7 +89848,6 @@
             "function WindowWithFocus(): Window"
           ],
           "csharp": [
-            "public static Window WindowManager.WindowWithFocus();",
             "public static Window SplashKit.WindowWithFocus();"
           ]
         }
@@ -90332,7 +89900,6 @@
             "function WindowX(const name: String): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.WindowX(string name);",
             "public static int SplashKit.WindowX(string name);"
           ]
         }
@@ -90440,7 +90007,6 @@
             "function WindowY(const name: String): Integer"
           ],
           "csharp": [
-            "public static int WindowManager.WindowY(string name);",
             "public static int SplashKit.WindowY(string name);"
           ]
         }