diff -r baeb847b88e6 -r 8ade9aac79f9 app/soc/tasks/updates/module_conversion.py
--- a/app/soc/tasks/updates/module_conversion.py	Sun Oct 18 16:52:38 2009 +0200
+++ b/app/soc/tasks/updates/module_conversion.py	Sun Oct 18 16:53:24 2009 +0200
@@ -515,12 +515,13 @@
 
   for entity in entities:
     if entity.prefix == 'org':
-      org_entity = org_logic.getFromKeyName(entity.key().id_or_name())
+      org_entity = org_logic.getFromKeyName(entity.scope.key().id_or_name())
       entity.scope = org_entity
       entity.home_for = org_entity if entity.home_for else None
 
     if entity.prefix == 'program':
-      program_entity = program_logic.getFromKeyName(entity.key().id_or_name())
+      program_entity = program_logic.getFromKeyName(
+          entity.scope.key().id_or_name())
       entity.scope = program_entity
       entity.home_for = program_entity if entity.home_for else None