diff -r 94834a1e6c01 -r 839740b061ad app/soc/views/user/profile.py
--- a/app/soc/views/user/profile.py	Sat Nov 15 03:12:33 2008 +0000
+++ b/app/soc/views/user/profile.py	Sat Nov 15 16:17:11 2008 +0000
@@ -84,7 +84,7 @@
 }
 
 @decorators.view
-def edit(request, page=None, link_name=None, 
+def edit(request, page_name=None, link_name=None, 
          template=DEF_USER_PROFILE_EDIT_TMPL):
   """View for a User to modify the properties of a User Model entity.
 
@@ -106,7 +106,7 @@
 
   if (not account) and (not link_name):
     # not logged in, and no link name, so request that the user sign in 
-    return simple.requestLogin(request, page, template, context,
+    return simple.requestLogin(request, page_name, template, context,
         # TODO(tlarsen): /user/profile could be a link to a help page instead
         login_message_fmt=ugettext_lazy(
             'To create a new <a href="/user/profile">User Profile</a>'
@@ -115,7 +115,7 @@
 
   if (not account) and link_name:
     # not logged in, so show read-only public profile for link_name user
-    return simple.public(request, page=page, template=template, 
+    return simple.public(request, page_name=page_name, template=template, 
                          link_name=link_name, context=context)
 
   link_name_user = None
@@ -126,13 +126,13 @@
       link_name_user = accounts.getUserFromLinkNameOr404(link_name)
   except out_of_band.ErrorResponse, error:
     # show custom 404 page when link name doesn't exist in Datastore
-    return simple.errorResponse(request, page, error, template, context)
+    return simple.errorResponse(request, page_name, error, template, context)
   
   # link_name_user will be None here if link name was already None...
   if link_name_user and (link_name_user.account != account):
     # link_name_user exists but is not the currently logged in Google Account,
     # so show public view for that (other) User entity
-    return simple.public(request, page=page, template=template, 
+    return simple.public(request, page_name=page_name, template=template, 
                          link_name=link_name, context=context)
 
   if request.method == 'POST':
@@ -151,7 +151,7 @@
       if models.user.logic.isFormerAccount(account):
         msg = DEF_USER_ACCOUNT_INVALID_MSG
         error = out_of_band.ErrorResponse(msg)
-        return simple.errorResponse(request, page, error, template, context)
+        return simple.errorResponse(request, page_name, error, template, context)
       
       user = models.user.logic.updateOrCreateFromAccount(properties, account)
       
@@ -193,7 +193,7 @@
 
 
 @decorators.view
-def create(request, page=None, template=DEF_USER_PROFILE_EDIT_TMPL):
+def create(request, page_name=None, template=DEF_USER_PROFILE_EDIT_TMPL):
   """create() view is same as edit() view, but with no link_name supplied.
   """
-  return edit(request, page=page, link_name=None, template=template)
\ No newline at end of file
+  return edit(request, page_name=page_name, link_name=None, template=template)
\ No newline at end of file