--- a/app/soc/templates/soc/host/list/heading.html	Mon Dec 08 17:31:33 2008 +0000
+++ b/app/soc/templates/soc/host/list/heading.html	Tue Dec 09 15:43:56 2008 +0000
@@ -1,6 +1,6 @@
 <tr align="left">
   <th class="first" align="right">User link ID</th>
-  <th>Sponsor name</th>
+  <th>Program Owner</th>
   <th>Given name</th>
   <th>Surname</th>
 </tr>

--- a/app/soc/templates/soc/program/list/heading.html	Mon Dec 08 17:31:33 2008 +0000
+++ b/app/soc/templates/soc/program/list/heading.html	Tue Dec 09 15:43:56 2008 +0000
@@ -1,4 +1,4 @@
 <tr align="left">
   <th>Program Name</th>
-  <th>Sponsor</th>
+  <th>Program Owner</th>
 </tr>

--- a/app/soc/views/models/host.py	Mon Dec 08 17:31:33 2008 +0000
+++ b/app/soc/views/models/host.py	Tue Dec 09 15:43:56 2008 +0000
@@ -99,9 +99,9 @@
     new_params['group_view'] = soc.views.models.sponsor.view
     new_params['invite_filter'] = {'group_ln': 'link_id'}
 
-    new_params['name'] = "Host"
-    new_params['name_short'] = "Host"
-    new_params['name_plural'] = "Hosts"
+    new_params['name'] = "Program Administrator"
+    new_params['name_short'] = "Program Administrator"
+    new_params['name_plural'] = "Program Administrators"
     new_params['url_name'] = "host"
     new_params['module_name'] = "host"
 

--- a/app/soc/views/models/sponsor.py	Mon Dec 08 17:31:33 2008 +0000
+++ b/app/soc/views/models/sponsor.py	Tue Dec 09 15:43:56 2008 +0000
@@ -47,9 +47,9 @@
     new_params = {}
     new_params['logic'] = soc.logic.models.sponsor.logic
 
-    new_params['name'] = "Sponsor"
-    new_params['name_short'] = "Sponsor"
-    new_params['name_plural'] = "Sponsors"
+    new_params['name'] = "Program Owner"
+    new_params['name_short'] = "Program Owner"
+    new_params['name_plural'] = "Program Owners"
     # TODO(pawel.solyga): create url_name and module_name automatically 
     # from name. Make that work for all other Views too. Hopefully 
     # solution that will be implemented in base View.