Index: generic/nsf.c
===================================================================
diff -u -N -r88a4a36bce68febc0be48bf4828521f6a0d5ddcc -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/nsf.c	(.../nsf.c)	(revision 88a4a36bce68febc0be48bf4828521f6a0d5ddcc)
+++ generic/nsf.c	(.../nsf.c)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -1194,11 +1194,11 @@
 int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[])
   nonnull(1) nonnull(2) nonnull(3) nonnull(5);
 int NsfDeleteObject(Tcl_Interp *interp, Nsf_Object *object) nonnull(1) nonnull(2);
-int NsfRemoveObjectMethod(Tcl_Interp *interp, Nsf_Object *object1, const char *methodName)
+int NsfRemoveObjectMethod(Tcl_Interp *interp, Nsf_Object *object, const char *methodName)
   nonnull(1) nonnull(2) nonnull(3);
 int NsfRemoveClassMethod(Tcl_Interp *interp, Nsf_Class *class, const char *methodName)
   nonnull(1) nonnull(2) nonnull(3);
-int Nsf_UnsetVar2(Nsf_Object *object1, Tcl_Interp *interp,
+int Nsf_UnsetVar2(Nsf_Object *object, Tcl_Interp *interp,
                   const char *name1, const char *name2, unsigned int flags)
   nonnull(1) nonnull(2) nonnull(4);
 
@@ -1289,20 +1289,20 @@
 }
 
 int
