Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.49.2.2 -r1.49.2.3
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	5 Oct 2019 13:29:58 -0000	1.49.2.2
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	16 Nov 2019 15:09:53 -0000	1.49.2.3
@@ -98,7 +98,7 @@
 
 }
 
-ad_proc -private template:template_tag_include_helper_code {
+ad_proc -private template::template_tag_include_helper_code {
     -command
     -src
     {-ds_avail_p 0}
@@ -171,7 +171,7 @@
     return $snippet
 }
 
-ad_proc -private template:template_tag_include_command {src params} {
+ad_proc -private template::template_tag_include_command {src params} {
 } {
     # pass additional arguments as key-value pairs
 
@@ -193,7 +193,7 @@
 #
 # Include another template in the current template
 #
-ad_proc -private template:template_tag_include_helper {params} {
+ad_proc -private template::template_tag_include_helper {params} {
 } {
     set src [ns_set iget $params src]
     set ds [ns_set iget $params ds]
@@ -205,10 +205,10 @@
         ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
     }
 
-    template::adp_append_code [template:template_tag_include_helper_code \
+    template::adp_append_code [template::template_tag_include_helper_code \
                                    -ds_avail_p [expr {[info commands ::ds_adp_start_box] ne "" }] \
                                    -src $src \
-                                   -command [template:template_tag_include_command $src $params]]
+                                   -command [template::template_tag_include_command $src $params]]
 
     # End developer support frame around subordinate template.
     if { $ds && [info commands ::ds_enabled_p] ne "" && $ds_avail_p } {
@@ -222,7 +222,7 @@
     # the theme package
     #
     ns_set update $params src [template::themed_template [ns_set iget $params src]]
-    template:template_tag_include_helper $params
+    template::template_tag_include_helper $params
 }
 
 #
@@ -238,7 +238,7 @@
     if {[file exists $::acs::rootdir/$adp_stub.adp]} {
         ns_set update $params src $adp_stub
     }
-    template:template_tag_include_helper $params
+    template::template_tag_include_helper $params
 }
 
 
@@ -464,12 +464,12 @@
 
 template_tag if { chunk params } {
 
-  template_tag_if_condition $chunk $params if
+    template::template_tag_if_condition $chunk $params if
 }
 
 template_tag elseif { chunk params } {
 
-  template_tag_if_condition $chunk $params elseif
+    template::template_tag_if_condition $chunk $params elseif
 }
 
 
@@ -740,7 +740,7 @@
       ::ds_adp_start_box -stub "\[template::util::url_to_file \"$src\" \"\$__adp_stub\"\]"
   }
 
-  set command [template:template_tag_include_command $src $params]
+  set command [template::template_tag_include_command $src $params]
 
   # __adp_include_optional_output is a list that operates like a stack
   # So first we execute the include template, and push the result onto this stack
Index: openacs-4/packages/acs-templating/tcl/tag-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-procs.tcl,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/acs-templating/tcl/tag-procs.tcl	25 Apr 2019 07:02:22 -0000	1.27.2.1
+++ openacs-4/packages/acs-templating/tcl/tag-procs.tcl	16 Nov 2019 15:09:53 -0000	1.27.2.2
@@ -15,7 +15,7 @@
 # http://www.fsf.org/copyleft/gpl.html
 
 
-ad_proc -private template_tag_if_condition { chunk params condition_type } {
+ad_proc -private template::template_tag_if_condition { chunk params condition_type } {
 
     set condition "$condition_type \{"
 
@@ -66,7 +66,7 @@
     template::adp_append_code "\}"
 }
 
-ad_proc -public template_tag_if_concat_params { params } {
+ad_proc -private template::template_tag_if_concat_params { params } {
     append all the tags together and then eval as a list to restore
     quotes
 } {
@@ -94,7 +94,7 @@
     return $tokens
 }
 
-ad_proc -private template_tag_subst_reference {arg} {
+ad_proc -private template::template_tag_subst_reference {arg} {
     substitute variable references
     @return variable name
 } {
@@ -107,7 +107,7 @@
 }
 
 
-ad_proc -public template_tag_if_interp_expr {} {
+ad_proc -public template::template_tag_if_interp_expr {} {
     Interpret an expression as part of the simplified IF syntax
 } {