Index: generic/xotclDecls.h
===================================================================
diff -u -r46968ac6fcde3c5046aa0ede9a0e4c349e868de4 -r81c800c8b9cb42ef6743d9b80ac2be5ca211a69a
--- generic/xotclDecls.h	(.../xotclDecls.h)	(revision 46968ac6fcde3c5046aa0ede9a0e4c349e868de4)
+++ generic/xotclDecls.h	(.../xotclDecls.h)	(revision 81c800c8b9cb42ef6743d9b80ac2be5ca211a69a)
@@ -25,10 +25,10 @@
  * Exported function declarations:
  */
 
-#ifndef Xotcl_Init_TCL_DECLARED
-#define Xotcl_Init_TCL_DECLARED
+#ifndef Next_Init_TCL_DECLARED
+#define Next_Init_TCL_DECLARED
 /* 0 */
-EXTERN int		Xotcl_Init (Tcl_Interp * interp);
+EXTERN int		Next_Init (Tcl_Interp * interp);
 #endif
 /* Slot 1 is reserved */
 #ifndef XOTclIsClass_TCL_DECLARED
@@ -241,7 +241,7 @@
     int magic;
     struct XotclStubHooks *hooks;
 
-    int (*xotcl_Init) (Tcl_Interp * interp); /* 0 */
+    int (*next_Init) (Tcl_Interp * interp); /* 0 */
     void *reserved1;
     struct XOTcl_Class * (*xOTclIsClass) (Tcl_Interp * interp, ClientData cd); /* 2 */
     void *reserved3;
@@ -301,9 +301,9 @@
  * Inline function declarations:
  */
 
-#ifndef Xotcl_Init
-#define Xotcl_Init \
-	(xotclStubsPtr->xotcl_Init) /* 0 */
+#ifndef Next_Init
+#define Next_Init \
+	(xotclStubsPtr->next_Init) /* 0 */
 #endif
 /* Slot 1 is reserved */
 #ifndef XOTclIsClass