Index: tests/doc.test
===================================================================
diff -u -r170cefa7618f2b44f91102711607fc6fa7d12c4f -r239888ee1ee6ed6d7b9afa5e170f49c5224a186d
--- tests/doc.test	(.../doc.test)	(revision 170cefa7618f2b44f91102711607fc6fa7d12c4f)
+++ tests/doc.test	(.../doc.test)	(revision 239888ee1ee6ed6d7b9afa5e170f49c5224a186d)
@@ -442,7 +442,7 @@
     # @parameter a Provides a first value
     # @parameter b Provides a second value
     
-    # @class.class-object-method {::Bar foo}
+    # @class.object-method {::Bar foo}
     #
     # This describes the per-object foo method
     #
@@ -511,7 +511,7 @@
   }
   
   
-  set entity [@method id ::Bar class-object foo]
+  set entity [@method id ::Bar object foo]
   ? [list [@class id ::Bar] @class-object-method] $entity
   ? [list ::nsf::is object $entity] 1
   ? [list $entity info has type ::nx::doc::@method] 1
@@ -888,11 +888,11 @@
   ? [list ::nsf::isobject $entity] 1
   ? [list $entity as_text] "Only description available here ..."
   
-  set entity [@method id ::C class-object sub]
+  set entity [@method id ::C object sub]
   ? [list ::nsf::isobject $entity] 1
   ? [list $entity as_text] "A brief desc"
   
-  set entity [@method id ::C class-object sub::foo2]
+  set entity [@method id ::C object sub::foo2]
   ? [list ::nsf::isobject $entity] 1
   ? [list $entity info has type ::nx::doc::@method] 1
   ? [list $entity as_text] "could allow both (@sub-method is the attribute name, @method is a forwarder in the context of an owning @method object!)"