diff -r 217921e76f50 -r 850d9a5ad894 app/soc/models/user.py
--- a/app/soc/models/user.py	Sat Nov 22 08:44:54 2008 +0000
+++ b/app/soc/models/user.py	Sat Nov 22 08:55:55 2008 +0000
@@ -77,9 +77,9 @@
   #: Required field storing publicly-displayed name.  Can be a real name
   #: (though this is not recommended), or a nick name or some other public
   #: alias.  Public names can be any valid UTF-8 text.
-  public_name = db.StringProperty(required=True,
+  name = db.StringProperty(required=True,
       verbose_name=ugettext_lazy('Public name'))
-  public_name.help_text = ugettext_lazy(
+  name.help_text = ugettext_lazy(
       'Human-readable name (UTF-8) that will be displayed publicly on the'
       ' site. While you can use your real name, like "First Last", please'
       ' keep in mind that this "public name" will be used as your alias'