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 -r1.70.2.10 -r1.70.2.11
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	1 Nov 2019 13:21:20 -0000	1.70.2.10
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	31 Jan 2020 17:59:51 -0000	1.70.2.11
@@ -12,7 +12,7 @@
 }
 
 Object instproc asHTML {{-master defaultMaster} -page:switch} {
-  require_html_procs
+  ::xo::require_html_procs
   dom createDocument html doc
   set root [$doc documentElement]
   if {!$page} {
Index: openacs-4/packages/xotcl-request-monitor/www/last101.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last101.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/xotcl-request-monitor/www/last101.tcl	25 Jan 2020 14:17:59 -0000	1.9.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/last101.tcl	31 Jan 2020 17:59:51 -0000	1.9.2.3
@@ -52,7 +52,7 @@
 
 
 Object instproc asHTML {{-master defaultMaster} -page:switch} {
-  require_html_procs
+  ::xo::require_html_procs
   dom createDocument html doc
   set root [$doc documentElement]
   if {!$page} {
Index: openacs-4/packages/xowiki/resources/templates/view-plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/resources/templates/view-plain-master.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	26 Jan 2020 18:05:58 -0000	1.1.2.2
+++ openacs-4/packages/xowiki/resources/templates/view-plain-master.adp	31 Jan 2020 17:59:51 -0000	1.1.2.3
@@ -1,4 +1,8 @@
+<<<<<<< view-plain-master.adp
+<!-- Generated by ::xowiki::ADP_Generator on Wed Jan 22 14:59:23 CET 2020 -->
+=======
 <!-- Generated by ::xowiki::ADP_Generator on Sun Jan 26 18:57:43 CET 2020 -->
+>>>>>>> 1.1.2.2
 <master>
                   <property name="context">@context;literal@</property>
                   <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.368.2.53 -r1.368.2.54
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	26 Jan 2020 16:48:40 -0000	1.368.2.53
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	31 Jan 2020 17:59:51 -0000	1.368.2.54
@@ -1238,7 +1238,7 @@
       error "form '$form' is not valid"
     }
 
-    ::require_html_procs
+    ::xo::require_html_procs
     ${:root} firstChild fcn
     #:msg "orig fcn $fcn, root ${:root} [${:root} nodeType] [${:root} nodeName]"
 
@@ -2431,7 +2431,7 @@
   FormPage ad_instproc set_form_data {form_fields} {
     Store the instance attributes or default values in the form.
   } {
-    ::require_html_procs
+    ::xo::require_html_procs
 
     #array set __ia ${:instance_attributes}
     foreach f $form_fields {