diff --git a/ChangeLog b/ChangeLog
index 3031a84e5..e24fbf299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-04  Mike Kestner  <mkestner@novell.com>
+
+	* glib/Global.cs: renamed from Program.cs.  Program.Name is now 
+	Global.ProgramName to try to avoid clashes with existing Gnome.Program
+	usage.
+	* gtk/Application.cs: s/GLib.Program.Name/GLib.Global.ProgramName.
+
 2008-04-04  Mike Kestner  <mkestner@novell.com>
 
 	* atk/Atk.metadata: markup all the Ref* methods to indicate owned refs.
diff --git a/glib/Program.cs b/glib/Global.cs
similarity index 90%
rename from glib/Program.cs
rename to glib/Global.cs
index f946ea4c7..0f3e85371 100644
--- a/glib/Program.cs
+++ b/glib/Global.cs
@@ -1,4 +1,4 @@
-// GLib.Program.cs - GProgram class implementation
+// GLib.Global.cs - Global glib properties and methods.
 //
 // Author: Andres G. Aragoneses <aaragoneses@novell.com>
 //
@@ -25,15 +25,13 @@ namespace GLib {
 	using System.Text;
 	using System.Runtime.InteropServices;
 
-	public class Program
+	public class Global
 	{
 
 		//this is a static class
-		private Program ()
-		{
-		}
+		private Global () {}
 
-		public static string Name {
+		public static string ProgramName {
 			get {
 				return GLib.Marshaller.PtrToStringGFree(g_get_prgname());
 			}
diff --git a/glib/Makefile.am b/glib/Makefile.am
index be60955ef..a0105ddfc 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -32,6 +32,7 @@ sources =		 			\
 	GException.cs				\
 	GInterfaceAdapter.cs			\
 	GInterfaceAttribute.cs			\
+	Global.cs				\
 	GString.cs				\
 	GType.cs				\
 	GTypeAttribute.cs			\
@@ -53,7 +54,6 @@ sources =		 			\
 	Object.cs				\
 	ObjectManager.cs			\
 	Opaque.cs				\
-	Program.cs				\
 	PropertyAttribute.cs			\
 	Signal.cs				\
 	SignalArgs.cs				\
diff --git a/gtk/Application.cs b/gtk/Application.cs
index 9beddc2be..05673afb6 100755
--- a/gtk/Application.cs
+++ b/gtk/Application.cs
@@ -41,7 +41,7 @@ namespace Gtk {
 
 		static void SetPrgname ()
 		{
-			GLib.Program.Name = System.IO.Path.GetFileNameWithoutExtension (Environment.GetCommandLineArgs () [0]);
+			GLib.Global.ProgramName = System.IO.Path.GetFileNameWithoutExtension (Environment.GetCommandLineArgs () [0]);
 		}
 
 		public static void Init ()