diff --git a/ChangeLog b/ChangeLog
index be33d5215..ddb02aa99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-28  Mike Kestner  <mkestner@ximian.com>
+
+	[Expanded from patch by John Luke attached to bug.]
+	* gdk/Gdk.metadata : rename Atom.Name to GetName so it props.
+	* gdk/Atom.custom : new string cast operator.
+	* sample/TestDnd.cs : fix Atom.Name reference
+	* sample/GtkDemo/DemoEditableCell.cs : fix a ListStore.Remove
+	ref broken by last commit.
+	[Fixes #57721]
+
 2004-04-28  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/Gtk.metadata : mark ListStore.Remove iter pass_as=ref.
diff --git a/gdk/Atom.custom b/gdk/Atom.custom
new file mode 100644
index 000000000..736c8ae27
--- /dev/null
+++ b/gdk/Atom.custom
@@ -0,0 +1,9 @@
+//
+// Atom.custom
+// 
+
+public static implicit operator string (Gdk.Atom atom)
+{
+	return atom.Name;
+}
+
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index 8ecd4cb26..f422d396a 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -87,5 +87,6 @@
   <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetRectangles']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr>
   <attr path="/api/namespace/struct[@cname='GdkWindowObject']" name="hidden">1</attr>
+  <attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='Name']" name="name">GetName</attr>
 </metadata>
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 81b7b1ed3..516f3ae28 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -39,6 +39,7 @@ sources = 			\
 build_sources = $(addprefix $(srcdir)/, $(sources))
 
 customs = 			\
+	Atom.custom		\
 	Color.custom		\
 	DeviceAxis.custom	\
 	Display.custom		\
diff --git a/sample/GtkDemo/DemoEditableCells.cs b/sample/GtkDemo/DemoEditableCells.cs
index 5aec3acef..1b41a4127 100644
--- a/sample/GtkDemo/DemoEditableCells.cs
+++ b/sample/GtkDemo/DemoEditableCells.cs
@@ -195,7 +195,7 @@ namespace GtkDemo
  			if (treeView.Selection.GetSelected (out model, out iter))
 			{
  				TreePath path = store.GetPath (iter);
- 				store.Remove (out iter);
+ 				store.Remove (ref iter);
 				//articles.RemoveAt (path.Indices[0]);
 
 			}
diff --git a/sample/TestDnd.cs b/sample/TestDnd.cs
index e42eee84d..a545448ec 100644
--- a/sample/TestDnd.cs
+++ b/sample/TestDnd.cs
@@ -306,7 +306,7 @@ public class TestDnd {
 
 		Atom [] targets = args.Context.Targets;
 		foreach (Atom a in targets)
-			Console.WriteLine (a.Name ()); // FIXME shouldn't Name be a property?
+			Console.WriteLine (a.Name); 
 
 		Gdk.Drag.Status (args.Context, args.Context.SuggestedAction, args.Time);
 		args.RetVal = true;