Index: generic/nsf.c
===================================================================
diff -u -r1c14f3a105d396b9d3cc0c74a4ec3ae72261bac0 -r8046b1da6bc0689f73d4dbdc3f8d1e03fd23acaf
--- generic/nsf.c	(.../nsf.c)	(revision 1c14f3a105d396b9d3cc0c74a4ec3ae72261bac0)
+++ generic/nsf.c	(.../nsf.c)	(revision 8046b1da6bc0689f73d4dbdc3f8d1e03fd23acaf)
@@ -18166,15 +18166,15 @@
 
 /* TODO: move me */
 /*
-cmd "method::dispatch" NsfMethodDispatchCmd {
+cmd "directdispatch" NsfDirectDispatchCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-frame" -required 0 -nrargs 1 -type "method|object|default" -default "default"}
   {-argName "command" -required 1 -type tclobj}
   {-argName "args"  -type args}
 }
 */
 static int
-NsfMethodDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withFrame, 
+NsfDirectDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withFrame, 
 		     Tcl_Obj *commandObj, int nobjc, Tcl_Obj *CONST nobjv[]) {
   int result;
   CONST char *methodName = ObjStr(commandObj);
@@ -18275,7 +18275,7 @@
 
 
 /*
-cmd "object::dispatch" NsfObjectDispatchCmd {
+cmd "dispatch" NsfDispatchCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-intrinsic" -required 0 -nrargs 0}
   {-argName "-system" -required 0 -nrargs 0}
@@ -18284,7 +18284,7 @@
 }
 */
 static int
-NsfObjectDispatchCmd(Tcl_Interp *interp, NsfObject *object, 
+NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, 
 		     int withIntrinsic, int withSystem,
 		     Tcl_Obj *commandObj, int nobjc, Tcl_Obj *CONST nobjv[]) {
   int flags = NSF_CM_NO_UNKNOWN|NSF_CSC_IMMEDIATE|NSF_CM_IGNORE_PERMISSIONS|NSF_CM_NO_SHIFT;