diff -r a1f1eaaf458b -r 3f9dd37d98a8 app/soc/views/models/base.py
--- a/app/soc/views/models/base.py	Sat Apr 11 22:57:23 2009 +0000
+++ b/app/soc/views/models/base.py	Sat Apr 11 22:58:19 2009 +0000
@@ -433,7 +433,7 @@
       edit_form: The edit_form is used as form if there is an existing
         entity. The existing entity is passed as instance to it on
         construction. If key_name is part of it's fields it will be
-        set to the entity's key().name() value. It is also passed as
+        set to the entity's key().id_or_name() value. It is also passed as
         argument to the _editGet method. See the docstring for
         _editGet on how it uses it.
       create_form: The create_form is used as form if there was no
@@ -474,7 +474,7 @@
       form = params['edit_form'](instance=entity)
 
       if 'key_name' in form.fields:
-        form.fields['key_name'].initial = entity.key().name()
+        form.fields['key_name'].initial = entity.key().id_or_name()
 
       self._editGet(request, entity, form)
     else:
@@ -613,7 +613,7 @@
 
     if not logic.isDeletable(entity):
       page_params = params['cannot_delete_params']
-      params['suffix'] = entity.key().name()
+      params['suffix'] = entity.key().id_or_name()
       request.path = params['edit_redirect'] % params
 
       # redirect to the edit page