Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.276 -r1.277
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Jun 2018 13:02:13 -0000	1.276
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	21 Jul 2018 11:56:37 -0000	1.277
@@ -3195,7 +3195,7 @@
     }
     #:msg "guess mime_type of $entry_name = [::xowiki::guesstype $entry_name]"
     set import_file [ad_tmpnam]
-    ::xowiki::write_file $import_file $img
+    ::xo::write_file $import_file $img
     set file_object [::xowiki::File new -destroy_on_cleanup \
                          -title $entry_name \
                          -name $entry_name \
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.532 -r1.533
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	11 Jul 2018 13:48:13 -0000	1.532
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	21 Jul 2018 11:56:37 -0000	1.533
@@ -645,7 +645,7 @@
   File instproc marshall {{-mode export}} {
     set fn [:full_file_name]
     if {$mode eq "export"} {
-      set :__file_content [::base64::encode [::xowiki::read_file $fn]]
+      set :__file_content [::base64::encode [::xo::read_file $fn]]
     } else {
       set :__file_name $fn
     }
@@ -979,7 +979,7 @@
 
     if {[info exists :__file_content]} {
       set :import_file [ad_tmpnam]
-      ::xowiki::write_file ${:import_file} [::base64::decode ${:__file_content}]
+      ::xo::write_file ${:import_file} [::base64::decode ${:__file_content}]
       unset :__file_content
     } elseif {[info exists :__file_name]} {
       set :import_file ${:__file_name}
@@ -3327,7 +3327,7 @@
         $l destroy
       }
       text/plain {
-        set text [::xowiki::read_file [:full_file_name]]
+        set text [::xo::read_file [:full_file_name]]
         set preview "<pre class='code'>[::xowiki::Includelet html_encode $text]</pre>"
       }
       default {set preview ""}
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	21 Jul 2018 11:37:19 -0000	1.55
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	21 Jul 2018 11:56:37 -0000	1.56
@@ -42,7 +42,7 @@
       set tidycmd [::util::which tidy]
       if {$tidycmd ne ""} {
         set in_file [ad_tmpnam]
-        ::xowiki::write_file $in_file $text
+        ::xo::write_file $in_file $text
         catch {exec $tidycmd -q -w 0 -ashtml < $in_file 2> /dev/null} output
         file delete -- $in_file
         #:msg o=$output
Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/xowiki/www/admin/test.tcl	22 Jun 2018 20:11:55 -0000	1.44
+++ openacs-4/packages/xowiki/www/admin/test.tcl	21 Jul 2018 11:56:37 -0000	1.45
@@ -746,7 +746,7 @@
         set f [::xowiki::File new -name $name -description "" \
                    -parent_id $parent_id -package_id $package_id -mime_type $mime_type]
         set import_file [ad_tmpnam]
-        ::xowiki::write_file $import_file [::base64::decode $file_content]
+        ::xo::write_file $import_file [::base64::decode $file_content]
         $f set import_file $import_file
       }
       $f save_new