Index: openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl,v
diff -u -N -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl	11 Oct 2021 20:11:37 -0000	1.7.2.2
+++ openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl	18 Oct 2021 16:31:20 -0000	1.7.2.3
@@ -1,7 +1,7 @@
 # Create the cache used by util_memoize.
 
 ns_cache create util_memoize -size \
-    [parameter::get -package_id $::acs::kernel_id -parameter MaxSize -default 200000]
+    [parameter::get -package_id [ad_acs_kernel_id] -parameter MaxSize -default 200000]
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl,v
diff -u -N -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl	12 Oct 2021 08:56:10 -0000	1.10.2.3
+++ openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl	18 Oct 2021 16:31:19 -0000	1.10.2.4
@@ -8,7 +8,7 @@
 
 ad_proc server_cluster_enabled_p {} { Returns true if clustering is enabled. } {
     return [parameter::get \
-                -package_id $::acs::kernel_id \
+                -package_id [ad_acs_kernel_id] \
                 -parameter ClusterEnabledP \
                 -default 0]
 }
@@ -22,7 +22,7 @@
     if { ![server_cluster_enabled_p] } {
         return {}
     }
-    return [parameter::get -package_id $::acs::kernel_id -parameter ClusterPeerIP]
+    return [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterPeerIP]
 }
 
 ad_proc server_cluster_peer_hosts {} {
@@ -51,7 +51,7 @@
         return 1
     }
 
-    foreach glob [parameter::get -package_id $::acs::kernel_id -parameter ClusterAuthorizedIP] {
+    foreach glob [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterAuthorizedIP] {
         if { [string match $glob $ip] } {
             return 1
         }
@@ -87,7 +87,7 @@
     Since the server can listen to multiple IP addresses and on
     multiple ports, all of these have to be checked.
 } {
-    set canonical_server [parameter::get -package_id $::acs::kernel_id -parameter CanonicalServer]
+    set canonical_server [parameter::get -package_id [ad_acs_kernel_id] -parameter CanonicalServer]
     if { $canonical_server eq "" } {
         ns_log Error "Your configuration is not correct for server clustering." \
             "Please ensure that you have the CanonicalServer parameter set correctly."