Index: TODO
===================================================================
diff -u -r52a0f3588723b74acd74a83be339c80b5b4a6701 -r30e21998853894414b65f668572dcf554635ead6
--- TODO	(.../TODO)	(revision 52a0f3588723b74acd74a83be339c80b5b4a6701)
+++ TODO	(.../TODO)	(revision 30e21998853894414b65f668572dcf554635ead6)
@@ -2963,6 +2963,8 @@
    * bring cmd definitions for nsf::object in right order
 - extended regression test
 
+- genAPI.decls and nsf.c: bring cmds in same order
+- nsf.c: align naming conventions
 
 TODO:
 - do we have to adjust the documentation in xotcl2 for object initialization?
Index: generic/gentclAPI.decls
===================================================================
diff -u -r52a0f3588723b74acd74a83be339c80b5b4a6701 -r30e21998853894414b65f668572dcf554635ead6
--- generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision 52a0f3588723b74acd74a83be339c80b5b4a6701)
+++ generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision 30e21998853894414b65f668572dcf554635ead6)
@@ -55,6 +55,9 @@
   {-argName "value" -required 1 -type tclobj}
 }
 
+#
+# method cmds
+#
 cmd "method::alias" NsfMethodAliasCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object" -required 0 -nrargs 0}
@@ -67,11 +70,6 @@
   {-argName "assertionsubcmd" -required 1 -type "check|object-invar|class-invar"}
   {-argName "arg" -required 0 -type tclobj}
 }
-cmd "method::delete" NsfMethodDeleteCmd {
-  {-argName "object" -required 1 -type object}
-  {-argName "-per-object" -nrargs 0}
-  {-argName "methodName" -required 1 -type tclobj}
-}
 cmd "method::create" NsfMethodCreateCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-inner-namespace" -nrargs 0}
@@ -83,6 +81,11 @@
   {-argName "-precondition"  -type tclobj}
   {-argName "-postcondition" -type tclobj}
 }
+cmd "method::delete" NsfMethodDeleteCmd {
+  {-argName "object" -required 1 -type object}
+  {-argName "-per-object" -nrargs 0}
+  {-argName "methodName" -required 1 -type tclobj}
+}
 cmd "method::forward" NsfMethodForwardCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object" -nrargs 0}
@@ -112,6 +115,9 @@
   {-argName "parameter" -required 1 -type tclobj}
 }
 
+#
+# object cmds
+#
 cmd "object::exists" NsfObjectExistsCmd {
   {-argName "value" -required 1 -type tclobj}
 }
@@ -122,12 +128,12 @@
   {-argName "objectName" -required 1 -type tclobj}
 }
 
+
 cmd my NsfMyCmd {
   {-argName "-local" -nrargs 0}
   {-argName "methodName" -required 1 -type tclobj}
   {-argName "args" -type args}
 }
-
 cmd next NsfNextCmd {
   {-argName "arguments" -required 0 -type tclobj}
 }
@@ -158,20 +164,23 @@
 cmd self NsfSelfCmd {
 }
 
-cmd "var::exists" NsfExistsVarCmd {
+#
+# var cmds
+#
+cmd "var::exists" NsfVarExistsCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varName" -required 1}
 }
