Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	4 Jul 2019 17:51:39 -0000	1.11.2.2
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	23 Jul 2019 14:14:59 -0000	1.11.2.3
@@ -494,8 +494,8 @@
     security::csp::require style-src maxcdn.bootstrapcdn.com
     security::csp::require font-src maxcdn.bootstrapcdn.com
     
-    if {![:isobject [self]::__actions]} {:actions {}}
-    if {![:isobject [self]::__bulkactions]} {:__bulkactions {}}
+    if {![nsf::is object [self]::__actions]} {:actions {}}
+    if {![nsf::is object [self]::__bulkactions]} {:__bulkactions {}}
     set bulkactions [[self]::__bulkactions children]
     if {[llength $bulkactions]>0} {
       set name [[self]::__bulkactions set __identifier]
Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.54.2.14 -r1.54.2.15
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	4 Jul 2019 17:51:39 -0000	1.54.2.14
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	23 Jul 2019 14:14:59 -0000	1.54.2.15
@@ -381,7 +381,7 @@
   ::xo::ChatClass create Chat -superclass ::xo::Chat
 
   ::xo::ChatClass proc is_chat_p {class} {
-    return [expr {[:isobject $class] && [$class class] eq [self]}]
+    return [expr {[nsf::is object $class] && [$class class] eq [self]}]
   }
 
   ::xo::ChatClass instproc get_mode {} {
Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -N -r1.55.2.12 -r1.55.2.13
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	28 Jun 2019 10:30:27 -0000	1.55.2.12
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	23 Jul 2019 14:14:59 -0000	1.55.2.13
@@ -5,8 +5,8 @@
 
   * An xowiki includelet to display the "folders"
   * An xowiki includelet to display the "child-resources"
-  of a page (e.g. the contents of a folder)
-
+    of a page (e.g. the contents of a folder)
+ 
   @author Michael Aram
   @author Gustaf Neumann
 }
@@ -456,7 +456,7 @@
       if {$is_current} {
         $node open_tree
 
-        if {[info commands ::__xowiki__MenuBar] ne ""
+        if {[nsf::is object ::__xowiki__MenuBar]
             && [::__xowiki__MenuBar exists submenu_pages(folder)]} {
           set owner [::__xowiki__MenuBar set submenu_owner(folder)]
           $subnode add_pages -full true \
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.284.2.20 -r1.284.2.21
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Jul 2019 15:04:57 -0000	1.284.2.20
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	23 Jul 2019 14:14:59 -0000	1.284.2.21
@@ -3822,14 +3822,14 @@
     # Set the internal representation of the date based on the components values.
     # Internally, the ansi date format is used.
     set year ""; set month ""; set day ""; set hour ""; set min ""; set sec ""
-    if {[:isobject [self]::YYYY]}  {set year  [[self]::YYYY  value]}
-    if {[:isobject [self]::month]} {set month [[self]::month value]}
-    if {[:isobject [self]::mon]}   {set month [[self]::mon   value]}
-    if {[:isobject [self]::MM]}    {set month [[self]::MM    value]}
-    if {[:isobject [self]::DD]}    {set day   [[self]::DD    value]}
-    if {[:isobject [self]::HH24]}  {set hour  [[self]::HH24  value]}
-    if {[:isobject [self]::MI]}    {set min   [[self]::MI    value]}
-    if {[:isobject [self]::SS]}    {set sec   [[self]::SS    value]}
+    if {[nsf::is object [self]::YYYY]}  {set year  [[self]::YYYY  value]}
+    if {[nsf::is object [self]::month]} {set month [[self]::month value]}
+    if {[nsf::is object [self]::mon]}   {set month [[self]::mon   value]}
+    if {[nsf::is object [self]::MM]}    {set month [[self]::MM    value]}
+    if {[nsf::is object [self]::DD]}    {set day   [[self]::DD    value]}
+    if {[nsf::is object [self]::HH24]}  {set hour  [[self]::HH24  value]}
+    if {[nsf::is object [self]::MI]}    {set min   [[self]::MI    value]}
+    if {[nsf::is object [self]::SS]}    {set sec   [[self]::SS    value]}
     if {"$year$month$day$hour$min$sec" eq ""} {
       return ""
     }
Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -N -r1.42.2.2 -r1.42.2.3
--- openacs-4/packages/xowiki/tcl/import-procs.tcl	8 May 2019 19:59:56 -0000	1.42.2.2
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl	23 Jul 2019 14:14:59 -0000	1.42.2.3
@@ -215,10 +215,10 @@
           if {[$o istype ::xowiki::PageInstance]} {
             #:msg "importing [$o name] page_instance, map $template_name_key to $name_map($template_name_key)"
             $o page_template $name_map($template_name_key)
-            #:msg "exists template? [:isobject [$o page_template]]"
-            if {![:isobject [$o page_template]]} {
+            #:msg "exists template? [nsf::is object [$o page_template]]"
+            if {![nsf::is object [$o page_template]]} {
               ::xo::db::CrClass get_instance_from_db -item_id [$o page_template]
-              #:msg "[:isobject [$o page_template]] loaded"
+              #:msg "[nsf::is object [$o page_template]] loaded"
             }
           }
 
@@ -261,7 +261,7 @@
     #
     # final cleanup
     #
-    foreach o $objects {if {[::xotcl::Object isobject $o]} {$o destroy}}
+    foreach o $objects {if {[nsf::is object $o]} {$o destroy}}
 
     ${:package_id} flush_page_fragment_cache
   }
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.239.2.14 -r1.239.2.15
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	4 Jul 2019 17:51:39 -0000	1.239.2.14
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	23 Jul 2019 14:15:00 -0000	1.239.2.15
@@ -1745,7 +1745,7 @@
       #
       # Some (dynammic) pages are volatile, skip these as well
       #
-      if {[info commands $page] ne ""} {
+      if {[nsf::is object $page]} {
         set unresolved [$page references get unresolved]
         if {$unresolved ne ""} {
           #ns_log notice "[$page name] contains unresolved: <$unresolved>"
@@ -2399,7 +2399,7 @@
     #
     # Call a render on the created structure
     #
-    if {[info commands ::__xowiki__MenuBar] ne "" && ${:include_in_foldertree}} {
+    if {[nsf::is object ::__xowiki__MenuBar] && ${:include_in_foldertree}} {
       ::__xowiki__MenuBar additional_sub_menu -kind folder -pages $pages -owner [self]
     }
     #
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -N -r1.106.2.4 -r1.106.2.5
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	3 Jul 2019 20:29:29 -0000	1.106.2.4
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	23 Jul 2019 14:15:00 -0000	1.106.2.5
@@ -207,7 +207,7 @@
       set package_id [site_node::get_children -node_id $a -package_key xowiki \
                           -filters [list name $name] -element package_id]
       if {$package_id ne ""} {
-        #:log "--LINK found package_id=$package_id [:isobject ::$package_id]"
+        #:log "--LINK found package_id=$package_id [nsf::is object ::$package_id]"
         ::xowiki::Package require $package_id
         return $package_id
       }
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.332.2.29 -r1.332.2.30
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	16 Jul 2019 10:35:22 -0000	1.332.2.29
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	23 Jul 2019 14:15:00 -0000	1.332.2.30
@@ -502,7 +502,7 @@
       }
       set folder [:folder_path -parent_id $parent_id -folder_ids $folder_ids -path_encode $path_encode]
       set pkg [::$parent_id package_id]
-      if {![:isobject ::$pkg]} {
+      if {![nsf::is object ::$pkg]} {
         ::xowiki::Package initialize -package_id $pkg -init_url false -keep_cc true
       }
       set package_prefix [$pkg get_parameter package_prefix [$pkg package_url]]
@@ -2771,7 +2771,7 @@
       next
     } else {
       set key [list ${:id} [self proc] $attribute]
-      if {[info commands "::xo::cc"] ne ""} {
+      if {[nsf::is object "::xo::cc"]} {
         if {[::xo::cc cache_exists $key]} {
           return [::xo::cc cache_get $key]
         }
Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -N -r1.23.2.4 -r1.23.2.5
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	13 May 2019 08:48:20 -0000	1.23.2.4
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	23 Jul 2019 14:15:00 -0000	1.23.2.5
@@ -55,7 +55,7 @@
     {-open_item:boolean false}
   } {
     set items ${category}::items
-    if {![:isobject $items]} {
+    if {![nsf::is object $items]} {
       ::xo::OrderedComposite create $items
       if {[info exists orderby]} {
         if {$orderby eq "page_order"} {
@@ -153,15 +153,15 @@
 
   TreeNode instproc some_child_has_items {} {
     foreach i [:children] {
-      if {[:isobject ${i}::items]} {return 1}
+      if {[nsf::is object ${i}::items]} {return 1}
       if {[$i some_child_has_items]} {return 1}
     }
     return 0
   }
 
   TreeNode instproc render {} {
     set content ""
-    if {[:isobject [self]::items]} {
+    if {[nsf::is object [self]::items]} {
       foreach i [[self]::items children] {
         append cat_content [:render_item -highlight [$i exists open_item] $i ]
       }
@@ -174,7 +174,7 @@
 
     }
     if {${:verbose}} {
-      :log "TreeNode items [:isobject [self]::items] render open_requests ${:open_requests} -> $content"
+      :log "TreeNode items [nsf::is object [self]::items] render open_requests ${:open_requests} -> $content"
     }
     return $content
   }
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -N -r1.75.2.11 -r1.75.2.12
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	4 Jul 2019 17:51:39 -0000	1.75.2.11
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	23 Jul 2019 14:15:00 -0000	1.75.2.12
@@ -248,7 +248,7 @@
         $p set instance_attributes $instance_attributes
       } else {
         # do full instantiation and rendering
-        # ns_log notice "--Render object revision_id = $revision_id $name $title ::$revision_id?[:isobject ::$revision_id]"
+        # ns_log notice "--Render object revision_id = $revision_id $name $title ::$revision_id?[nsf::is object ::$revision_id]"
         set p [::xo::db::CrClass get_instance_from_db -item_id 0 -revision_id $revision_id]
         # in cases, the revision was created already earlier, drop the mixins
         if {[$p info mixin] ne ""} {$p mixin {}}
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.542.2.32 -r1.542.2.33
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Jul 2019 18:48:56 -0000	1.542.2.32
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Jul 2019 14:15:00 -0000	1.542.2.33
@@ -1614,7 +1614,7 @@
       return [next]
     }
 
-    if {![::xotcl::Object isobject $object]} {
+    if {![nsf::is object $object]} {
       # if the object does not yet exist, we have to create it
       :create $object
     }
@@ -1893,7 +1893,7 @@
     #
     set parent_id ${:parent_id}
     if {$parent_id > 0} {
-      if {! [:isobject ::$parent_id] } {
+      if {! [nsf::is object ::$parent_id] } {
         ::xo::db::CrClass get_instance_from_db -item_id $parent_id
       }
       return ::$parent_id
@@ -3373,7 +3373,7 @@
     # In case, the switch is activated, and we have a menubar, add the
     # top level section
     #
-    if {$add_sections_to_folder_tree && [info commands ::__xowiki__MenuBar] ne ""} {
+    if {$add_sections_to_folder_tree && [nsf::is object ::__xowiki__MenuBar]} {
       $owner set book_mode 1
       set pages [::xo::OrderedComposite new -destroy_on_cleanup]
       if {$add_sections_to_folder_tree == 1} {
@@ -3645,7 +3645,7 @@
 
   PageInstance instproc get_template_object {} {
     set id ${:page_template}
-    if {![:isobject ::$id]} {
+    if {![nsf::is object ::$id]} {
       ::xo::db::CrClass get_instance_from_db -item_id $id
     }
     return ::$id
@@ -3797,7 +3797,7 @@
 
   Object instproc set_payload {cmd} {
     set payload [self]::payload
-    if {[:isobject $payload]} {$payload destroy}
+    if {[nsf::is object $payload]} {$payload destroy}
     ::xo::Context create $payload -requireNamespace \
         -actual_query [::xo::cc actual_query]
     $payload set package_id ${:package_id}
@@ -3812,7 +3812,7 @@
 
   Object instproc get_payload {var {default ""}} {
     set payload [self]::payload
-    if {![:isobject $payload]} {
+    if {![nsf::is object $payload]} {
       ::xo::Context create $payload -requireNamespace
     }
     expr {[$payload exists $var] ? [$payload set $var] : $default}
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.57.2.3 -r1.57.2.4
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	12 May 2019 16:31:12 -0000	1.57.2.3
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	23 Jul 2019 14:15:00 -0000	1.57.2.4
@@ -488,7 +488,7 @@
   } {
     ns_log notice "got package_id=$package_id, object_id=$object_id, type=$type"
     ::xowiki::Package initialize -package_id $package_id
-    if {[::xotcl::Object isobject ::$package_id]} {
+    if {[nsf::is object ::$package_id]} {
       return [::$package_id package_url]
     } else {
       return ""
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 -N -r1.368.2.27 -r1.368.2.28
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	4 Jul 2019 17:51:39 -0000	1.368.2.27
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	23 Jul 2019 14:15:00 -0000	1.368.2.28
@@ -1702,7 +1702,7 @@
 
     set template_file [ns_normalizepath [:query_parameter "template_file" \
                                              [::$context_package_id get_parameter template_file view-default]]]
-    if {[:isobject ::xowiki::$template_file]} {
+    if {[nsf::is object ::xowiki::$template_file]} {
       $template_file before_render [self]
     }
 
@@ -1755,7 +1755,7 @@
     # The menubar is work in progress
     #
     set mb [::$context_package_id get_parameter "MenuBar" 0]
-    if {$mb ne "0" && [info commands ::xowiki::MenuBar] ne ""} {
+    if {$mb ne "0" && [nsf::is object ::xowiki::MenuBar]} {
 
       set clipboard_size [::xowiki::clipboard size]
       set clipboard_label [expr {$clipboard_size ? "Clipboard ($clipboard_size)" : "Clipboard"}]
@@ -2116,7 +2116,7 @@
   Page proc find_slot {-start_class:required name} {
     foreach cl [list $start_class {*}[$start_class info heritage]] {
       set slotobj ${cl}::slot::$name
-      if {[:isobject $slotobj]} {
+      if {[nsf::is object $slotobj]} {
         #:msg $slotobj
         return $slotobj
       }
Index: openacs-4/packages/xowiki/tcl/yui-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/yui-procs.tcl,v
diff -u -N -r1.16.2.2 -r1.16.2.3
--- openacs-4/packages/xowiki/tcl/yui-procs.tcl	4 Jul 2019 17:51:39 -0000	1.16.2.2
+++ openacs-4/packages/xowiki/tcl/yui-procs.tcl	23 Jul 2019 14:15:00 -0000	1.16.2.3
@@ -555,8 +555,8 @@
 
   YUIDataTableRenderer instproc render {} {
     ::YUI::loader require -module "datatable"
-    if {![:isobject [self]::__actions]} {:actions {}}
-    if {![:isobject [self]::__bulkactions]} {:__bulkactions {}}
+    if {![nsf::is object [self]::__actions]} {:actions {}}
+    if {![nsf::is object [self]::__bulkactions]} {:__bulkactions {}}
     set bulkactions [[self]::__bulkactions children]
     if {[llength $bulkactions]>0} {
       set name [[self]::__bulkactions set __identifier]
Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/xowiki/www/admin/import.tcl	8 May 2019 14:33:40 -0000	1.28.2.1
+++ openacs-4/packages/xowiki/www/admin/import.tcl	23 Jul 2019 14:15:00 -0000	1.28.2.2
@@ -53,7 +53,7 @@
 	# cleanup all objects, that did not exist before
         foreach o [::xowiki::Page allinstances] {
 	  if {![info exists preexists($o)]} {
-	    if {[::xotcl::Object isobject $o]} {$o destroy}
+	    if {[nsf::is object $o]} {$o destroy}
 	  }
         }
       } on ok {r} {
@@ -74,7 +74,7 @@
         } finally {
           # Make sure objects have been cleaned up
           foreach o $objects {
-            if {[::xotcl::Object isobject $o]} {
+            if {[nsf::is object $o]} {
               $o destroy
             }
           }
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.46.2.4 -r1.46.2.5
--- openacs-4/packages/xowiki/www/admin/test.tcl	3 Jul 2019 19:54:08 -0000	1.46.2.4
+++ openacs-4/packages/xowiki/www/admin/test.tcl	23 Jul 2019 14:15:00 -0000	1.46.2.5
@@ -152,7 +152,7 @@
 
 ? {info exists package_id} 1 "package_id is exported"
 ? {set package_id} $info(package_id) "package_id right value"
-? {::xotcl::Object isobject ::$package_id} 1 "we have a package_id object"
+? {nsf::is object ::$package_id} 1 "we have a package_id object"
 ? {$package_id package_url} /$instance_name/ "package_url"
 ? {$package_id url} /$instance_name/
 ? {$package_id id} $package_id "the id of the package object = package_id"
@@ -165,7 +165,7 @@
 
 ? {$package_id exists folder_id} 1 "folder_id is set"
 set folder_id [::$package_id folder_id]
-? {::xotcl::Object isobject ::$folder_id} 1 "we have a folder object"
+? {nsf::is object ::$folder_id} 1 "we have a folder object"
 ? {::$folder_id name} "xowiki: $package_id" "name of folder object is 'xowiki: $package_id'"
 ? {::$folder_id parent_id} -100  "parent_id of folder object is -100"
 ? {expr {[::$folder_id item_id]>0}} 1 "item_id given"
@@ -181,7 +181,7 @@
 set object [::$package_id set object]
 set page_item_id [::$package_id resolve_page $object $m]
 ? {expr {$page_item_id ne ""}} 1 "index page resolved"
-? {::xotcl::Object isobject ::$page_item_id} 1 "we have a page object"
+? {nsf::is object ::$page_item_id} 1 "we have a page object"
 ? {expr {[::$page_item_id item_id]>0}} 1 "item_id given"
 ? {expr {[::$page_item_id revision_id]>0}} 1 "revision_id given"
 ? {::$page_item_id parent_id} $folder_id "parent_id of page object is folder_id"
@@ -223,7 +223,7 @@
 
 ? {info exists package_id} 1 "package_id is exported"
 ? {set package_id} $info(package_id) "package_id right value"
-? {::xotcl::Object isobject ::$package_id} 1 "we have a package_id object"
+? {nsf::is object ::$package_id} 1 "we have a package_id object"
 ? {$package_id package_url} /$instance_name/ "package_url"
 ? {$package_id url} /$instance_name/en/index "url"
 ? {$package_id id} $package_id "the id of the package object = package_id"
@@ -250,7 +250,7 @@
 
 ? {info exists package_id} 1 "package_id is exported"
 ? {set package_id} $info(package_id) "package_id right value"
-? {::xotcl::Object isobject ::$package_id} 1 "we have a package_id object"
+? {nsf::is object ::$package_id} 1 "we have a package_id object"
 ? {$package_id package_url} /$instance_name/ "package_url"
 ? {$package_id url} /$instance_name/ "url"
 ? {$package_id id} $package_id "the id of the package object = package_id"
@@ -260,7 +260,7 @@
 ##################################################
 ? {$package_id exists folder_id} 1 "folder_id is set"
 set folder_id [::$package_id folder_id]
-? {::xotcl::Object isobject ::$folder_id} 1 "we have a folder object"
+? {nsf::is object ::$folder_id} 1 "we have a folder object"
 ? {::$folder_id name} "xowiki: $package_id" "name of folder object is 'xowiki: $package_id'"
 ? {::$folder_id parent_id} -100  "parent_id of folder object is -100"
 ? {expr {[::$folder_id item_id]>0}} 1 "item_id given"
@@ -276,7 +276,7 @@
 set object [::$package_id set object]
 set page_item_id [::$package_id resolve_page $object $m]
 ? {expr {$page_item_id ne ""}} 1 "index page resolved"
-? {::xotcl::Object isobject ::$page_item_id} 1 "we have a page object"
+? {nsf::is object ::$page_item_id} 1 "we have a page object"
 ? {expr {[::$page_item_id item_id]>0}} 1 "item_id given"
 ? {expr {[::$page_item_id revision_id]>0}} 1 "revision_id given"
 ? {::$page_item_id parent_id} $folder_id "parent_id of page object is folder_id"