-Nsf_UnsetVar2(Nsf_Object *object1, Tcl_Interp *interp,
+Nsf_UnsetVar2(Nsf_Object *object, Tcl_Interp *interp,
                    const char *name1, const char *name2, unsigned int flags) {
   CallFrame frame, *framePtr = &frame;
-  NsfObject *object;
+  NsfObject *o;
   int result;
 
-  nonnull_assert(object1 != NULL);
+  nonnull_assert(object != NULL);
   nonnull_assert(interp != NULL);
   nonnull_assert(name1 != NULL);
   nonnull_assert(name2 != NULL);
 
-  object = (NsfObject *) object1;
-  Nsf_PushFrameObj(interp, object, framePtr);
-  if (object->nsPtr != NULL) {
+  o = (NsfObject *) object;
+  Nsf_PushFrameObj(interp, o, framePtr);
+  if (o->nsPtr != NULL) {
     flags |= TCL_NAMESPACE_ONLY;
   }
   result = Tcl_UnsetVar2(interp, name1, name2, (int)flags);
@@ -1347,30 +1347,30 @@
 }
 
 int
-NsfRemoveObjectMethod(Tcl_Interp *interp, Nsf_Object *object1, const char *methodName) {
-  NsfObject *object;
+NsfRemoveObjectMethod(Tcl_Interp *interp, Nsf_Object *object, const char *methodName) {
+  NsfObject *currentObject;
 
   nonnull_assert(interp != NULL);
-  nonnull_assert(object1 != NULL);
+  nonnull_assert(object != NULL);
   nonnull_assert(methodName != NULL);
 
-  object = (NsfObject *) object1;
-  /*fprintf(stderr, "... NsfRemoveObjectMethod %s %s\n", ObjectName(object), methodName);*/
+  currentObject = (NsfObject *) object;
+  /*fprintf(stderr, "... NsfRemoveObjectMethod %s %s\n", ObjectName(currentObject), methodName);*/
 
   NsfObjectMethodEpochIncr("NsfRemoveObjectMethod");
-  AliasDelete(interp, object->cmdName, methodName, 1);
+  AliasDelete(interp, currentObject->cmdName, methodName, 1);
 
 #if defined(NSF_WITH_ASSERTIONS)
-  if (object->opt != NULL && object->opt->assertions != NULL) {
-    AssertionRemoveProc(object->opt->assertions, methodName);
+  if (currentObject->opt != NULL && currentObject->opt->assertions != NULL) {
+    AssertionRemoveProc(currentObject->opt->assertions, methodName);
   }
 #endif
 
-  if (object->nsPtr != NULL) {
-    int rc = NSDeleteCmd(interp, object->nsPtr, methodName);
+  if (currentObject->nsPtr != NULL) {
+    int rc = NSDeleteCmd(interp, currentObject->nsPtr, methodName);
     if (rc < 0) {
       return NsfPrintError(interp, "%s: cannot delete object specific method '%s'",
-                           ObjectName_(object), methodName);
+                           ObjectName_(currentObject), methodName);
     }
   }
   return TCL_OK;
@@ -6811,37 +6811,37 @@
  *
  *----------------------------------------------------------------------
  */
-int NsfAddObjectMethod(Tcl_Interp *interp, Nsf_Object *object1, const char *methodName,
+int NsfAddObjectMethod(Tcl_Interp *interp, Nsf_Object *object, const char *methodName,
                        Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp,
                        unsigned int flags) nonnull(1) nonnull(2) nonnull(3) nonnull(4);
 
 int
-NsfAddObjectMethod(Tcl_Interp *interp, Nsf_Object *object1, const char *methodName,
+NsfAddObjectMethod(Tcl_Interp *interp, Nsf_Object *object, const char *methodName,
                    Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp,
                    unsigned int flags) {
-  NsfObject *object;
+  NsfObject *currentObject;
   Tcl_DString newCmdName, *dsPtr = &newCmdName;
   Tcl_Namespace *ns;
   Tcl_Command newCmd;
   int result;
 
   nonnull_assert(interp != NULL);
-  nonnull_assert(object1 != NULL);
+  nonnull_assert(object != NULL);
   nonnull_assert(methodName != NULL);
   nonnull_assert(proc != NULL);
 
-  object = (NsfObject *)object1;
-  ns = RequireObjNamespace(interp, object);
+  currentObject = (NsfObject *)object;
+  ns = RequireObjNamespace(interp, currentObject);
 
   /* Check, if we are allowed to redefine the method */
-  result = CanRedefineCmd(interp, object->nsPtr, object, (char *)methodName, flags);
+  result = CanRedefineCmd(interp, currentObject->nsPtr, currentObject, (char *)methodName, flags);
   if (unlikely(result != TCL_OK)) {
     return result;
   }
   NsfObjectMethodEpochIncr("NsfAddObjectMethod");
 
   /* delete an alias definition, if it exists */
-  AliasDelete(interp, object->cmdName, methodName, 1);
+  AliasDelete(interp, currentObject->cmdName, methodName, 1);
 
   Tcl_DStringInit(dsPtr);
   DStringAppendQualName(dsPtr, ns, methodName);
Index: generic/nsf.decls
===================================================================
diff -u -N -r37c87756387c17e0f2f43634c0d452a91f91c844 -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/nsf.decls	(.../nsf.decls)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
+++ generic/nsf.decls	(.../nsf.decls)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -72,15 +72,17 @@
   int NsfDeleteObject(Tcl_Interp *interp, struct Nsf_Object *object)
 }
 declare 6 generic {
-  int NsfRemoveObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object, const char *nm)
+    int NsfRemoveObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object,
+			      const char *methodName)
 }
 declare 7 generic {
-  int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, const char *nm)
+    int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *class,
+			     const char *methodName)
 }
 declare 8 generic {
   Tcl_Obj *Nsf_ObjSetVar2(struct Nsf_Object *object,
 			  Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2,
-			  Tcl_Obj *value, unsigned int flags)
+			  Tcl_Obj *valueObj, unsigned int flags)
 }
 declare 9 generic {
   Tcl_Obj *Nsf_ObjGetVar2(struct Nsf_Object *object, 
@@ -92,7 +94,7 @@
 		    const char *name1, const char *name2, unsigned int flags)
 }
 declare 11 generic {
-  void NsfDStringVPrintf(Tcl_DString *dsPtr, const char *fmt, va_list apSrc)
+  void NsfDStringVPrintf(Tcl_DString *dsPtr, const char *fmt, va_list argPtr)
 }
 declare 12 generic {
   int NsfPrintError(Tcl_Interp *interp, const char *fmt, ...)
@@ -125,21 +127,24 @@
 }
 declare 21 generic {
   int  NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object,
-			     Tcl_Obj *method, Tcl_Obj *arg,
-			     int objc, Tcl_Obj *CONST objv[], unsigned int flags)
+			     Tcl_Obj *methodObj, Tcl_Obj *arg1,
+			     int givenObjc, Tcl_Obj *CONST objv[],
+			     unsigned int flags)
 }
 declare 22 generic {
   int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *object, 
-                         CONST char *nm, Tcl_ObjCmdProc *proc,
-	                 ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags)
+                         CONST char *methodName, Tcl_ObjCmdProc *proc,
+	                 ClientData clientData, Tcl_CmdDeleteProc *dp,
+			 unsigned int flags)
 }
 declare 23 generic {
-  int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
-			CONST char *nm, Tcl_ObjCmdProc *proc,
-			ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags)
+  int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *class, 
+			CONST char *methodName, Tcl_ObjCmdProc *proc,
+			ClientData clientData, Tcl_CmdDeleteProc *dp,
+			unsigned int flags)
 }
 declare 24 generic {
-  int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, 
+  int NsfCreate(Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, 
 		int objc, Tcl_Obj *CONST objv[])
 }
 declare 25 generic {
Index: generic/nsfError.c
===================================================================
diff -u -N -r0de05aaed50fced1cd80a9408560a38fb2454bcf -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/nsfError.c	(.../nsfError.c)	(revision 0de05aaed50fced1cd80a9408560a38fb2454bcf)
+++ generic/nsfError.c	(.../nsfError.c)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -74,9 +74,9 @@
  */
 
 void
-NsfDStringVPrintf(Tcl_DString *dsPtr, const char *fmt, va_list vargs) {
+NsfDStringVPrintf(Tcl_DString *dsPtr, const char *fmt, va_list argPtr) {
   int      result, failure, avail, offset;
-  va_list  vargsCopy;
+  va_list  argPtrCopy;
 
   /*
    * Tcl_DStringLength returns the current length *without* the
@@ -100,9 +100,9 @@
    * 1) Copy va_list so that the caller's copy is untouched.
    * 2) Run vsnprintf() eagerly.
    */
-  va_copy(vargsCopy, vargs);
-  result = vsnprintf(dsPtr->string + offset, (size_t)avail, fmt, vargsCopy);
-  va_end(vargsCopy);
+  va_copy(argPtrCopy, argPtr);
+  result = vsnprintf(dsPtr->string + offset, (size_t)avail, fmt, argPtrCopy);
+  va_end(argPtrCopy);
 
 #if defined(_MSC_VER)
   /*
@@ -141,9 +141,9 @@
      */
 
 #if defined(_MSC_VER)
-    va_copy(vargsCopy, vargs);
-    addedStringLength = _vscprintf(fmt, vargsCopy);
-    va_end(vargsCopy);
+    va_copy(argPtrCopy, argPtr);
+    addedStringLength = _vscprintf(fmt, argPtrCopy);
+    va_end(argPtrCopy);
 #else
     addedStringLength = result;
 #endif
@@ -162,9 +162,9 @@
     avail = dsPtr->spaceAvl - offset;
 #endif
 
-    va_copy(vargsCopy, vargs);
-    result = vsnprintf(dsPtr->string + offset, (size_t)avail, fmt, vargsCopy);
-    va_end(vargsCopy);
+    va_copy(argPtrCopy, argPtr);
+    result = vsnprintf(dsPtr->string + offset, (size_t)avail, fmt, argPtrCopy);
+    va_end(argPtrCopy);
 
 #if defined(_MSC_VER)
     failure = (result == -1);
Index: generic/nsfStack.c
===================================================================
diff -u -N -rb2c4a961dd175a750fa459d9f7021be567d33d08 -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/nsfStack.c	(.../nsfStack.c)	(revision b2c4a961dd175a750fa459d9f7021be567d33d08)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -56,9 +56,9 @@
 NSF_INLINE static NsfObject* GetSelfObj2(const Tcl_Interp *interp, Tcl_CallFrame *framePtr)
   nonnull(1) nonnull(2);
 
-static  Tcl_CallFrame* CallStackGetTclFrame(const Tcl_Interp *interp,
-                                            Tcl_CallFrame *startFramePtr,
-                                            int skip)
+static Tcl_CallFrame* CallStackGetTclFrame(const Tcl_Interp *interp,
+                                           Tcl_CallFrame *varFramePtr,
+                                           int skip)
   nonnull(1);
 
 static NsfCallStackContent* CallStackGetTopFrame(const Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr)
Index: generic/stubs8.5/nsfDecls.h
===================================================================
diff -u -N -r37c87756387c17e0f2f43634c0d452a91f91c844 -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/stubs8.5/nsfDecls.h	(.../nsfDecls.h)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
+++ generic/stubs8.5/nsfDecls.h	(.../nsfDecls.h)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -92,20 +92,22 @@
 #define NsfRemoveObjectMethod_TCL_DECLARED
 /* 6 */
 EXTERN int		NsfRemoveObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, CONST char *nm);
+				struct Nsf_Object *object,
+				CONST char *methodName);
 #endif
 #ifndef NsfRemoveClassMethod_TCL_DECLARED
 #define NsfRemoveClassMethod_TCL_DECLARED
 /* 7 */
 EXTERN int		NsfRemoveClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm);
