diff --git a/Ooui/Canvas.cs b/Ooui/Canvas.cs
index 3fed795..b66aab1 100644
--- a/Ooui/Canvas.cs
+++ b/Ooui/Canvas.cs
@@ -4,7 +4,7 @@ namespace Ooui
 {
     public class Canvas : Element
     {
-        Context2d context2d = new Context2d ();
+        CanvasRenderingContext2D context2d = new CanvasRenderingContext2D ();
         int gotContext2d = 0;
 
         int width = 150;
diff --git a/Ooui/CanvasRenderingContext2D.cs b/Ooui/CanvasRenderingContext2D.cs
new file mode 100644
index 0000000..a0bcd93
--- /dev/null
+++ b/Ooui/CanvasRenderingContext2D.cs
@@ -0,0 +1,10 @@
+namespace Ooui
+{
+    public class CanvasRenderingContext2D : EventTarget
+    {
+        public CanvasRenderingContext2D ()
+            : base ("#canvasRenderingContext2D")
+        {
+        }
+    }
+}
diff --git a/Ooui/Context2d.cs b/Ooui/Context2d.cs
deleted file mode 100644
index 3cccbba..0000000
--- a/Ooui/Context2d.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Ooui
-{
-    public class Context2d : EventTarget
-    {
-        public Context2d()
-            : base ("context2d")
-        {
-        }
-    }
-}