Index: generic/xotclInt.h
===================================================================
diff -u -rfb73930aa9ecf6ce966e512e6f899acb5784ea8c -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a
--- generic/xotclInt.h	(.../xotclInt.h)	(revision fb73930aa9ecf6ce966e512e6f899acb5784ea8c)
+++ generic/xotclInt.h	(.../xotclInt.h)	(revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a)
@@ -666,7 +666,7 @@
   XOTclStringIncrStruct iss;
   Proc fakeProc;
   Tcl_Namespace *fakeNS;
-  XotclStubs *xotclStubs;
+  NxStubs *nxStubs;
   Tcl_CallFrame *varFramePtr;
   Tcl_Command cmdPtr; /* used for ACTIVE_MIXIN */
   Tcl_Command colonCmd;
@@ -701,7 +701,7 @@
  *
  */
 
-#include "xotclIntDecls.h"
+#include "nxIntDecls.h"
 
 /*
  * Profiling functions