diff -r 35211afcd563 -r c76a366c7ab4 app/soc/logic/key_name.py
--- a/app/soc/logic/key_name.py	Fri Oct 10 13:14:24 2008 +0000
+++ b/app/soc/logic/key_name.py	Sun Oct 12 00:08:54 2008 +0000
@@ -23,7 +23,7 @@
   ]
 
 
-from soc.logic import path_linkname
+from soc.logic import path_link_name
 
 
 class Error(Exception):
@@ -50,7 +50,7 @@
   if link_name:
     path.append(link_name)
 
-  path = path_linkname.combinePath(path)
+  path = path_link_name.combinePath(path)
 
   if not path:
     raise Error('"path" must be non-False: "%s"' % path)
@@ -106,7 +106,7 @@
     Error if sponsor_ln, program_ln, and link_Name combine to produce
     a "False" path (None, empty string, etc.)
   """
-  path = path_linkname.combinePath([[sponsor_ln, program_ln], link_name])
+  path = path_link_name.combinePath([[sponsor_ln, program_ln], link_name])
   
   if not path:
     raise Error('"path" must be non-False: "%s"' % path)
@@ -126,7 +126,7 @@
     Error if sponsor_ln, program_ln, and link_Name combine to produce
     a "False" path (None, empty string, etc.)
   """
-  path = path_linkname.combinePath([[sponsor_ln, program_ln], link_name])
+  path = path_link_name.combinePath([[sponsor_ln, program_ln], link_name])
   
   if not path:
     raise Error('"path" must be non-False: "%s"' % path)