Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.148.2.10 -r1.148.2.11
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	8 May 2019 13:39:39 -0000	1.148.2.10
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	4 Jul 2019 18:07:48 -0000	1.148.2.11
@@ -1,6 +1,6 @@
 ::xo::library doc {
 
-  XOTcl API for low level db abstraction
+  XOTcl API for low-level db abstraction
 
   @author Gustaf Neumann
   @creation-date 2006-12-28
@@ -23,7 +23,7 @@
   # database context) quite similar to ::xo::cc (the default
   # connection context). In general ::xo::dc can be reconfigured at
   # runtime, and multiple database context can be established,
-  # although there is no high level support to connect to multiple
+  # although there is no high-level support to connect to multiple
   # different OpenACS databases at the same time.
   #
   ##########################################################################
@@ -2824,20 +2824,20 @@
     # :destroy_on_cleanup
 
     # PRESERVE ROWS means that the data will be available until the end of the SQL session
-    set sql_create "CREATE global temporary table [:name] on commit PRESERVE ROWS as "
+    set sql_create "CREATE global temporary table ${:name} on commit PRESERVE ROWS as "
 
     # When the table exists already, simply insert into it ...
-    if {[::xo::db::require exists_table [:name]]} {
-      ::xo::dc dml . "insert into [:name] ([:vars]) ([:query])"
+    if {[::xo::db::require exists_table ${:name}]} {
+      ::xo::dc dml . "insert into ${:name} ([:vars]) (${:query})"
     } else {
       # ... otherwise, create the table with the data in one step
-      ::xo::dc dml get_n_most_recent_contributions $sql_create[:query]
+      ::xo::dc dml get_n_most_recent_contributions $sql_create${:query}
     }
   }
   ::xo::db::temp_table instproc destroy {} {
     # A session spans multiple connections in OpenACS.
     # We want to get rid the data when we are done.
-    ::xo::dc dml truncate_temp_table "truncate table [:name]"
+    ::xo::dc dml truncate_temp_table "truncate table ${:name}"
     next
   }
 
Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -N -r1.70.2.3 -r1.70.2.4
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	18 Apr 2019 08:05:20 -0000	1.70.2.3
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	4 Jul 2019 18:08:53 -0000	1.70.2.4
@@ -145,7 +145,7 @@
       } else {
         set HTMLattribute $attribute
       }
-      #:msg "[:name] check for $attribute => [info exists :$attribute]"
+      #:msg "${:name} check for $attribute => [info exists :$attribute]"
       if {[info exists :$attribute]} {
         lappend pairs $HTMLattribute [set :$attribute]
       }
@@ -169,7 +169,7 @@
       } else {
         set HTMLattribute $attribute
       }
-      #:msg "[:name] check for $attribute => [info exists :$attribute]"
+      #:msg "${:name} check for $attribute => [info exists :$attribute]"
       if {[:uplevel [list info exists $attribute]]} {
         lappend pairs $HTMLattribute [:uplevel [list set $attribute]]
       }
@@ -517,9 +517,9 @@
         set :name [namespace tail [self]]
       } \
       -instproc get-slots {} {
-        set slots [list -[:name]]
+        set slots [list -${:name}]
         foreach subfield {richtext CSSclass} {
-          lappend slots [list -[:name].$subfield ""]
+          lappend slots [list -${:name}.$subfield ""]
         }
         return $slots
       }