-cmd "var::import" NsfImportvarCmd {
+cmd "var::import" NsfVarImportCmd {
   {-argName "object" -required 1 -type object}
   {-argName "args" -type args}
 }
-cmd "var::set" NsfSetVarCmd {
+cmd "var::set" NsfVarSetCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varName" -required 1 -type tclobj}
   {-argName "value" -required 0 -type tclobj}
 }
-cmd "var::unset" NsfUnsetVarCmd {
+cmd "var::unset" NsfVarUnsetCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varName" -required 1 -type tclobj}
 }
Index: generic/nsf.c
===================================================================
diff -u -r52a0f3588723b74acd74a83be339c80b5b4a6701 -r30e21998853894414b65f668572dcf554635ead6
--- generic/nsf.c	(.../nsf.c)	(revision 52a0f3588723b74acd74a83be339c80b5b4a6701)
+++ generic/nsf.c	(.../nsf.c)	(revision 30e21998853894414b65f668572dcf554635ead6)
@@ -12022,52 +12022,6 @@
 
 /*
  *----------------------------------------------------------------------
- * NsfNextCmd --
- *
- *    nsf::next calls the next shadowed method. It might get a single
- *    argument which is used as argument vector for that method. If no
- *    argument is provided, the argument vector of the last invocation
- *    is used.
- *
- * Results:
- *    Tcl return code
- *
- * Side effects:
- *    The invoked method might produce side effects
- *
- *----------------------------------------------------------------------
- */
-/*
-nsfCmd next NsfNextCmd {
-  {-argName "arguments" -required 0 -type tclobj}
-}
-*/
-static int
-NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *arguments) {
-  int freeArgumentVector, oc, nobjc, result;
-  NsfCallStackContent *cscPtr;
-  CONST char *methodName;
-  Tcl_Obj **nobjv, **ov;
-
-  if (arguments) {
-    /* Arguments were provided. */
-    int result = Tcl_ListObjGetElements(interp, arguments, &oc, &ov);
-    if (result != TCL_OK) {return result;}
-  } else {
-    /* No arguments were provided. */
-    oc = -1;
-  }
-
-  result = NextGetArguments(interp, oc, ov, &cscPtr, &methodName,
-			    &nobjc, &nobjv, &freeArgumentVector);
-  if (result == TCL_OK) {
-    result = NextSearchAndInvoke(interp, methodName, nobjc, nobjv, cscPtr, freeArgumentVector);
-  }
-  return result;
-}
-
-/*
- *----------------------------------------------------------------------
  * NsfNextObjCmd --
  *
  *    nsf::xotclnext is for backwards compatibility to the next
@@ -16143,8 +16097,9 @@
 /***********************************************************************
  * Begin generated Next Scripting commands
  ***********************************************************************/
+
 /*
-nsfCmd __db_show_stack NsfShowStackCmd {}
+cmd __db_show_stack NsfShowStackCmd {}
 */
 static int
 NsfShowStackCmd(Tcl_Interp *interp) {
@@ -16153,7 +16108,7 @@
 }
 
 /*
-nsfCmd __db_run_assertions NsfDebugRunAssertionsCmd {}
+cmd __db_run_assertions NsfDebugRunAssertionsCmd {}
 */
 static int
 NsfDebugRunAssertionsCmd(Tcl_Interp *interp) {
@@ -16225,7 +16180,7 @@
 }
 
 /*
-nsfCmd __profile_clear_data NsfProfileClearDataStub {}
+cmd __profile_clear_data NsfProfileClearDataStub {}
 */
 static int
 NsfProfileClearDataStub(Tcl_Interp *interp) {
@@ -16236,7 +16191,7 @@
 }
 
 /*
-nsfCmd __profile_get_data NsfProfileGetDataStub {}
+cmd __profile_get_data NsfProfileGetDataStub {}
 */
 static int
 NsfProfileGetDataStub(Tcl_Interp *interp) {
@@ -16292,7 +16247,7 @@
 }
 
 /*
-nsfCmd configure NsfConfigureCmd {
+cmd configure NsfConfigureCmd {
   {-argName "configureoption" -required 1 -type "debug|dtrace|filter|profile|softrecreate|objectsystems|keepinitcmd|checkresults|checkarguments"}
   {-argName "value" -required 0 -type tclobj}
 }
@@ -16423,7 +16378,7 @@
 
 
 /*
-nsfCmd createobjectsystem NsfCreateObjectSystemCmd {
+cmd createobjectsystem NsfCreateObjectSystemCmd {
   {-argName "rootClass" -required 1 -type tclobj}
   {-argName "rootMetaClass" -required 1 -type tclobj}
   {-argName "systemMethods" -required 0 -type tclobj}
@@ -16540,7 +16495,7 @@
 }
 
 /*
-nsfCmd dispatch NsfDispatchCmd {
+cmd dispatch NsfDispatchCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-frame" -required 0 -nrargs 1 -type "method|object|default" -default "default"}
   {-argName "command" -required 1 -type tclobj}
@@ -16649,7 +16604,7 @@
 }
 
 /*
-nsfCmd colon NsfColonCmd {
+cmd colon NsfColonCmd {
   {-argName "args" -type allargs}
 }
 */
@@ -16664,12 +16619,9 @@
 }
 
 /*
-nsfCmd finalize NsfFinalizeObjCmd {
+cmd finalize NsfFinalizeObjCmd {
 }
 */
