Index: openacs-4/packages/acs-subsite/lib/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.tcl,v
diff -u -r1.6.10.1 -r1.6.10.2
--- openacs-4/packages/acs-subsite/lib/applications.tcl	10 Sep 2015 08:21:34 -0000	1.6.10.1
+++ openacs-4/packages/acs-subsite/lib/applications.tcl	1 Jul 2016 13:47:06 -0000	1.6.10.2
@@ -34,7 +34,7 @@
     and    t.package_key = p.package_key
     and    t.package_type = 'apm_application'
     and    exists (select 1 
-                   from   all_object_party_privilege_map perm 
+                   from   acs_object_party_privilege_map perm 
                    where  perm.object_id = p.package_id
                    and    perm.privilege = 'read'
                    and    perm.party_id = :user_id)
Index: openacs-4/packages/acs-subsite/lib/subsites.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.xql,v
diff -u -r1.3 -r1.3.18.1
--- openacs-4/packages/acs-subsite/lib/subsites.xql	12 Mar 2005 22:59:59 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/subsites.xql	1 Jul 2016 13:47:06 -0000	1.3.18.1
@@ -31,7 +31,7 @@
       and    ag.package_id = p.package_id
       and    g.group_id = ag.group_id
       and    (exists (select 1 
-                   from   all_object_party_privilege_map perm 
+                   from   acs_object_party_privilege_map perm 
                    where  perm.object_id = p.package_id
                    and    perm.privilege = 'read'
                    and    perm.party_id = :untrusted_user_id) or g.join_policy != 'closed')
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/Attic/delete-2.xql,v
diff -u -r1.3 -r1.3.30.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql	28 Nov 2001 18:39:39 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.xql	1 Jul 2016 13:47:06 -0000	1.3.30.1
@@ -16,7 +16,7 @@
       <querytext>
       
 	    select distinct o.object_id