+				struct Nsf_Class *class,
+				CONST char *methodName);
 #endif
 #ifndef Nsf_ObjSetVar2_TCL_DECLARED
 #define Nsf_ObjSetVar2_TCL_DECLARED
 /* 8 */
 EXTERN Tcl_Obj *	Nsf_ObjSetVar2(struct Nsf_Object *object,
 				Tcl_Interp *interp, Tcl_Obj *name1,
-				Tcl_Obj *name2, Tcl_Obj *value,
+				Tcl_Obj *name2, Tcl_Obj *valueObj,
 				unsigned int flags);
 #endif
 #ifndef Nsf_ObjGetVar2_TCL_DECLARED
@@ -126,7 +128,7 @@
 #define NsfDStringVPrintf_TCL_DECLARED
 /* 11 */
 EXTERN void		NsfDStringVPrintf(Tcl_DString *dsPtr,
-				CONST char *fmt, va_list apSrc);
+				CONST char *fmt, va_list argPtr);
 #endif
 #ifndef NsfPrintError_TCL_DECLARED
 #define NsfPrintError_TCL_DECLARED
@@ -185,31 +187,33 @@
 #define NsfCallMethodWithArgs_TCL_DECLARED
 /* 21 */
 EXTERN int		NsfCallMethodWithArgs(Tcl_Interp *interp,
-				Nsf_Object *object, Tcl_Obj *method,
-				Tcl_Obj *arg, int objc,
+				Nsf_Object *object, Tcl_Obj *methodObj,
+				Tcl_Obj *arg1, int givenObjc,
 				Tcl_Obj *CONST objv[], unsigned int flags);
 #endif
 #ifndef NsfAddObjectMethod_TCL_DECLARED
 #define NsfAddObjectMethod_TCL_DECLARED
 /* 22 */
 EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Object *object,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 #endif
 #ifndef NsfAddClassMethod_TCL_DECLARED
 #define NsfAddClassMethod_TCL_DECLARED
 /* 23 */
 EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Class *class,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 #endif
 #ifndef NsfCreate_TCL_DECLARED
 #define NsfCreate_TCL_DECLARED
 /* 24 */
-EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
-				Tcl_Obj *name, int objc,
+EXTERN int		NsfCreate(Tcl_Interp *interp, Nsf_Class *class,
+				Tcl_Obj *nameObj, int objc,
 				Tcl_Obj *CONST objv[]);
 #endif
 #ifndef Nsf_ArgumentParse_TCL_DECLARED
@@ -344,12 +348,12 @@
     struct Nsf_Object * (*nsfGetObject) (Tcl_Interp *interp, CONST char *name); /* 3 */
     struct Nsf_Class * (*nsfGetClass) (Tcl_Interp *interp, CONST char *name); /* 4 */
     int (*nsfDeleteObject) (Tcl_Interp *interp, struct Nsf_Object *object); /* 5 */
-    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *nm); /* 6 */
-    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm); /* 7 */
-    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, unsigned int flags); /* 8 */
+    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName); /* 6 */
+    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName); /* 7 */
+    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *valueObj, unsigned int flags); /* 8 */
     Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, unsigned int flags); /* 9 */
     int (*nsf_UnsetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, CONST char *name1, CONST char *name2, unsigned int flags); /* 10 */
-    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc); /* 11 */
+    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, CONST char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, CONST char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 13 */
     int (*nsfObjErrType) (Tcl_Interp *interp, CONST char *context, Tcl_Obj *value, CONST char *type, Nsf_Param CONST *pPtr); /* 14 */
@@ -359,10 +363,10 @@
     void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */
     ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */
     void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */
-    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
-    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, int objc, Tcl_Obj *CONST objv[]); /* 24 */
+    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
+    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
+    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
+    int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]); /* 24 */
     int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param CONST *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */
     void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, CONST char *fmt, ...); /* 26 */
     int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, CONST char *typeName, VOID *valuePtr); /* 27 */
Index: generic/stubs8.6/nsfDecls.h
===================================================================
diff -u -N -r37c87756387c17e0f2f43634c0d452a91f91c844 -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
+++ generic/stubs8.6/nsfDecls.h	(.../nsfDecls.h)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -75,14 +75,16 @@
 				struct Nsf_Object *object);
 /* 6 */
 EXTERN int		NsfRemoveObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, const char *nm);
+				struct Nsf_Object *object,
+				const char *methodName);
 /* 7 */
 EXTERN int		NsfRemoveClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, const char *nm);