-/*
- * ::nsf::finalize command
- */
 static int
 NsfFinalizeObjCmd(Tcl_Interp *interp) {
   int result;
@@ -16704,7 +16656,7 @@
 
 
 /*
-nsfCmd interp NsfInterpObjCmd {
+cmd interp NsfInterpObjCmd {
   {-argName "name"}
   {-argName "args" -type allargs}
 }
@@ -16739,7 +16691,7 @@
 }
 
 /*
-nsfCmd invalidateobjectparameter NsfInvalidateObjectParameterCmd {
+cmd invalidateobjectparameter NsfInvalidateObjectParameterCmd {
   {-argName "class" -type class}
 }
 */
@@ -16755,7 +16707,7 @@
 }
 
 /*
-nsfCmd is NsfIsCmd {
+cmd is NsfIsCmd {
   {-argName "-complain"}
   {-argName "constraint" -required 1 -type tclobj}
   {-argName "value" -required 1 -type tclobj}
@@ -16792,55 +16744,7 @@
 }
 
 /*
-cmd "object::exists" NsfObjectExistsCmd {
-  {-argName "value" -required 1 -type tclobj}
-}
-*/
-static int
-NsfObjectExistsCmd(Tcl_Interp *interp, Tcl_Obj *valueObj) {
-  NsfObject *object;
-
-  /*
-   * Pass the object as Tcl_Obj, since we do not want to raise an error in
-   * case the object does not exist.
-   */
-  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), GetObjectFromObj(interp, valueObj, &object) == TCL_OK);
-  return TCL_OK;
-}
-
-/*
-cmd "object::initialized" NsfObjectInitializedCmd {
-  {-argName "objectName" -required 1 -type object}
-}
-*/
-static int
-NsfObjectInitializedCmd(Tcl_Interp *interp, NsfObject *object) {
-  
-  Tcl_SetObjResult(interp, 
-		   NsfGlobalObjs[(object->flags & NSF_INIT_CALLED) ? 
-				 NSF_ONE : NSF_ZERO]);
-  return TCL_OK;
-}
-
-/*
-cmd "object::qualify" NsfObjectQualifyCmd {
-  {-argName "objectName" -required 1 -type tclobj}
-}
-*/
-static int
-NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *nameObj) {
-  CONST char *nameString = ObjStr(nameObj);
-
-  if (isAbsolutePath(nameString)) {
-    Tcl_SetObjResult(interp, nameObj);
-  } else {
-    Tcl_SetObjResult(interp, NameInNamespaceObj(interp, nameString, CallingNameSpace(interp)));
-  }
-  return TCL_OK;
-}
-
-/*
-nsfCmd method::alias NsfMethodAliasCmd {
+cmd method::alias NsfMethodAliasCmd {
   {-argName "object" -type object}
   {-argName "-per-object"}
   {-argName "methodName"}
@@ -17009,7 +16913,7 @@
 }
 
 /*
-nsfCmd method::assertion NsfMethodAssertionCmd {
+cmd method::assertion NsfMethodAssertionCmd {
   {-argName "object" -type object}
   {-argName "assertionsubcmd" -required 1 -type "check|object-invar|class-invar"}
   {-argName "arg" -required 0 -type tclobj}
@@ -17062,7 +16966,7 @@
 }
 
 /*
-nsfCmd method::create NsfMethodCreateCmd {
+cmd method::create NsfMethodCreateCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-inner-namespace"}
   {-argName "-per-object"}
@@ -17108,7 +17012,7 @@
 }
 
 /*
-nsfCmd method::forward NsfMethodForwardCmd {
+cmd method::forward NsfMethodForwardCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "method" -required 1 -type tclobj}
@@ -17165,7 +17069,7 @@
 }
 
 /*
-nsfCmd ::method::property NsfMethodPropertyCmd {
+cmd ::method::property NsfMethodPropertyCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "methodName" -required 1 -type tclobj}
@@ -17333,7 +17237,7 @@
 }
 
 /*
-nsfCmd method::setter NsfMethodSetterCmd {
+cmd method::setter NsfMethodSetterCmd {
   {-argName "object" -required 1 -type object}
   {-argName "-per-object"}
   {-argName "parameter" -type tclobj}
@@ -17397,8 +17301,62 @@
   return result;
 }
 
+
+
+
+
+
 /*
-nsfCmd my NsfMyCmd {
+cmd "object::exists" NsfObjectExistsCmd {
+  {-argName "value" -required 1 -type tclobj}
+}
+*/
+static int
+NsfObjectExistsCmd(Tcl_Interp *interp, Tcl_Obj *valueObj) {
+  NsfObject *object;
+
+  /*
+   * Pass the object as Tcl_Obj, since we do not want to raise an error in
+   * case the object does not exist.
+   */
+  Tcl_SetBooleanObj(Tcl_GetObjResult(interp), GetObjectFromObj(interp, valueObj, &object) == TCL_OK);
+  return TCL_OK;
+}
+
+/*
+cmd "object::initialized" NsfObjectInitializedCmd {
+  {-argName "objectName" -required 1 -type object}
+}
+*/
+static int
+NsfObjectInitializedCmd(Tcl_Interp *interp, NsfObject *object) {
+  
+  Tcl_SetObjResult(interp, 
+		   NsfGlobalObjs[(object->flags & NSF_INIT_CALLED) ? 
+				 NSF_ONE : NSF_ZERO]);
+  return TCL_OK;
+}
+
+/*
+cmd "object::qualify" NsfObjectQualifyCmd {
+  {-argName "objectName" -required 1 -type tclobj}
+}
+*/
+static int
+NsfObjectQualifyCmd(Tcl_Interp *interp, Tcl_Obj *nameObj) {
+  CONST char *nameString = ObjStr(nameObj);
+
+  if (isAbsolutePath(nameString)) {
+    Tcl_SetObjResult(interp, nameObj);
+  } else {
+    Tcl_SetObjResult(interp, NameInNamespaceObj(interp, nameString, CallingNameSpace(interp)));
+  }
+  return TCL_OK;
+}
+
+
+/*
+cmd my NsfMyCmd {
   {-argName "-local"}
   {-argName "method" -required 1 -type tclobj}
   {-argName "args" -type args}
@@ -17443,8 +17401,55 @@
   return result;
 }
 
+
 /*
-nsfCmd namespace_copycmds NsfNSCopyCmdsCmd {
+ *----------------------------------------------------------------------
+ * NsfNextCmd --
+ *
+ *    nsf::next calls the next shadowed method. It might get a single
+ *    argument which is used as argument vector for that method. If no
+ *    argument is provided, the argument vector of the last invocation
+ *    is used.
+ *
+ * Results:
+ *    Tcl return code
+ *
+ * Side effects:
+ *    The invoked method might produce side effects
+ *
+ *----------------------------------------------------------------------
+ */
+/*
+cmd next NsfNextCmd {
+  {-argName "arguments" -required 0 -type tclobj}
+}
+*/
+static int
+NsfNextCmd(Tcl_Interp *interp, Tcl_Obj *arguments) {
+  int freeArgumentVector, oc, nobjc, result;
+  NsfCallStackContent *cscPtr;
+  CONST char *methodName;
+  Tcl_Obj **nobjv, **ov;
+
+  if (arguments) {
+    /* Arguments were provided. */
+    int result = Tcl_ListObjGetElements(interp, arguments, &oc, &ov);
+    if (result != TCL_OK) {return result;}
+  } else {
+    /* No arguments were provided. */
+    oc = -1;
+  }
+
+  result = NextGetArguments(interp, oc, ov, &cscPtr, &methodName,
+			    &nobjc, &nobjv, &freeArgumentVector);
+  if (result == TCL_OK) {
+    result = NextSearchAndInvoke(interp, methodName, nobjc, nobjv, cscPtr, freeArgumentVector);
+  }
+  return result;
+}
+
+/*
+cmd nscopycmds NsfNSCopyCmdsCmd {
   {-argName "fromNs" -required 1 -type tclobj}
   {-argName "toNs" -required 1 -type tclobj}
 }
@@ -17651,7 +17656,7 @@
 }
 
 /*
-nsfCmd namespace_copyvars NsfNSCopyVars {
+cmd nscopyvars NsfNSCopyVars {
   {-argName "fromNs" -required 1 -type tclobj}
   {-argName "toNs" -required 1 -type tclobj}
 }
@@ -17764,7 +17769,7 @@
 }
 
 /*
-nsfCmd proc NsfProcCmd {
+cmd proc NsfProcCmd {
   {-argName "-ad" -required 0}
   {-argName "procName" -required 1 -type tclobj}
   {-argName "arguments" -required 1 -type tclobj}
@@ -17811,7 +17816,7 @@
 }
 
 /*
-nsfCmd relation NsfRelationCmd {
+cmd relation NsfRelationCmd {
   {-argName "object" -type object}
   {-argName "relationtype" -required 1 -type "object-mixin|class-mixin|object-filter|class-filter|class|superclass|rootclass"}
   {-argName "value" -required 0 -type tclobj}
@@ -18066,7 +18071,7 @@
 }
 
 /*
-nsfCmd current NsfCurrentCmd {
+cmd current NsfCurrentCmd {
   {-argName "currentoption" -required 0 -type "proc|method|methodpath|object|class|activelevel|args|activemixin|calledproc|calledmethod|calledclass|callingproc|callingmethod|callingclass|callinglevel|callingobject|filterreg|isnextcall|next"}
 }
 */
