Index: openacs-4/packages/acs-bootstrap-installer/installer/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/install.tcl,v
diff -u -N -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	16 Nov 2019 15:45:55 -0000	1.13.2.2
+++ openacs-4/packages/acs-bootstrap-installer/installer/install.tcl	17 Oct 2020 16:41:27 -0000	1.13.2.3
@@ -111,7 +111,7 @@
     # stub util_memoize_flush...
     rename util_memoize_flush util_memoize_flush_saved
     proc util_memoize_flush {args} {}
-    permission::grant -party_id $user_id -object_id [acs_lookup_magic_object security_context_root] -privilege "admin"
+    permission::grant -party_id $user_id -object_id [acs_magic_object security_context_root] -privilege "admin"
     # nuke stub 
     rename util_memoize_flush {}
     rename util_memoize_flush_saved util_memoize_flush
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -N -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	3 Jul 2020 07:43:20 -0000	1.24.2.1
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	17 Oct 2020 16:41:27 -0000	1.24.2.2
@@ -179,7 +179,7 @@
 
             # Hack for adding users to the main subsite, whose application group is the registered users group.
 
-            if { $add_to_group_id != [acs_lookup_magic_object "registered_users"] ||
+            if { $add_to_group_id != [acs_magic_object "registered_users"] ||
                  $add_with_rel_type ne "membership_rel"
              } {
                 relation_add -member_state $rel_member_state $add_with_rel_type $add_to_group_id $user_id
Index: openacs-4/packages/acs-subsite/www/shared/parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.tcl,v
diff -u -N -r1.25.2.3 -r1.25.2.4
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl	13 Feb 2020 10:42:42 -0000	1.25.2.3
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl	17 Oct 2020 16:41:27 -0000	1.25.2.4
@@ -14,7 +14,7 @@
 
 if { $scope eq "global" } {
     permission::require_permission \
-        -object_id [acs_lookup_magic_object security_context_root] \
+        -object_id [acs_magic_object security_context_root] \
         -privilege admin
     db_1row select_pretty_name {}
 
Index: openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl,v
diff -u -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl	1 Sep 2020 15:11:19 -0000	1.10.2.1
+++ openacs-4/packages/assessment/tcl/as-apm-action-procs.tcl	17 Oct 2020 16:41:27 -0000	1.10.2.2
@@ -9,7 +9,7 @@
 ad_proc -private as::actions::get_admin_user_id {} {
     Return the user id of a site-wide-admin on the system
 } {
-    set context_root_id [acs_lookup_magic_object security_context_root]
+    set context_root_id [acs_magic_object security_context_root]
 
     return [db_string select_user_id {
         select min(user_id)