Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v
diff -u -N -r1.41.2.6 -r1.41.2.7
--- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	23 Jul 2019 16:51:49 -0000	1.41.2.6
+++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl	9 Sep 2019 09:57:26 -0000	1.41.2.7
@@ -331,9 +331,14 @@
     {-content_types {}}
     -name:required
   } {
+    
     Make sure, the root folder for the given package exists. If not, 
     create it and register all allowed content types.
 
+    Note that xowiki (and derived packages) define their own version
+    of "require_root_folder" based on form pages. Therefore, this
+    function is just for packages not based on xowiki.
+
     @return folder_id
   } {
     set folder_id [::xo::xotcl_package_cache eval root_folder-${:id} {
@@ -342,13 +347,15 @@
       if {$folder_id == 0} {
         :log "folder with name '$name' and parent $parent_id does NOT EXIST"
         set folder_id [::xo::db::sql::content_folder new \
-                           -name $name -label $name \
+                           -name $name \
+                           -label ${:instance_name} \
                            -parent_id $parent_id \
-                           -package_id ${:id} -context_id ${:id}]
+                           -package_id ${:id} \
+                           -context_id ${:id}]
         :log "CREATED folder '$name' and parent $parent_id ==> $folder_id"
       }
 
-      # register all specified content types
+      # Register all specified content types
       ::xo::db::CrFolder register_content_types \
           -folder_id $folder_id \
           -content_types $content_types