@@ -18212,7 +18217,7 @@
 }
 
 /*
-nsfCmd self NsfSelfCmd {
+cmd self NsfSelfCmd {
 }
 */
 static int
@@ -18228,13 +18233,13 @@
 }
 
 /*
-nsfCmd var::exists NsfExistsVarCmd {
+cmd var::exists NsfVarExistsCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varname" -required 1}
 }
 */
 static int
-NsfExistsVarCmd(Tcl_Interp *interp, NsfObject *object, CONST char *varName) {
+NsfVarExistsCmd(Tcl_Interp *interp, NsfObject *object, CONST char *varName) {
 
   if (CheckVarName(interp, varName) != TCL_OK) {
     return TCL_ERROR;
@@ -18245,13 +18250,13 @@
 }
 
 /*
-nsfCmd var::import NsfImportvarCmd {
+cmd var::import NsfVarImportCmd {
   {-argName "object" -type object}
   {-argName "args" -type args}
 }
 */
 static int
-NsfImportvar(Tcl_Interp *interp, NsfObject *object, const char *cmdName, int objc, Tcl_Obj *CONST objv[]) {
+NsfVarImport(Tcl_Interp *interp, NsfObject *object, const char *cmdName, int objc, Tcl_Obj *CONST objv[]) {
   int i, result = TCL_OK;
 
   for (i=0; i<objc && result == TCL_OK; i++) {
@@ -18277,19 +18282,19 @@
 }
 
 static int
-NsfImportvarCmd(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) {
-  return NsfImportvar(interp, object, "importvar", objc, objv);
+NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int objc, Tcl_Obj *CONST objv[]) {
+  return NsfVarImport(interp, object, "importvar", objc, objv);
 }
 
 /*
-nsfCmd var::set NsfSetVarCmd {
+cmd var::set NsfVarSetCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varname" -required 1 -type tclobj}
   {-argName "value" -required 0 -type tclobj}
 }
 */
 static int
-NsfSetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varname, Tcl_Obj *valueObj) {
+NsfVarSetCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varname, Tcl_Obj *valueObj) {
 
   if (CheckVarName(interp, ObjStr(varname)) != TCL_OK) {
     return TCL_ERROR;
@@ -18299,13 +18304,13 @@
 }
 
 /*
-nsfCmd var::unset NsfUnsetVarCmd {
+cmd var::unset NsfVarUnsetCmd {
   {-argName "object" -required 1 -type object}
   {-argName "varname" -required 1 -type tclobj}
 }
 */
 static int
-NsfUnsetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varNameObj) {
+NsfVarUnsetCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varNameObj) {
   char *varName = ObjStr(varNameObj);
 
   if (CheckVarName(interp, varName) != TCL_OK) {
@@ -19148,7 +19153,7 @@
 			 ObjectName(object));
   }
 
-  result = NsfImportvar(interp, object, ObjStr(objv[0]), objc-1, objv+1);
+  result = NsfVarImport(interp, object, ObjStr(objv[0]), objc-1, objv+1);
   CallStackRestoreSavedFrames(interp, &ctx);
   return result;
 }
Index: generic/tclAPI.h
===================================================================
diff -u -r52a0f3588723b74acd74a83be339c80b5b4a6701 -r30e21998853894414b65f668572dcf554635ead6
--- generic/tclAPI.h	(.../tclAPI.h)	(revision 52a0f3588723b74acd74a83be339c80b5b4a6701)
+++ generic/tclAPI.h	(.../tclAPI.h)	(revision 30e21998853894414b65f668572dcf554635ead6)
@@ -224,9 +224,7 @@
 static int NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int NsfExistsVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfFinalizeObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int NsfImportvarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfInvalidateObjectParameterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfIsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
@@ -250,10 +248,12 @@
 static int NsfProfileGetDataStubStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfRelationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfSelfCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int NsfSetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfUnsetUnknownArgsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int NsfUnsetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
+static int NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
@@ -319,9 +319,7 @@
 static int NsfCurrentCmd(Tcl_Interp *interp, int currentoption);
 static int NsfDebugRunAssertionsCmd(Tcl_Interp *interp);
 static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withFrame, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST nobjv[]);
-static int NsfExistsVarCmd(Tcl_Interp *interp, NsfObject *object, CONST char *varName);
 static int NsfFinalizeObjCmd(Tcl_Interp *interp);
-static int NsfImportvarCmd(Tcl_Interp *interp, NsfObject *object, int nobjc, Tcl_Obj *CONST nobjv[]);
 static int NsfInterpObjCmd(Tcl_Interp *interp, CONST char *name, int objc, Tcl_Obj *CONST objv[]);
 static int NsfInvalidateObjectParameterCmd(Tcl_Interp *interp, NsfClass *class);
 static int NsfIsCmd(Tcl_Interp *interp, int withComplain, Tcl_Obj *constraint, Tcl_Obj *value);
@@ -345,10 +343,12 @@
 static int NsfProfileGetDataStub(Tcl_Interp *interp);
 static int NsfRelationCmd(Tcl_Interp *interp, NsfObject *object, int relationtype, Tcl_Obj *value);
 static int NsfSelfCmd(Tcl_Interp *interp);
-static int NsfSetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varName, Tcl_Obj *value);
 static int NsfShowStackCmd(Tcl_Interp *interp);
 static int NsfUnsetUnknownArgsCmd(Tcl_Interp *interp);