+				struct Nsf_Class *class,
+				const char *methodName);
 /* 8 */
 EXTERN Tcl_Obj *	Nsf_ObjSetVar2(struct Nsf_Object *object,
 				Tcl_Interp *interp, Tcl_Obj *name1,
-				Tcl_Obj *name2, Tcl_Obj *value,
+				Tcl_Obj *name2, Tcl_Obj *valueObj,
 				unsigned int flags);
 /* 9 */
 EXTERN Tcl_Obj *	Nsf_ObjGetVar2(struct Nsf_Object *object,
@@ -94,7 +96,7 @@
 				const char *name2, unsigned int flags);
 /* 11 */
 EXTERN void		NsfDStringVPrintf(Tcl_DString *dsPtr,
-				const char *fmt, va_list apSrc);
+				const char *fmt, va_list argPtr);
 /* 12 */
 EXTERN int		NsfPrintError(Tcl_Interp *interp, const char *fmt, ...);
 /* 13 */
@@ -123,22 +125,24 @@
 				Nsf_Object *object);
 /* 21 */
 EXTERN int		NsfCallMethodWithArgs(Tcl_Interp *interp,
-				Nsf_Object *object, Tcl_Obj *method,
-				Tcl_Obj *arg, int objc,
+				Nsf_Object *object, Tcl_Obj *methodObj,
+				Tcl_Obj *arg1, int givenObjc,
 				Tcl_Obj *CONST objv[], unsigned int flags);
 /* 22 */
 EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Object *object,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 /* 23 */
 EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Class *class,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 /* 24 */
-EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
-				Tcl_Obj *name, int objc,
+EXTERN int		NsfCreate(Tcl_Interp *interp, Nsf_Class *class,
+				Tcl_Obj *nameObj, int objc,
 				Tcl_Obj *CONST objv[]);
 /* 25 */
 EXTERN int		Nsf_ArgumentParse(Tcl_Interp *interp, int objc,
@@ -221,12 +225,12 @@
     struct Nsf_Object * (*nsfGetObject) (Tcl_Interp *interp, const char *name); /* 3 */
     struct Nsf_Class * (*nsfGetClass) (Tcl_Interp *interp, const char *name); /* 4 */
     int (*nsfDeleteObject) (Tcl_Interp *interp, struct Nsf_Object *object); /* 5 */
-    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *nm); /* 6 */
-    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, const char *nm); /* 7 */
-    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, unsigned int flags); /* 8 */
+    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName); /* 6 */
+    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName); /* 7 */
+    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *valueObj, unsigned int flags); /* 8 */
     Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, unsigned int flags); /* 9 */
     int (*nsf_UnsetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, const char *name1, const char *name2, unsigned int flags); /* 10 */
-    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list apSrc); /* 11 */
+    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */
     int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *pPtr); /* 14 */
@@ -236,10 +240,10 @@
     void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */
     ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */
     void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */
-    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
-    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, int objc, Tcl_Obj *CONST objv[]); /* 24 */
+    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
+    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
+    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
+    int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]); /* 24 */
     int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param CONST *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */
     void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, const char *fmt, ...); /* 26 */
     int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr); /* 27 */
Index: generic/stubs8.7/nsfDecls.h
===================================================================
diff -u -N -r37c87756387c17e0f2f43634c0d452a91f91c844 -r866971d828a2ed5fdb8da757e94401f919bd3a8c
--- generic/stubs8.7/nsfDecls.h	(.../nsfDecls.h)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
+++ generic/stubs8.7/nsfDecls.h	(.../nsfDecls.h)	(revision 866971d828a2ed5fdb8da757e94401f919bd3a8c)
@@ -75,14 +75,16 @@
 				struct Nsf_Object *object);
 /* 6 */
 EXTERN int		NsfRemoveObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, const char *nm);
+				struct Nsf_Object *object,
+				const char *methodName);
 /* 7 */
 EXTERN int		NsfRemoveClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, const char *nm);
+				struct Nsf_Class *class,
+				const char *methodName);
 /* 8 */
 EXTERN Tcl_Obj *	Nsf_ObjSetVar2(struct Nsf_Object *object,
 				Tcl_Interp *interp, Tcl_Obj *name1,
-				Tcl_Obj *name2, Tcl_Obj *value,
+				Tcl_Obj *name2, Tcl_Obj *valueObj,
 				unsigned int flags);
 /* 9 */
 EXTERN Tcl_Obj *	Nsf_ObjGetVar2(struct Nsf_Object *object,
@@ -94,7 +96,7 @@
 				const char *name2, unsigned int flags);
 /* 11 */
 EXTERN void		NsfDStringVPrintf(Tcl_DString *dsPtr,
-				const char *fmt, va_list apSrc);
+				const char *fmt, va_list argPtr);
 /* 12 */
 EXTERN int		NsfPrintError(Tcl_Interp *interp, const char *fmt, ...);
 /* 13 */
