diff --git a/ChangeLog b/ChangeLog
index 5c47941ab..98f9ea938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26  Mike Kestner  <mkestner@ximian.com>
+
+	* gnome/GtkSharp.* : move to Gnome namespace
+	* gnome/CanvasProxy.cs : update event handler namespaces
+	* gnome/voidObject*.cs : internalize
+
 2004-02-24  Mike Kestner  <mkestner@ximian.com>
 
 	* pango/AttrIterator.custom : manually implement SList method.
diff --git a/gnome/CanvasProxy.cs b/gnome/CanvasProxy.cs
index 260fd7bab..dc568fbe6 100644
--- a/gnome/CanvasProxy.cs
+++ b/gnome/CanvasProxy.cs
@@ -24,7 +24,7 @@ namespace Gnome {
 
 		private Hashtable Signals = new Hashtable ();
 
-		public event GtkSharp.UpdateHandler Update {
+		public event UpdateHandler Update {
 			add {
 				if (EventList["update"] == null)
 					Signals["update"] = new GtkSharp.voidObjectAffineSVPintSignal(this, Handle, "update", value, System.Type.GetType("EventArgs"));
@@ -103,7 +103,7 @@ namespace Gnome {
 		}
 
 
-		public event GtkSharp.DrawHandler Draw {
+		public event DrawHandler Draw {
 			add {
 				throw new NotImplementedException ();
 			}
@@ -115,7 +115,7 @@ namespace Gnome {
 			}
 		}
 
-		public event GtkSharp.RenderHandler Render {
+		public event RenderHandler Render {
 			add {
 				throw new NotImplementedException ();
 			}
@@ -127,7 +127,7 @@ namespace Gnome {
 			}
 		}
 
-		public event GtkSharp.PointHandler Point {
+		public event PointHandler Point {
 			add {
 				throw new NotImplementedException ();
 			}
@@ -139,7 +139,7 @@ namespace Gnome {
 			}
 		}
 
-		public event GtkSharp.BoundsHandler Bounds {
+		public event BoundsHandler Bounds {
 			add {
 				throw new NotImplementedException ();
 			}
diff --git a/gnome/GtkSharp.BoundsHandler.cs b/gnome/GtkSharp.BoundsHandler.cs
index 1dd805bcb..70b7cf28e 100644
--- a/gnome/GtkSharp.BoundsHandler.cs
+++ b/gnome/GtkSharp.BoundsHandler.cs
@@ -6,7 +6,7 @@
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
-namespace GtkSharp {
+namespace Gnome {
 
 	using System;
 
diff --git a/gnome/GtkSharp.DrawHandler.cs b/gnome/GtkSharp.DrawHandler.cs
index 0cf6533d5..4a16ffafe 100644
--- a/gnome/GtkSharp.DrawHandler.cs
+++ b/gnome/GtkSharp.DrawHandler.cs
@@ -1,12 +1,12 @@
 //
-// GtkSharp.DrawHandler.cs
+// Gnome.DrawHandler.cs
 //
 // Author: Duncan Mak (duncan@ximian.com)
 //
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
-namespace GtkSharp {
+namespace Gnome {
 
 	using System;
 
diff --git a/gnome/GtkSharp.PointHandler.cs b/gnome/GtkSharp.PointHandler.cs
index 946dc1ea3..d7126dbc3 100644
--- a/gnome/GtkSharp.PointHandler.cs
+++ b/gnome/GtkSharp.PointHandler.cs
@@ -1,12 +1,12 @@
 //
-// GtkSharp.PointHandler.cs
+// Gnome.PointHandler.cs
 //
 // Author: Duncan Mak (duncan@ximian.com)
 //
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
-namespace GtkSharp {
+namespace Gnome {
 
 	using System;
 
diff --git a/gnome/GtkSharp.RenderHandler.cs b/gnome/GtkSharp.RenderHandler.cs
index f22959e06..1340464bf 100644
--- a/gnome/GtkSharp.RenderHandler.cs
+++ b/gnome/GtkSharp.RenderHandler.cs
@@ -1,12 +1,12 @@
 //
-// GtkSharp.RenderHandler.cs
+// Gnome.RenderHandler.cs
 //
 // Author: Duncan Mak (duncan@ximian.com)
 //
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
-namespace GtkSharp {
+namespace Gnome {
 
 	using System;
 
diff --git a/gnome/GtkSharp.UpdateHandler.cs b/gnome/GtkSharp.UpdateHandler.cs
index 8851a2c7a..428c20dc9 100644
--- a/gnome/GtkSharp.UpdateHandler.cs
+++ b/gnome/GtkSharp.UpdateHandler.cs
@@ -1,12 +1,12 @@
 //
-// GtkSharp.CanvasUpdateHandler.cs
+// Gnome.CanvasUpdateHandler.cs
 //
 // Author: Duncan Mak (duncan@ximian.com)
 //
 // 2002 (C) Copyright, Ximian, Inc.
 //
 
-namespace GtkSharp {
+namespace Gnome {
 
 	using System;
 
diff --git a/gnome/voidObjectAffineSVPintSignal.cs b/gnome/voidObjectAffineSVPintSignal.cs
index 6b7250849..9268f1e6d 100644
--- a/gnome/voidObjectAffineSVPintSignal.cs
+++ b/gnome/voidObjectAffineSVPintSignal.cs
@@ -5,9 +5,9 @@ namespace GtkSharp {
 	using System;
 	using System.Runtime.InteropServices;
 
-	public delegate void voidObjectAffineSVPintDelegate(IntPtr arg0, IntPtr arg1, ref Art.SVP arg2, int arg3, int key);
+	internal delegate void voidObjectAffineSVPintDelegate(IntPtr arg0, IntPtr arg1, ref Art.SVP arg2, int arg3, int key);
 
-	public class voidObjectAffineSVPintSignal : SignalCallback {
+	internal class voidObjectAffineSVPintSignal : SignalCallback {
 
 		private static voidObjectAffineSVPintDelegate _Delegate;