-	    from acs_objects o, all_object_party_privilege_map perm
+	    from acs_objects o, acs_object_party_privilege_map perm
 	    where perm.object_id = o.object_id
               and perm.party_id = :user_id
               and perm.privilege = 'delete'
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-postgresql.xql,v
diff -u -r1.1 -r1.1.30.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-postgresql.xql	22 Jul 2001 17:28:40 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-list-postgresql.xql	1 Jul 2016 13:47:06 -0000	1.1.30.1
@@ -12,7 +12,7 @@
              where g.group_id = o.object_id
 		and o.object_type = :group_type) g,
            (select object_id
-            from all_object_party_privilege_map
+            from acs_object_party_privilege_map
             where party_id = :user_id and privilege = 'read') perm,
            application_group_element_map m
      where perm.object_id = g.group_id
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql,v
diff -u -r1.1 -r1.1.30.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.xql	1 Jul 2016 13:47:06 -0000	1.1.30.1
@@ -10,7 +10,7 @@
              where g.group_id = o.object_id 
                and o.object_type = :group_type) g, 
            (select object_id 
-            from all_object_party_privilege_map 
+            from acs_object_party_privilege_map 
             where party_id = :user_id and privilege = 'read') perm,
            application_group_element_map m
      where perm.object_id = g.group_id
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql,v
diff -u -r1.2 -r1.2.28.1
--- openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one-oracle.xql	1 Jul 2016 13:47:06 -0000	1.2.28.1
@@ -23,7 +23,7 @@
     from (select /*+ ORDERED */ DISTINCT  g.group_name, g.group_id
            from acs_objects o, groups g,
                 application_group_element_map app_group, 
-                all_object_party_privilege_map perm
+                acs_object_party_privilege_map perm
           where perm.object_id = g.group_id
             and perm.party_id = :user_id
             and perm.privilege = 'read'
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql,v
diff -u -r1.3.28.1 -r1.3.28.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	13 Jun 2016 11:02:34 -0000	1.3.28.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one-postgresql.xql	1 Jul 2016 13:47:06 -0000	1.3.28.2
@@ -10,7 +10,7 @@
     from (select DISTINCT g.group_name, g.group_id
            from acs_objects o, groups g,
                 application_group_element_map app_group, 
-                all_object_party_privilege_map perm
+                acs_object_party_privilege_map perm
           where perm.object_id = g.group_id
             and perm.party_id = :user_id
             and perm.privilege = 'read'
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql,v
diff -u -r1.1 -r1.1.30.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql	15 May 2001 16:59:00 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list-oracle.xql	1 Jul 2016 13:47:06 -0000	1.1.30.1
@@ -25,7 +25,7 @@
 select r.rel_id, 
        party_names.party_name as element_name
 from (select /*+ ORDERED */ DISTINCT rels.rel_id, object_id_two
-      from $extra_tables acs_rels rels, all_object_party_privilege_map perm
+      from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
       where perm.object_id = rels.rel_id
         and perm.party_id = :user_id
         and perm.privilege = 'read'
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	28 Oct 2015 09:38:35 -0000	1.5.2.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl	1 Jul 2016 13:47:06 -0000	1.5.2.3
@@ -50,7 +50,7 @@
 select r.rel_id, 
        party_names.party_name as element_name
 from (select /*+ ORDERED */ DISTINCT rels.rel_id, object_id_two
-      from $extra_tables acs_rels rels, all_object_party_privilege_map perm
+      from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
       where perm.object_id = rels.rel_id
         and perm.party_id = :user_id
         and perm.privilege = 'read'
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql,v
diff -u -r1.2 -r1.2.30.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.xql	1 Jul 2016 13:47:06 -0000	1.2.30.1
@@ -7,7 +7,7 @@
 select r.rel_id, 
        party_names.party_name as element_name
 from (select DISTINCT rels.rel_id, object_id_two
-      from $extra_tables acs_rels rels, all_object_party_privilege_map perm
+      from $extra_tables acs_rels rels, acs_object_party_privilege_map perm
       where perm.object_id = rels.rel_id
         and perm.party_id = :user_id
         and perm.privilege = 'read'
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql,v
diff -u -r1.2 -r1.2.30.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql	28 Nov 2001 22:01:40 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.xql	1 Jul 2016 13:47:06 -0000	1.2.30.1
@@ -12,7 +12,7 @@
        and s2.segment_id = c.required_rel_segment
        and s2.package_id = :package_id
        and exists (select 1
-                   from all_object_party_privilege_map perm
+                   from acs_object_party_privilege_map perm
                    where perm.object_id = c.constraint_id
                      and perm.party_id = :user_id
                      and perm.privilege = 'read')
Index: openacs-4/packages/acs-subsite/www/permissions/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index-oracle.xql,v
diff -u -r1.3 -r1.3.24.1
--- openacs-4/packages/acs-subsite/www/permissions/index-oracle.xql	16 Jan 2003 13:40:36 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/permissions/index-oracle.xql	1 Jul 2016 13:47:06 -0000	1.3.24.1
@@ -10,7 +10,7 @@
   from acs_objects o
   where exists (
     SELECT 1 
-      FROM all_object_party_privilege_map map
+      FROM acs_object_party_privilege_map map
      WHERE map.object_id = o.object_id
        and map.party_id = :user_id
        and map.privilege = 'admin')
Index: openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql,v
diff -u -r1.6 -r1.6.18.1
--- openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	24 Feb 2005 11:10:31 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/permissions/one-oracle.xql	1 Jul 2016 13:47:06 -0000	1.6.18.1
@@ -60,7 +60,7 @@
 	from acs_objects o
 	where context_id = :object_id
               and exists (select 1
-                          from all_object_party_privilege_map
+                          from acs_object_party_privilege_map
                           where object_id = o.object_id
                           and party_id = :user_id
                           and privilege = 'admin')