diff -r 52557918ec8f -r aae25d2b4464 app/soc/models/work.py
--- a/app/soc/models/work.py	Thu Nov 20 18:06:43 2008 +0000
+++ b/app/soc/models/work.py	Thu Nov 20 18:50:30 2008 +0000
@@ -57,23 +57,23 @@
   title.help_text = ugettext_lazy(
       'title of the document; often used in the window title')
 
-  #: Required path, prepended to a "link name" to form the document URL.
-  #: The combined path and link name must be globally unique on the
+  #: Required path, prepended to a "link ID" to form the document URL.
+  #: The combined path and link ID must be globally unique on the
   #: site.  Except in /site/document (Developer) forms, this field is not
   #: usually directly editable by the User, but is instead set by controller
   #: logic to match the "scope" of the document.
   partial_path = db.StringProperty(required=True,
       verbose_name=ugettext_lazy('Partial path'))
   partial_path.help_text = ugettext_lazy(
-    'path portion of URLs, prepended to link name')
+    'path portion of URLs, prepended to link ID')
 
-  #: Required link name, appended to a "path" to form the document URL.
-  #: The combined path and link name must be globally unique on the
-  #: site (but, unlike some link names, a Work link name can be reused,
+  #: Required link ID, appended to a "path" to form the document URL.
+  #: The combined path and link ID must be globally unique on the
+  #: site (but, unlike some link IDs, a Work link ID can be reused,
   #: as long as the combination with the preceding path is unique).
-  link_name = db.StringProperty(required=True,
-      verbose_name=ugettext_lazy('Link name'))
-  link_name.help_text = ugettext_lazy('link name used in URLs')
+  link_id = db.StringProperty(required=True,
+      verbose_name=ugettext_lazy('Link ID'))
+  link_id.help_text = ugettext_lazy('link ID used in URLs')
 
   #: short name used in places such as the sidebar menu and breadcrumb trail
   #: (optional: title will be used if short_name is not present)