Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/xowf/xowf.info	4 Oct 2015 13:40:15 -0000	1.3.2.2
+++ openacs-4/packages/xowf/xowf.info	23 Dec 2015 18:25:24 -0000	1.3.2.3
@@ -9,15 +9,15 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="0.44" url="http://openacs.org/repository/download/apm/xowf-0.44.apm">
+    <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/xowf-5.9.1d1.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
         <release-date>2015-10-04</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="0.44"/>
-        <requires url="xowiki" version="0.157"/>
+        <provides url="xowf" version="5.9.1d1"/>
+        <requires url="xowiki" version="5.9.1d1"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	20 Oct 2015 08:23:39 -0000	1.3.2.2
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	23 Dec 2015 18:25:24 -0000	1.3.2.3
@@ -956,7 +956,7 @@
     catch {ds_comment $msg}
   }
 
-  WorkflowPage ad_instproc edit args {
+  WorkflowPage ad_instproc www-edit args {
     Hook for editing workflow pages
   } {
     if {[my is_wf_instance]} {
@@ -967,7 +967,7 @@
     next
   }
 
-  WorkflowPage ad_instproc view {{content ""}} {
+  WorkflowPage ad_instproc www-view {{content ""}} {
     Provide additional view modes:
     - edit: instead of viewing a page, it is opened in edit mode
     - view_user_input: show user the provided input
@@ -1269,7 +1269,7 @@
     }
   }
 
-  WorkflowPage instproc create-or-use args {
+  WorkflowPage instproc www-create-or-use args {
     #my msg "instance = [my is_wf_instance], wf=[my is_wf]"
     if {[my is_wf]} {
       my instvar package_id