Index: generic/nsf.c
===================================================================
diff -u -rc5d841d4cd001b85e95e01202b4fc0afe75df6a8 -r353fe0c41d46ad9d3475bd4b8ea16aea6aae0419
--- generic/nsf.c	(.../nsf.c)	(revision c5d841d4cd001b85e95e01202b4fc0afe75df6a8)
+++ generic/nsf.c	(.../nsf.c)	(revision 353fe0c41d46ad9d3475bd4b8ea16aea6aae0419)
@@ -10047,10 +10047,10 @@
         }
 
       } else if (!TclIsVarUndefined(varPtr)) {
-        return NsfVarErrMsg(interp, "variable '", varNameString,
+        return NsfVarErrMsg(interp, "varname '", varNameString,
                               "' exists already", (char *) NULL);
       } else if (TclIsVarTraced(varPtr)) {
-        return NsfVarErrMsg(interp, "variable '", varNameString,
+        return NsfVarErrMsg(interp, "varname '", varNameString,
                               "' has traces: can't use for instvar", (char *) NULL);
       }
     }
@@ -12734,7 +12734,7 @@
 /*
 nsfCmd existsvar NsfExistsVarCmd {
   {-argName "object" -required 1 -type object}
-  {-argName "var" -required 1}
+  {-argName "varname" -required 1}
 }
 */
 static int
@@ -13917,18 +13917,18 @@
 /*
 nsfCmd setvar NsfSetVarCmd {
   {-argName "object" -required 1 -type object}
-  {-argName "variable" -required 1 -type tclobj}
+  {-argName "varname" -required 1 -type tclobj}
   {-argName "value" -required 0 -type tclobj}
 }
 */
 static int
-NsfSetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *variable, Tcl_Obj *valueObj) {
+NsfSetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *varname, Tcl_Obj *valueObj) {
 
-  if (CheckVarName(interp, ObjStr(variable)) != TCL_OK) {
+  if (CheckVarName(interp, ObjStr(varname)) != TCL_OK) {
     return TCL_ERROR;
   }
 
-  return SetInstVar(interp, object, variable, valueObj);
+  return SetInstVar(interp, object, varname, valueObj);
 }
 
 /*