-static int NsfUnsetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varName);
+static int NsfVarExistsCmd(Tcl_Interp *interp, NsfObject *object, CONST char *varName);
+static int NsfVarImportCmd(Tcl_Interp *interp, NsfObject *object, int nobjc, Tcl_Obj *CONST nobjv[]);
+static int NsfVarSetCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varName, Tcl_Obj *value);
+static int NsfVarUnsetCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varName);
 static int NsfOAutonameMethod(Tcl_Interp *interp, NsfObject *obj, int withInstance, int withReset, Tcl_Obj *name);
 static int NsfOClassMethod(Tcl_Interp *interp, NsfObject *obj, Tcl_Obj *class);
 static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *obj);
@@ -415,9 +415,7 @@
  NsfCurrentCmdIdx,
  NsfDebugRunAssertionsCmdIdx,
  NsfDispatchCmdIdx,
- NsfExistsVarCmdIdx,
  NsfFinalizeObjCmdIdx,
- NsfImportvarCmdIdx,
  NsfInterpObjCmdIdx,
  NsfInvalidateObjectParameterCmdIdx,
  NsfIsCmdIdx,
@@ -441,10 +439,12 @@
  NsfProfileGetDataStubIdx,
  NsfRelationCmdIdx,
  NsfSelfCmdIdx,
