Index: generic/xotclInt.h
===================================================================
diff -u -rad43de1007d040a9860eac2445a8c7781dcb4d06 -r54346e996575a3c1295e4a36c07fd490e63bc5a6
--- generic/xotclInt.h	(.../xotclInt.h)	(revision ad43de1007d040a9860eac2445a8c7781dcb4d06)
+++ generic/xotclInt.h	(.../xotclInt.h)	(revision 54346e996575a3c1295e4a36c07fd490e63bc5a6)
@@ -57,7 +57,7 @@
         Tcl_InitHashTable(&xotclMemCount, TCL_STRING_KEYS); \
         xotclMemCountInterpCounter = 1; \
       }
-#  define MEM_COUNT_DUMP() XOTclMemCountDump(in)
+#  define MEM_COUNT_DUMP() XOTclMemCountDump(interp)
 #  define MEM_COUNT_OPEN_FRAME() 
 /*if (obj->varTable) noTableBefore = 0*/
 #  define MEM_COUNT_CLOSE_FRAME() 
@@ -76,9 +76,9 @@
 #define DSTRING_FREE(D) Tcl_DStringFree(D); MEM_COUNT_FREE("DString",D)
 
 #if USE_ASSOC_DATA
-# define RUNTIME_STATE(in) ((XOTclRuntimeState*)Tcl_GetAssocData((in), "XOTclRuntimeState", NULL))
+# define RUNTIME_STATE(interp) ((XOTclRuntimeState*)Tcl_GetAssocData((interp), "XOTclRuntimeState", NULL))
 #else
-# define RUNTIME_STATE(in) ((XOTclRuntimeState*)((Interp*) in)->globalNsPtr->clientData)
+# define RUNTIME_STATE(interp) ((XOTclRuntimeState*)((Interp*)interp)->globalNsPtr->clientData)
 #endif
 
 
@@ -252,18 +252,18 @@
 #endif
 
 #ifdef V81
-# define EvalObj(in,cmd) Tcl_EvalObj(in,cmd,0)
+# define EvalObj(interp,cmd) Tcl_EvalObj(interp, cmd, 0)
 # define TclIsVarArgument(args) (args->isArg)
-# define Tcl_ObjSetVar2(in,p1,p2,newval,flags) \
-	Tcl_SetObjVar2(in,ObjStr(p1),p2,newval,flags)
-#define Tcl_ObjGetVar2(in,name1,name2,flgs) \
-  Tcl_GetObjVar2(in, ObjStr(name1), \
+# define Tcl_ObjSetVar2(interp,p1,p2,newval,flags) \
+	Tcl_SetObjVar2(interp,ObjStr(p1),p2,newval,flags)
+#define Tcl_ObjGetVar2(interp,name1,name2,flgs) \
+  Tcl_GetObjVar2(interp, ObjStr(name1), \
 		((name2==NULL) ? (char*)NULL : ObjStr(name2)), flgs)
 #else
 # if defined(PRE83)
-#  define EvalObj(in,cmd) Tcl_EvalObj(in,cmd)
+#  define EvalObj(interp, cmd) Tcl_EvalObj(interp,cmd)
 # else
-#  define EvalObj(in,cmd) Tcl_EvalObjEx(in,cmd,0)
+#  define EvalObj(interp, cmd) Tcl_EvalObjEx(interp,cmd,0)
 # endif
 # if defined(PRE81) && TCL_RELEASE_SERIAL<3
 #  define TclIsVarArgument(args) (args->isArg)
@@ -272,23 +272,23 @@
 
 #if 0
 #define XOTcl_FrameDecls CallFrame *oldFramePtr = 0, frame, *newFramePtr = &frame
-#define XOTcl_PushFrame(in,obj) \
+#define XOTcl_PushFrame(interp, obj) \
      memset(newFramePtr, 0, sizeof(CallFrame)); \
-     oldFramePtr = ((Interp *)in)->varFramePtr; \
+     oldFramePtr = ((Interp *)interp)->varFramePtr; \
      if ((obj)->nsPtr) {				     \
        newFramePtr->nsPtr = (Namespace*) (obj)->nsPtr;	     \
      } else { \
-       newFramePtr->nsPtr = (Namespace*) RUNTIME_STATE(in)->fakeNS; \
+       newFramePtr->nsPtr = (Namespace*) RUNTIME_STATE(interp)->fakeNS; \
        newFramePtr->isProcCallFrame = 1; \
-       newFramePtr->procPtr = &RUNTIME_STATE(in)->fakeProc; \
+       newFramePtr->procPtr = &RUNTIME_STATE(interp)->fakeProc; \
        newFramePtr->varTablePtr = (obj)->varTable;	    \
      } \
-     ((Interp *)in)->varFramePtr = newFramePtr; \
+     ((Interp *)interp)->varFramePtr = newFramePtr; \
      MEM_COUNT_OPEN_FRAME()
-#define XOTcl_PopFrame(in,obj) \
+#define XOTcl_PopFrame(interp, obj) \
   if (!(obj)->nsPtr && (obj)->varTable == 0)	 \
       (obj)->varTable = newFramePtr->varTablePtr;	 \
-     ((Interp *)in)->varFramePtr = oldFramePtr; \
+     ((Interp *)interp)->varFramePtr = oldFramePtr; \
      MEM_COUNT_CLOSE_FRAME()
 
 #else
@@ -388,7 +388,7 @@
   CHECK_ALL   = CHECK_INVAR   + CHECK_PRE + CHECK_POST
 } CheckOptions;
 