@@ -545,31 +545,31 @@
   Class create AnchorField \
       -superclass ::xo::Table::Field \
       -instproc get-slots {} {
-        set slots [list -[:name]]
+        set slots [list -${:name}]
         foreach subfield {href title CSSclass} {
-          lappend slots [list -[:name].$subfield ""]
+          lappend slots [list -${:name}.$subfield ""]
         }
         return $slots
       }
 
   Class create HiddenField \
       -superclass ::xo::Table::Field \
       -instproc get-slots {} {
-        return [list -[:name]]
+        return [list -${:name}]
       }
 
   Class create ImageField \
       -parameter {src width height border title alt} \
       -superclass ::xo::Table::Field \
       -instproc get-slots {} {
-        set slots [list -[:name]]
-        lappend slots [list -[:name].src [:src]]
-        lappend slots [list -[:name].CSSclass [:CSSclass]]
+        set slots [list -${:name}]
+        lappend slots [list -${:name}.src [:src]]
+        lappend slots [list -${:name}.CSSclass [:CSSclass]]
         foreach att {width height border title alt} {
           if {[info exists :$att]} {
-            lappend slots [list -[:name].$att [:$att]]
+            lappend slots [list -${:name}.$att [:$att]]
           } else {
-            lappend slots [list -[:name].$att]
+            lappend slots [list -${:name}.$att]
           }
         }
         return $slots
@@ -578,7 +578,7 @@
   Class create ImageAnchorField \
       -superclass ::xo::Table::ImageField \
       -instproc get-slots {} {
-        return [concat [next]  -[:name].href ""]
+        return [concat [next]  -${:name}.href ""]
       }
 
   Class create ImageField_EditIcon \
@@ -734,14 +734,14 @@
 
   Class create TABLE::Field -superclass ::xo::Drawable
   TABLE::Field instproc render-data {line} {
-    $line instvar [list [:name].richtext richtext]
+    $line instvar [list ${:name}.richtext richtext]
     if {![info exists richtext] || $richtext eq ""} {
       set richtext [:richtext]
     }
     if {$richtext} {
-      html::t -disableOutputEscaping [$line set [:name]]
+      html::t -disableOutputEscaping [$line set ${:name}]
     } else {
-      html::t [$line set [:name]]
+      html::t [$line set ${:name}]
     }
   }
 
@@ -797,11 +797,11 @@
   Class create TABLE::AnchorField \
       -superclass TABLE::Field \
       -instproc render-data {line} {
-        if {[$line exists [:name].href] &&
-            [set href [$line set [:name].href]] ne ""} {
+        if {[$line exists ${:name}.href] &&
+            [set href [$line set ${:name}.href]] ne ""} {
           # use the CSS class rather from the Field than not the line
           :instvar CSSclass
-          $line instvar [list [:name].title title]
+          $line instvar [list ${:name}.title title]
           html::a [:get_local_attributes href title {CSSclass class}] {
             return [next]
           }
@@ -817,30 +817,30 @@
   Class create TABLE::ImageField \
       -superclass TABLE::Field \
       -instproc render-data {line} {
-        $line instvar [list [:name].CSSclass CSSclass]
+        $line instvar [list ${:name}.CSSclass CSSclass]
         html::a [:get_local_attributes href {style "border-bottom: none;"} {CSSclass class}] {
-          html::img [$line attlist [:name] {src width height border title alt}] {}
+          html::img [$line attlist ${:name} {src width height border title alt}] {}
         }
         $line render_localizer
       }
 
   Class create TABLE::ImageAnchorField \
       -superclass TABLE::Field \
       -instproc render-data {line} {
-        set href [$line set [:name].href]
+        set href [$line set ${:name}.href]
         if {$href ne ""} {
-          #if {$line exists [:name].CSSclass} {set CSSclass [$line set [:name].CSSclass]}
-          $line instvar [list [:name].CSSclass CSSclass]
+          #if {$line exists ${:name}.CSSclass} {set CSSclass [$line set ${:name}.CSSclass]}
+          $line instvar [list ${:name}.CSSclass CSSclass]
           html::a [:get_local_attributes href {style "border-bottom: none;"} {CSSclass class}] {
-            html::img [$line attlist [:name] {src width height border title alt}] {}
+            html::img [$line attlist ${:name} {src width height border title alt}] {}
           }
           $line render_localizer
         }
       }
 
   Class create TABLE::BulkAction -superclass ::xo::Drawable
   TABLE::BulkAction instproc render {} {
-    set name [:name]
+    set name ${:name}
     #:msg [:serialize]
     html::th -class list {
       html::input -type checkbox -name __bulkaction -id __bulkaction \
@@ -856,7 +856,7 @@
 
   TABLE::BulkAction instproc render-data {line} {
     #:msg [:serialize]
-    set name [:name]
+    set name ${:name}
     set value [$line set [:id]]
     html::input -type checkbox -name $name -value $value \
         -id "$name---[string map {/ _} $value]" \
Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v
diff -u -N -r1.68.2.6 -r1.68.2.7
--- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	20 Jun 2019 20:05:04 -0000	1.68.2.6
+++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl	4 Jul 2019 18:09:42 -0000	1.68.2.7
@@ -341,7 +341,7 @@
     ::sec_handler_reset
     set smsg [::xo::mr::bgdelivery encode_message [:mode] $msg]
     #:log "-- sending to subscriber for [:key] $smsg ch=[:channel] \
-        #        mode=[:mode], user_id [:user_id]"
+        #        mode=[:mode], user_id ${:user_id}"
     try {
       puts -nonewline [:channel] $smsg
       flush [:channel]
Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v
diff -u -N -r1.75.2.3 -r1.75.2.4
--- openacs-4/packages/xotcl-core/tcl/context-procs.tcl	4 Jul 2019 11:20:04 -0000	1.75.2.3
+++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl	4 Jul 2019 18:09:42 -0000	1.75.2.4
@@ -331,7 +331,7 @@
     if {[info exists :untrusted_user_id]} {
       return ${:untrusted_user_id}
     }
-    return [:user_id]
+    return ${:user_id}
   }
 
   ConnectionContext instproc returnredirect {-allow_complete_url:switch url} {
@@ -440,7 +440,7 @@
       set granted [permission::permission_p -no_login -party_id $party_id \
                        -object_id $object_id \
                        -privilege $privilege]
-      #:msg "--p lookup $key ==> $granted uid=[:user_id] uuid=${:untrusted_user_id}"
+      #:msg "--p lookup $key ==> $granted uid=${:user_id} uuid=${:untrusted_user_id}"
       if {$granted || ${:user_id} == ${:untrusted_user_id}} {
         return $granted
       }
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 -N -r1.76.2.18 -r1.76.2.19
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	1 Jul 2019 14:47:07 -0000	1.76.2.18
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	4 Jul 2019 18:10:50 -0000	1.76.2.19
@@ -1570,7 +1570,7 @@
     set package_id ${:package_id}
     [:info class] get_context package_id creation_user creation_ip
     set :folder_id [::xo::db::sql::content_folder new \
-                        -name [:name] -label [:label] \
+                        -name ${:name} -label [:label] \
                         -description [:description] \
                         -parent_id ${:parent_id} \
                         -package_id $package_id \
@@ -1811,7 +1811,7 @@
     if {[:is_cached_object]} {
       ::xo::xotcl_object_cache flush [string trimleft [self] :]
     }
-    xo::xotcl_object_type_cache flush -partition_key ${:parent_id} ${:parent_id}-[:name]
+    xo::xotcl_object_type_cache flush -partition_key ${:parent_id} ${:parent_id}-${:name}
     next
   }
   CrCache::Item instproc rename {-old_name:required -new_name:required} {
Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v
diff -u -N -r1.112.2.1 -r1.112.2.2
--- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	14 May 2019 20:04:22 -0000	1.112.2.1
+++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	4 Jul 2019 18:10:50 -0000	1.112.2.2
@@ -208,13 +208,13 @@
     @param export list of attribute value pairs to be exported to the form (nested list)
   } {
     # set form name for adp file
-    set :$template [:name]
+    set :$template ${:name}
 
     set object_type [[${:data} info class] object_type]
     set object_name [expr {[${:data} exists name] ? [${:data} set name] : ""}]
     # :log "-- ${:data}, cl=[${:data} info class] [[${:data} info class] object_type]"
 
-    # :log "--e [:name] final fields ${:fields}"
+    # :log "--e ${:name} final fields ${:fields}"
     set exports [list \
       [list object_type $object_type] \
                      [list folder_id ${:folder_id}] \
@@ -236,7 +236,7 @@
 
     if {[:with_categories]} {
       set coid [expr {[${:data} exists item_id] ? [${:data} set item_id] : ""}]
-      category::ad_form::add_widgets -form_name [:name] \
+      category::ad_form::add_widgets -form_name ${:name} \
           -container_object_id ${:package_id} \
           -categorized_object_id $coid
 
@@ -263,7 +263,7 @@
     # action blocks must be added last
     # -new_data and -edit_data are enclosed in a transaction only in the end,
     # so eventual additional code from category management is executed safely
-    ad_form -extend -name [:name] \
+    ad_form -extend -name ${:name} \
         -validate [:validate] \
         -new_data "xo::dc transaction \{ $new_data \}" -edit_data "xo::dc transaction \{ $edit_data \}" \
         -on_submit $on_submit -new_request $new_request -edit_request $edit_request \
Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v
diff -u -N -r1.12 -r1.12.2.1
--- openacs-4/packages/xotcl-request-monitor/www/last100.tcl	4 Aug 2018 18:55:48 -0000	1.12
+++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl	4 Jul 2019 18:14:43 -0000	1.12.2.1
@@ -22,7 +22,7 @@
     -instproc render-data {row} {
       html::div -style {
 	border: 1px solid #a1a5a9; padding: 0px 5px 0px 5px; background: #e2e2e2} {
-	  html::t  [$row set [:name]]
+	  html::t  [$row set ${:name}]
 	}
     }