Index: tests/info-method.test
===================================================================
diff -u -ra24e1f836c3126d0a0e9467bde3a9fa8da901711 -ra467cf37f204cc977b7af7519a0994c65f9ed10f
--- tests/info-method.test	(.../info-method.test)	(revision a24e1f836c3126d0a0e9467bde3a9fa8da901711)
+++ tests/info-method.test	(.../info-method.test)	(revision a467cf37f204cc977b7af7519a0994c65f9ed10f)
@@ -276,7 +276,7 @@
 
 
 #
-# test info slots / info lookup slots
+# test info slot objects / info lookup slots
 #
 nx::Test case info-slots {
 
@@ -295,18 +295,18 @@
     }
   }
 
-  ? {C info slots} "::C::slot::a ::C::slot::b"
-  ? {D info slots} "::D::slot::b ::D::slot::c"
-  ? {D info slots -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a"
+  ? {C info slot objects} "::C::slot::a ::C::slot::b"
+  ? {D info slot objects} "::D::slot::b ::D::slot::c"
+  ? {D info slot objects -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a"
   ? {d1 info lookup slots -source application} "::d1::per-object-slot::a3 ::D::slot::b ::D::slot::c ::C::slot::a"
 
-  ? {D class info slots} "::D::per-object-slot::a2"
-  ? {d1 info slots} "::d1::per-object-slot::a3"
-  ? {C class info slots} ""
+  ? {D class info slot objects} "::D::per-object-slot::a2"
+  ? {d1 info slot objects} "::d1::per-object-slot::a3"
+  ? {C class info slot objects} ""
 }
 
 #
-# test info slots / info lookup slots
+# test info slot objects / info lookup slots
 #
 nx::Test case slots {
 
@@ -327,25 +327,25 @@
   C create c1
   ? {c1 info precedence} "::C ::nx::Object"
   ? {C info heritage} "::nx::Object"
-  ? {C info slots -closure -source application} "::C::slot::a ::C::slot::b"
-  ? {C info slots -closure} "::C::slot::a ::C::slot::b ::nx::Object::slot::volatile ::nx::Object::slot::noinit ::nx::Object::slot::mixin ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::filter"
+  ? {C info slot objects -closure -source application} "::C::slot::a ::C::slot::b"
+  ? {C info slot objects -closure} "::C::slot::a ::C::slot::b ::nx::Object::slot::volatile ::nx::Object::slot::noinit ::nx::Object::slot::mixin ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::filter"
 
-  ? {C info slots} "::C::slot::a ::C::slot::b"
+  ? {C info slot objects} "::C::slot::a ::C::slot::b"
 
-  # Test patterns for "info slots"
+  # Test patterns for "info slot objects"
   # Partial name, no metachars
-  ? {C info slots -closure mixin} "::nx::Object::slot::mixin"
+  ? {C info slot objects -closure mixin} "::nx::Object::slot::mixin"
   # Partial name with metachars
-  ? {C info slots -closure *in*} \
+  ? {C info slot objects -closure *in*} \
       "::nx::Object::slot::noinit ::nx::Object::slot::mixin ::nx::Object::slot::__initcmd"
   # Fully qualified name, no metachars
-  ? {C info slots -closure ::nx::Object::slot::mixin} "::nx::Object::slot::mixin"
+  ? {C info slot objects -closure ::nx::Object::slot::mixin} "::nx::Object::slot::mixin"
   # Fully qualified name, with metachars
-  # The following command returns the same as "C info slots"
-  ? {C info slots -closure ::C::*} "::C::slot::a ::C::slot::b"
+  # The following command returns the same as "C info slot objects"
+  ? {C info slot objects -closure ::C::*} "::C::slot::a ::C::slot::b"
   # The following command returns the slots of D inherited from
   # C. Slot "b" is shadoed by D.
-  ? {D info slots -closure ::C::*} "::C::slot::a"
+  ? {D info slot objects -closure ::C::*} "::C::slot::a"
   
   # Test patterns for "info lookup slots"
   # Partial name, no metachars
@@ -359,8 +359,8 @@
   ? {c1 info lookup slots ::C::*} "::C::slot::a ::C::slot::b"
 
   D create d1
-  ? {D info slots} "::D::slot::b ::D::slot::c"
-  ? {D info slots -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a"
+  ? {D info slot objects} "::D::slot::b ::D::slot::c"
+  ? {D info slot objects -closure -source application} "::D::slot::b ::D::slot::c ::C::slot::a"
 
   ? {::nx::Object info method parameter info} ""
 
@@ -521,20 +521,20 @@
   ? {C info parameter syntax} "?-a value? ?-b value? ?-volatile? ?-noinit? ?-mixin mixinreg ...? ?-class class? ?-filter filterreg ...? ?__initcmd?"
   ? {C info parameter syntax a} "?-a value?"
 
-  ? {C info parameter spec} "-a {-b 1} -volatile:alias,noarg -noinit:alias,method=::nsf::methods::object::noinit,noarg -mixin:mixinreg,alias,1..n -class:class,alias,method=::nsf::methods::object::class -filter:filterreg,alias,1..n __initcmd:initcmd,optional"
+  ? {C info parameter definition} "-a {-b 1} -volatile:alias,noarg -noinit:alias,method=::nsf::methods::object::noinit,noarg -mixin:mixinreg,alias,1..n -class:class,alias,method=::nsf::methods::object::class -filter:filterreg,alias,1..n __initcmd:initcmd,optional"
 
   ? {C info parameter list} "-a -b -volatile -noinit -mixin -class -filter __initcmd"
-  ? {C info parameter name} "a b volatile noinit mixin class filter __initcmd"
-  ? {lsort [C info parameter slot]} "::C::slot::a ::C::slot::b ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::filter ::nx::Object::slot::mixin ::nx::Object::slot::noinit ::nx::Object::slot::volatile"
+  ? {C info parameter names} "a b volatile noinit mixin class filter __initcmd"
+  ? {lsort [C info slot objects -closure]} "::C::slot::a ::C::slot::b ::nx::Object::slot::__initcmd ::nx::Object::slot::class ::nx::Object::slot::filter ::nx::Object::slot::mixin ::nx::Object::slot::noinit ::nx::Object::slot::volatile"
 
-  ? {C info parameter spec b} "{-b 1}"
-  ? {D info parameter spec b} "{-b 2}"
-  ? {D info parameter slot b} "::D::slot::b"
-  ? {D info parameter slot a} "::C::slot::a"
-  ? {D info parameter slot class} "::nx::Object::slot::class"
+  ? {C info parameter definition b} "{-b 1}"
+  ? {D info parameter definition b} "{-b 2}"
+  ? {D info slot objects -closure b} "::D::slot::b"
+  ? {D info slot objects -closure a} "::C::slot::a"
+  ? {D info slot objects -closure class} "::nx::Object::slot::class"
 
   ? {D info parameter list} "-b -c -a -volatile -noinit -mixin -class -filter __initcmd"
-  ? {D info parameter name} "b c a volatile noinit mixin class filter __initcmd"
+  ? {D info parameter names} "b c a volatile noinit mixin class filter __initcmd"
 }
 
 #
@@ -552,8 +552,8 @@
       "{info filter methods} {info lookup method} {info lookup methods} {info method} {info methods}"
   ? {lsort [::nx::Object info methods "slots"]} ""
   ? {lsort [::nx::Object info methods "*slots*"]} ""
-  ? {lsort [::nx::Object info methods -path "*slots*"]} \
-      "{info lookup slots} {info slots}"
+  ? {lsort [::nx::Object info methods -path "*slot*"]} \
+      "{info lookup slots} {info slot objects}"
   ? {lsort [::nx::Object info methods -path "*filter*"]} \
       "filter {info filter guard} {info filter methods} {info lookup filter}"