Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v
diff -u -r1.41.2.2 -r1.41.2.3
--- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	10 Mar 2019 22:13:52 -0000	1.41.2.2
+++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	15 Mar 2019 08:48:21 -0000	1.41.2.3
@@ -27,7 +27,7 @@
                    -where {
                      package_key = :package_key 
                      and s.object_id = package_id
-                     and acs_permission__permission_p(package_id, :party_id, :privilege)
+                     and acs_permission.permission_p(package_id, :party_id, :privilege)
                    } -limit 1]
       ::xo::dc get_value get_package_id $sql
     } else {
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -r1.76.2.4 -r1.76.2.5
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	10 Mar 2019 22:13:52 -0000	1.76.2.4
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	15 Mar 2019 08:48:21 -0000	1.76.2.5
@@ -1244,13 +1244,13 @@
                         o.creation_user as author_id, \
                         to_char(o.last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,\
                         r.description,\
-                        acs_permission__permission_p(r.revision_id,:user_id,'admin') as admin_p,\
-                        acs_permission__permission_p(r.revision_id,:user_id,'delete') as delete_p,\
+                        acs_permission.permission_p(r.revision_id,:user_id,'admin') as admin_p,\
+                        acs_permission.permission_p(r.revision_id,:user_id,'delete') as delete_p,\
                         r.content_length,\
                         content_revision__get_number(r.revision_id) as version_number " \
                  -from  "cr_items ci, cr_revisions r, acs_objects o" \
                  -where "ci.item_id = :page_id and r.item_id = ci.item_id and o.object_id = r.revision_id
-                         and acs_permission__permission_p(r.revision_id, :user_id, 'read')" \
+                         and acs_permission.permission_p(r.revision_id, :user_id, 'read')" \
                  -orderby "r.revision_id desc"]
 
     ::xo::dc foreach revisions_select $sql {
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.61.2.1 -r1.61.2.2
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	14 Feb 2019 16:15:01 -0000	1.61.2.1
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	15 Mar 2019 08:49:35 -0000	1.61.2.2
@@ -196,7 +196,7 @@
     set bulk_delete_p [db_string some_deletables {
         select exists (select 1 from fs_objects
                        where parent_id = :folder_id
-                       and acs_permission__permission_p(object_id, :viewing_user_id, 'delete'))
+                       and acs_permission.permission_p(object_id, :viewing_user_id, 'delete'))
     }]
     set bulk_copy_p [permission::permission_p -object_id $folder_id -privilege write]
 
Index: openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql	7 Aug 2017 23:48:30 -0000	1.4
+++ openacs-4/packages/xotcl-core/lib/revisions-postgresql.xql	15 Mar 2019 08:56:25 -0000	1.4.2.1
@@ -11,13 +11,13 @@
         n.creation_user as author_id,
         to_char(n.last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified_ansi,
         n.description,
-        acs_permission__permission_p(n.revision_id,:user_id,'admin') as admin_p,
-        acs_permission__permission_p(n.revision_id,:user_id,'delete') as delete_p,
+        acs_permission.permission_p(n.revision_id,:user_id,'admin') as admin_p,
+        acs_permission.permission_p(n.revision_id,:user_id,'delete') as delete_p,
         char_length(n.data) as content_size,
         content_revision__get_number(n.revision_id) as version_number
         from cr_revisionsi n, cr_items ci
         where ci.item_id = n.item_id and ci.item_id = :page_id
-        and acs_permission__permission_p(n.revision_id, :user_id, 'read')
+        and acs_permission.permission_p(n.revision_id, :user_id, 'read')
         order by n.revision_id desc
       </querytext>
   </fullquery>