Index: generic/xotcl.c
===================================================================
diff -u -r2068ba7298e4ce370b36bdbda513172177f3ee52 -r2b53035875b4732d2ce3c161004eae6ccc5de104
--- generic/xotcl.c	(.../xotcl.c)	(revision 2068ba7298e4ce370b36bdbda513172177f3ee52)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 2b53035875b4732d2ce3c161004eae6ccc5de104)
@@ -64,14 +64,14 @@
  */
 
 #ifdef USE_TCL_STUBS
-# define XOTcl_ExprObjCmd(cd, in, objc, objv)      \
+# define XOTcl_ExprObjCmd(cd, interp, objc, objv)      \
 	XOTclCallCommand(interp, XOTE_EXPR, objc, objv)
-# define XOTcl_SubstObjCmd(cd, in, objc, objv)     \
+# define XOTcl_SubstObjCmd(cd, interp, objc, objv)     \
 	XOTclCallCommand(interp, XOTE_SUBST, objc, objv)
 #else
-# define XOTcl_ExprObjCmd(cd, in, objc, objv)      \
+# define XOTcl_ExprObjCmd(cd, interp, objc, objv)      \
 	Tcl_ExprObjCmd(cd, interp, objc, objv)
-# define XOTcl_SubstObjCmd(cd, in, objc, objv)     \
+# define XOTcl_SubstObjCmd(cd, interp, objc, objv)     \
 	Tcl_SubstObjCmd(cd, interp, objc, objv)
 #endif
 
@@ -82,7 +82,7 @@
 static void DupXOTclObjectInternalRep(Tcl_Obj *src, Tcl_Obj *cpy);
 
 static Tcl_Obj*NameInNamespaceObj(Tcl_Interp *interp, char *name, Tcl_Namespace *ns);
-static Tcl_Namespace *callingNameSpace(Tcl_Interp *in);
+static Tcl_Namespace *callingNameSpace(Tcl_Interp *interp);
 XOTCLINLINE static Tcl_Command NSFindCommand(Tcl_Interp *interp, char *name, Tcl_Namespace *ns);
 #ifdef EXPERIMENTAL_CMD_RESOLVER
 static int NSisXOTclNamespace(Tcl_Namespace *nsPtr);
@@ -155,7 +155,7 @@
 static int XOTclObjConvertObject(Tcl_Interp *interp, register Tcl_Obj *objPtr, XOTclObject **obj);
 static XOTclObject *XOTclpGetObject(Tcl_Interp *interp, char *name);
 static XOTclClass *XOTclpGetClass(Tcl_Interp *interp, char *name);
-static XOTclCallStackContent *CallStackGetFrame(Tcl_Interp *in);
+static XOTclCallStackContent *CallStackGetFrame(Tcl_Interp *interp);
 #if !defined(NDEBUG)
 static void checkAllInstances(Tcl_Interp *interp, XOTclClass *startCl, int lvl);
 #endif