- NsfSetVarCmdIdx,
  NsfShowStackCmdIdx,
  NsfUnsetUnknownArgsCmdIdx,
- NsfUnsetVarCmdIdx,
+ NsfVarExistsCmdIdx,
+ NsfVarImportCmdIdx,
+ NsfVarSetCmdIdx,
+ NsfVarUnsetCmdIdx,
  NsfOAutonameMethodIdx,
  NsfOClassMethodIdx,
  NsfOCleanupMethodIdx,
@@ -1077,26 +1077,6 @@
 }
 
 static int
-NsfExistsVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  ParseContext pc;
-  (void)clientData;
-
-  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfExistsVarCmdIdx].paramDefs, 
-                     method_definitions[NsfExistsVarCmdIdx].nrParameters, 1,
-                     &pc) != TCL_OK) {
-    return TCL_ERROR;
-  } else {
-    NsfObject *object = (NsfObject *)pc.clientData[0];
-    CONST char *varName = (CONST char *)pc.clientData[1];
-
-    assert(pc.status == 0);
-    return NsfExistsVarCmd(interp, object, varName);
-
-  }
-}
-
-static int
 NsfFinalizeObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   (void)clientData;
 
@@ -1113,25 +1093,6 @@
 }
 
 static int
-NsfImportvarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  ParseContext pc;
-  (void)clientData;
-
-  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfImportvarCmdIdx].paramDefs, 
-                     method_definitions[NsfImportvarCmdIdx].nrParameters, 1,
-                     &pc) != TCL_OK) {
-    return TCL_ERROR;
-  } else {
-    NsfObject *object = (NsfObject *)pc.clientData[0];
-
-    assert(pc.status == 0);
-    return NsfImportvarCmd(interp, object, objc-pc.lastobjc, objv+pc.lastobjc);
-
-  }
-}
-
-static int
 NsfInterpObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   ParseContext pc;
   (void)clientData;
