Index: generic/xotcl.c
===================================================================
diff -u -r35c67391973a07983d0b0dfe70706e6a69fbdbfc -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a
--- generic/xotcl.c	(.../xotcl.c)	(revision 35c67391973a07983d0b0dfe70706e6a69fbdbfc)
+++ generic/xotcl.c	(.../xotcl.c)	(revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a)
@@ -47,9 +47,9 @@
 
 #ifdef COMPILE_XOTCL_STUBS
 # if defined(PRE86)
-extern XotclStubs xotclStubs;
+extern NxStubs nxStubs;
 # else
-MODULE_SCOPE const XotclStubs * const xotclConstStubPtr;
+MODULE_SCOPE const NxStubs * const nxConstStubPtr;
 # endif
 #endif
 
@@ -11135,14 +11135,14 @@
 
   if (isCreateString(name)) {
     /*
-     * The command was an interp create, so perform an Next_Init() on
+     * The command was an interp create, so perform an Nx_Init() on
      * the new interpreter
      */
     slave = Tcl_GetSlave(interp, ObjStr(objv[2]));
     if (!slave) {
       return XOTclVarErrMsg(interp, "Creation of slave interpreter failed", (char *) NULL);
     }
-    if (Next_Init(slave) == TCL_ERROR) {
+    if (Nx_Init(slave) == TCL_ERROR) {
       return TCL_ERROR;
     }
 #ifdef XOTCL_MEM_COUNT
@@ -14516,7 +14516,7 @@
  */
 
 extern int
-Next_Init(Tcl_Interp *interp) {
+Nx_Init(Tcl_Interp *interp) {
   ClientData runtimeState;
   int result, i;
 #ifdef XOTCL_BYTECODE
@@ -14643,8 +14643,8 @@
   XOTclBytecodeInit();
 #endif
 
-  Tcl_SetVar(interp, "::nx::core::version", XOTCLVERSION, TCL_GLOBAL_ONLY);
-  Tcl_SetVar(interp, "::nx::core::patchlevel", XOTCLPATCHLEVEL, TCL_GLOBAL_ONLY);
+  Tcl_SetVar(interp, "::nx::core::version", NXVERSION, TCL_GLOBAL_ONLY);
+  Tcl_SetVar(interp, "::nx::core::patchlevel", NXPATCHLEVEL, TCL_GLOBAL_ONLY);
 
   Tcl_AddInterpResolvers(interp,"nxt", 
                          (Tcl_ResolveCmdProc*)InterpColonCmdResolver,
@@ -14701,6 +14701,6 @@
 extern int
 Next_SafeInit(Tcl_Interp *interp) {
   /*** dummy for now **/
-  return Next_Init(interp);
+  return Nx_Init(interp);
 }