Index: tests/info-method.tcl
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -re548a952433b4d26794f535995c9ed1ababe8807
--- tests/info-method.tcl	(.../info-method.tcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ tests/info-method.tcl	(.../info-method.tcl)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
@@ -25,19 +25,19 @@
 ? {lsort [C info methods -callprotection all]} "a addOne m m-with-assertions s"
 #? {lsort [C info methods]} "a addOne s"
 foreach m [lsort [C info methods -callprotection all]] {
-  ? [subst -nocommands {lsort [c1 info callable $m]}] $m
+  ? [subst -nocommands {lsort [c1 info callable methods $m]}] $m
 }
 ? {C info method definition a} "::C alias a ::set"
-? {c1 info callable -which a} "::C alias a ::set"
-? {c1 info callable -which addOne} "::C forward addOne expr 1 +"
-? {c1 info callable -which m} {::C method m x {return proc-[self proc]}}
-? {c1 info callable -which s} "::C setter s"
+? {c1 info callable method a} "::nsf::classes::C::a"
+? {c1 info callable method addOne} "::nsf::classes::C::addOne"
+? {c1 info callable method m} "::nsf::classes::C::m"
+? {c1 info callable method s} "::nsf::classes::C::s"
 c1 method foo {} {puts foo}
 ? {c1 info method definition foo} "::c1 method foo {} {puts foo}"
-? {c1 info callable -which foo} "::c1 method foo {} {puts foo}"
+? {c1 info callable method foo} "::c1::foo"
 
-? {C info method name m} "::nsf::classes::C::m"
-? {C object info method name mpo} "::C::mpo"
+? {C info method handle m} "::nsf::classes::C::m"
+? {C object info method handle mpo} "::C::mpo"
 
 ? {C info method definition m} {::C method m x {return proc-[self proc]}}
 ? {C info method def m} {::C method m x {return proc-[self proc]}}
@@ -63,7 +63,7 @@
 ? {C object info method definition apo} "::C object alias apo ::puts"
 
 
-? {::nx::Object info callable -application} ""
-? {::nx::Class info callable -application} ""
-? {lsort [C info callable -application]} "add1 apo fpo mpo spo"
-? {lsort [c1 info callable -application]} "a addOne foo m m-with-assertions s"
+? {::nx::Object info callable methods -application} ""
+? {::nx::Class info callable methods -application} ""
+? {lsort [C info callable methods -application]} "add1 apo fpo mpo spo"
+? {lsort [c1 info callable methods -application]} "a addOne foo m m-with-assertions s"