@@ -1589,27 +1550,6 @@
 }
 
 static int
-NsfSetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  ParseContext pc;
-  (void)clientData;
-
-  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfSetVarCmdIdx].paramDefs, 
-                     method_definitions[NsfSetVarCmdIdx].nrParameters, 1,
-                     &pc) != TCL_OK) {
-    return TCL_ERROR;
-  } else {
-    NsfObject *object = (NsfObject *)pc.clientData[0];
-    Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[1];
-    Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2];
-
-    assert(pc.status == 0);
-    return NsfSetVarCmd(interp, object, varName, value);
-
-  }
-}
-
-static int
 NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   (void)clientData;
 
@@ -1642,26 +1582,86 @@
 }
 
 static int
-NsfUnsetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+NsfVarExistsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   ParseContext pc;
   (void)clientData;
 
   if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfUnsetVarCmdIdx].paramDefs, 
-                     method_definitions[NsfUnsetVarCmdIdx].nrParameters, 1,
+                     method_definitions[NsfVarExistsCmdIdx].paramDefs, 
+                     method_definitions[NsfVarExistsCmdIdx].nrParameters, 1,
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
     NsfObject *object = (NsfObject *)pc.clientData[0];
+    CONST char *varName = (CONST char *)pc.clientData[1];
+
+    assert(pc.status == 0);
+    return NsfVarExistsCmd(interp, object, varName);
+
+  }
+}
+
+static int
+NsfVarImportCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfVarImportCmdIdx].paramDefs, 
+                     method_definitions[NsfVarImportCmdIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    NsfObject *object = (NsfObject *)pc.clientData[0];
+
+    assert(pc.status == 0);
+    return NsfVarImportCmd(interp, object, objc-pc.lastobjc, objv+pc.lastobjc);
+
+  }
+}
+
+static int
+NsfVarSetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfVarSetCmdIdx].paramDefs, 
+                     method_definitions[NsfVarSetCmdIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    NsfObject *object = (NsfObject *)pc.clientData[0];
     Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[1];
+    Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfUnsetVarCmd(interp, object, varName);
+    return NsfVarSetCmd(interp, object, varName, value);
 
   }
 }
 
 static int
+NsfVarUnsetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
+  (void)clientData;
+
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfVarUnsetCmdIdx].paramDefs, 
+                     method_definitions[NsfVarUnsetCmdIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    NsfObject *object = (NsfObject *)pc.clientData[0];
+    Tcl_Obj *varName = (Tcl_Obj *)pc.clientData[1];
+
+    assert(pc.status == 0);
+    return NsfVarUnsetCmd(interp, object, varName);
+
+  }
+}
+
+static int
 NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   ParseContext pc;
   NsfObject *obj =  (NsfObject *)clientData;
@@ -2422,17 +2422,9 @@
   {"command", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::var::exists", NsfExistsVarCmdStub, 2, {
-  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
-},
 {"::nsf::finalize", NsfFinalizeObjCmdStub, 0, {
   {NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::var::import", NsfImportvarCmdStub, 2, {
-  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
-},
 {"::nsf::interp", NsfInterpObjCmdStub, 2, {
   {"name", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
@@ -2546,19 +2538,27 @@
 {"::nsf::self", NsfSelfCmdStub, 0, {
   {NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::var::set", NsfSetVarCmdStub, 3, {
-  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"value", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
-},
 {"::nsf::__db_show_stack", NsfShowStackCmdStub, 0, {
   {NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::__unset_unknown_args", NsfUnsetUnknownArgsCmdStub, 0, {
   {NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
-{"::nsf::var::unset", NsfUnsetVarCmdStub, 2, {
+{"::nsf::var::exists", NsfVarExistsCmdStub, 2, {
   {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::nsf::var::import", NsfVarImportCmdStub, 2, {
+  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::nsf::var::set", NsfVarSetCmdStub, 3, {
+  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"value", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+},
+{"::nsf::var::unset", NsfVarUnsetCmdStub, 2, {
+  {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertToObject, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"varName", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::object::autoname", NsfOAutonameMethodStub, 3, {