Index: generic/nsf.c
===================================================================
diff -u -r3d4cb79342d1f74cdcc39d6d8b87e9c475f2706a -r8c7cda91db207490f2d401595cec6cf784460bb6
--- generic/nsf.c	(.../nsf.c)	(revision 3d4cb79342d1f74cdcc39d6d8b87e9c475f2706a)
+++ generic/nsf.c	(.../nsf.c)	(revision 8c7cda91db207490f2d401595cec6cf784460bb6)
@@ -12360,7 +12360,18 @@
 	Tcl_DStringAppend(dsPtr, cmdPtr->nsPtr->fullName, -1);
       }
       Tcl_DStringAppend(dsPtr, "::", 2);
-      Tcl_DStringAppend(dsPtr, methodName, -1);
+           
+      if (methodName != NULL) {
+	  Tcl_DStringAppend(dsPtr, methodName, -1);
+      } else {
+	  /* 
+	     This branch is enter for C-implemented commands,
+	     such as ::nsf::xotclnext
+          */
+	  Tcl_DStringAppend(dsPtr, Tcl_GetCommandName(interp,cmd), -1);
+      }
+      
+      /*fprintf(stderr,"Looking up ::nsf::parametersyntax(%s) ...\n",Tcl_DStringValue(dsPtr));*/
       parameterSyntaxObj = Tcl_GetVar2Ex(interp, "::nsf::parametersyntax", 
 					 Tcl_DStringValue(dsPtr), TCL_GLOBAL_ONLY);
       
Index: generic/nsf.tcl
===================================================================
diff -u -rf2c0f8e055015e58f3fa7bd338c872a2b7d76113 -r8c7cda91db207490f2d401595cec6cf784460bb6
--- generic/nsf.tcl	(.../nsf.tcl)	(revision f2c0f8e055015e58f3fa7bd338c872a2b7d76113)
+++ generic/nsf.tcl	(.../nsf.tcl)	(revision 8c7cda91db207490f2d401595cec6cf784460bb6)
@@ -50,7 +50,7 @@
       set rel "object-mixin"
       set args [lrange $args 1 end]
     } else {
-      set rel "mixin"
+      set rel "class-mixin"
     }
     set oldSetting [::nsf::relation $object $rel]
     # use uplevel to avoid namespace surprises
Index: generic/predefined.h
===================================================================
diff -u -rf2c0f8e055015e58f3fa7bd338c872a2b7d76113 -r8c7cda91db207490f2d401595cec6cf784460bb6
--- generic/predefined.h	(.../predefined.h)	(revision f2c0f8e055015e58f3fa7bd338c872a2b7d76113)
+++ generic/predefined.h	(.../predefined.h)	(revision 8c7cda91db207490f2d401595cec6cf784460bb6)
@@ -20,7 +20,7 @@
 "if {[lindex $args 0] eq \"-per-object\"} {\n"
 "set rel \"object-mixin\"\n"
 "set args [lrange $args 1 end]} else {\n"
-"set rel \"mixin\"}\n"
+"set rel \"class-mixin\"}\n"
 "set oldSetting [::nsf::relation $object $rel]\n"
 "uplevel [list ::nsf::relation $object $rel [linsert $oldSetting end $args]]}\n"
 "::nsf::provide_method autoname {::nsf::alias autoname ::nsf::methods::object::autoname}\n"