@@ -123,22 +125,24 @@
 				Nsf_Object *object);
 /* 21 */
 EXTERN int		NsfCallMethodWithArgs(Tcl_Interp *interp,
-				Nsf_Object *object, Tcl_Obj *method,
-				Tcl_Obj *arg, int objc,
+				Nsf_Object *object, Tcl_Obj *methodObj,
+				Tcl_Obj *arg1, int givenObjc,
 				Tcl_Obj *CONST objv[], unsigned int flags);
 /* 22 */
 EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *object, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Object *object,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 /* 23 */
 EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, unsigned int flags);
+				struct Nsf_Class *class,
+				CONST char *methodName, Tcl_ObjCmdProc *proc,
+				ClientData clientData, Tcl_CmdDeleteProc *dp,
+				unsigned int flags);
 /* 24 */
-EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
-				Tcl_Obj *name, int objc,
+EXTERN int		NsfCreate(Tcl_Interp *interp, Nsf_Class *class,
+				Tcl_Obj *nameObj, int objc,
 				Tcl_Obj *CONST objv[]);
 /* 25 */
 EXTERN int		Nsf_ArgumentParse(Tcl_Interp *interp, int objc,
@@ -221,12 +225,12 @@
     struct Nsf_Object * (*nsfGetObject) (Tcl_Interp *interp, const char *name); /* 3 */
     struct Nsf_Class * (*nsfGetClass) (Tcl_Interp *interp, const char *name); /* 4 */
     int (*nsfDeleteObject) (Tcl_Interp *interp, struct Nsf_Object *object); /* 5 */
-    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *nm); /* 6 */
-    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, const char *nm); /* 7 */
-    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, unsigned int flags); /* 8 */
+    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, const char *methodName); /* 6 */
+    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, const char *methodName); /* 7 */
+    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *valueObj, unsigned int flags); /* 8 */
     Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, unsigned int flags); /* 9 */
     int (*nsf_UnsetVar2) (struct Nsf_Object *object, Tcl_Interp *interp, const char *name1, const char *name2, unsigned int flags); /* 10 */
-    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list apSrc); /* 11 */
+    void (*nsfDStringVPrintf) (Tcl_DString *dsPtr, const char *fmt, va_list argPtr); /* 11 */
     int (*nsfPrintError) (Tcl_Interp *interp, const char *fmt, ...); /* 12 */
     int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, const char *procName); /* 13 */
     int (*nsfObjErrType) (Tcl_Interp *interp, const char *context, Tcl_Obj *value, const char *type, Nsf_Param const *pPtr); /* 14 */
@@ -236,10 +240,10 @@
     void (*nsfSetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl, ClientData data); /* 18 */
     ClientData (*nsfGetClassClientData) (Tcl_Interp *interp, Nsf_Class *cl); /* 19 */
     void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *object); /* 20 */
-    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
-    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, int objc, Tcl_Obj *CONST objv[]); /* 24 */
+    int (*nsfCallMethodWithArgs) (Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj, Tcl_Obj *arg1, int givenObjc, Tcl_Obj *CONST objv[], unsigned int flags); /* 21 */
+    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *object, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 22 */
+    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *class, CONST char *methodName, Tcl_ObjCmdProc *proc, ClientData clientData, Tcl_CmdDeleteProc *dp, unsigned int flags); /* 23 */
+    int (*nsfCreate) (Tcl_Interp *interp, Nsf_Class *class, Tcl_Obj *nameObj, int objc, Tcl_Obj *CONST objv[]); /* 24 */
     int (*nsf_ArgumentParse) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Nsf_Object *object, Tcl_Obj *procNameObj, Nsf_Param CONST *paramPtr, int nrParams, int serial, unsigned int processFlags, Nsf_ParseContext *pcPtr); /* 25 */
     void (*nsfLog) (Tcl_Interp *interp, int requiredLevel, const char *fmt, ...); /* 26 */
     int (*nsf_PointerAdd) (Tcl_Interp *interp, char *buffer, size_t size, const char *typeName, void *valuePtr); /* 27 */