-void XOTclAssertionRename(Tcl_Interp* in, Tcl_Command cmd, 
+void XOTclAssertionRename(Tcl_Interp* interp, Tcl_Command cmd, 
 			  XOTclAssertionStore *as, 
 			  char *oldSimpleCmdName, char *newName);
 /*
@@ -565,7 +565,7 @@
 };
 #endif
 
-#define XOTclGlobalObjects RUNTIME_STATE(in)->methodObjNames
+#define XOTclGlobalObjects RUNTIME_STATE(interp)->methodObjNames
 
 /* XOTcl ShadowTclCommands */
 typedef struct XOTclShadowTclCommandInfo {
@@ -574,9 +574,9 @@
 } XOTclShadowTclCommandInfo;
 typedef enum {SHADOW_LOAD=1, SHADOW_UNLOAD=0, SHADOW_REFETCH=2} XOTclShadowOperations;
 
-int XOTclCallCommand(Tcl_Interp* in, XOTclGlobalNames name,
+int XOTclCallCommand(Tcl_Interp* interp, XOTclGlobalNames name,
 		     int objc, Tcl_Obj *CONST objv[]);
-int XOTclShadowTclCommands(Tcl_Interp* in, XOTclShadowOperations load);
+int XOTclShadowTclCommands(Tcl_Interp* interp, XOTclShadowOperations load);
 
 
 /*
@@ -690,16 +690,16 @@
 XOTclProfileFillTable(Tcl_HashTable* table, Tcl_DString* key,
 		 double totalMicroSec);
 extern void
-XOTclProfileEvaluateData(Tcl_Interp* in, long int startSec, long int startUsec,
+XOTclProfileEvaluateData(Tcl_Interp* interp, long int startSec, long int startUsec,
 		    XOTclObject* obj, XOTclClass *cl, char *methodName);
 extern void
 XOTclProfilePrintTable(Tcl_HashTable* table);
 
 extern void
-XOTclProfilePrintData(Tcl_Interp* in);
+XOTclProfilePrintData(Tcl_Interp* interp);
 
 extern void 
-XOTclProfileInit(Tcl_Interp* in);
+XOTclProfileInit(Tcl_Interp* interp);
 #endif
 
 /*
@@ -719,7 +719,7 @@
 extern void
 XOTclMetaDataInit(XOTclObject* obj);
 extern int
-XOTclOMetaDataMethod (ClientData cd, Tcl_Interp* in, 
+XOTclOMetaDataMethod (ClientData cd, Tcl_Interp* interp, 
 		      int objc, Tcl_Obj *objv[]);
 #endif /* XOTCL_METADATA */
 
@@ -744,19 +744,19 @@
 Tcl_ObjCmdProc XOTclInitProcNSCmd, XOTclSelfDispatchCmd, 
   XOTclNextObjCmd, XOTclGetSelfObjCmd;
 
-int XOTclDirectSelfDispatch(ClientData cd, Tcl_Interp* in,
+int XOTclDirectSelfDispatch(ClientData cd, Tcl_Interp* interp,
 		     int objc, Tcl_Obj *CONST objv[]);
 #endif
 
 int 
-XOTclObjDispatch(ClientData cd, Tcl_Interp* in,
+XOTclObjDispatch(ClientData cd, Tcl_Interp* interp,
 		 int objc, Tcl_Obj *CONST objv[]);
 
 XOTclCallStackContent *
-XOTclCallStackFindActiveFrame(Tcl_Interp* in, int offset);
+XOTclCallStackFindActiveFrame(Tcl_Interp* interp, int offset);
 
 XOTclCallStackContent *
-XOTclCallStackFindLastInvocation(Tcl_Interp* in, int offset);
+XOTclCallStackFindLastInvocation(Tcl_Interp* interp, int offset);
 
 /* functions from xotclUtil.c */
 char *XOTcl_ltoa(char *buf, long i, int *len);