Index: library/lib/doc-tools.tcl
===================================================================
diff -u -re29308a6c15da697df375716a3ae3787ade64218 -r3754364287df2dfdf79b81dfa69224eae19cf691
--- library/lib/doc-tools.tcl	(.../doc-tools.tcl)	(revision e29308a6c15da697df375716a3ae3787ade64218)
+++ library/lib/doc-tools.tcl	(.../doc-tools.tcl)	(revision 3754364287df2dfdf79b81dfa69224eae19cf691)
@@ -552,7 +552,7 @@
 	    # requested (from the part_attribute) applicable to the
 	    # partof object, which is the object behind [$domain name]?
 	    if {[info exists :scope] && 
-		![::nsf::objectproperty [$domain name] ${:scope}]} {
+		![::nsf::objectproperty name [$domain] ${:scope}]} {
 	      error "The entity '[$domain name]' does not qualify as '${:scope}'"
 	    }
 	    next
@@ -1136,7 +1136,7 @@
       if {[::nsf::isobject $thing]} {
 	if {[$thing eval {info exists :__initcmd}]} {
 	  
-          :analyze_initcmd [expr {[::nsf::objectproperty $thing class]?"@class":"@object"}] $thing [$thing eval {set :__initcmd}]
+          :analyze_initcmd [expr {[::nsf::objectproperty class $thing]?"@class":"@object"}] $thing [$thing eval {set :__initcmd}]
         }
       } elseif {![catch {package present $thing} msg]} {
 	# For tcl packages, we assume that the package is sourceable
@@ -1950,7 +1950,7 @@
 	:method parse@tag {line} {
 	  puts stderr "PART parse@tag [current]"
 	  set r [next]
-	  if {[::nsf::objectproperty $r object] && [$r info has type ::nx::doc::Entity]} {
+	  if {[::nsf::objectproperty object $r] && [$r info has type ::nx::doc::Entity]} {
 	    set :current_part $r
 	  }
 	  return $r