Index: generic/nsfDecls.h
===================================================================
diff -u -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20 -r8eddf67371ec031084a6ef98fdec21e38dff85ff
--- generic/nsfDecls.h	(.../nsfDecls.h)	(revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20)
+++ generic/nsfDecls.h	(.../nsfDecls.h)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
@@ -16,7 +16,7 @@
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
- * in the xotcl.decls script.
+ * in the nsf.decls script.
  */
 
 /* !BEGIN!: Do not edit below this line. */
@@ -31,202 +31,202 @@
 EXTERN int		Nsf_Init(Tcl_Interp *interp);
 #endif
 /* Slot 1 is reserved */
-#ifndef XOTclIsClass_TCL_DECLARED
-#define XOTclIsClass_TCL_DECLARED
+#ifndef NsfIsClass_TCL_DECLARED
+#define NsfIsClass_TCL_DECLARED
 /* 2 */
-EXTERN struct XOTcl_Class * XOTclIsClass(Tcl_Interp *interp, ClientData cd);
+EXTERN struct Nsf_Class * NsfIsClass(Tcl_Interp *interp, ClientData cd);
 #endif
 /* Slot 3 is reserved */
-#ifndef XOTclGetObject_TCL_DECLARED
-#define XOTclGetObject_TCL_DECLARED
+#ifndef NsfGetObject_TCL_DECLARED
+#define NsfGetObject_TCL_DECLARED
 /* 4 */
-EXTERN struct XOTcl_Object * XOTclGetObject(Tcl_Interp *interp,
+EXTERN struct Nsf_Object * NsfGetObject(Tcl_Interp *interp,
 				CONST char *name);
 #endif
-#ifndef XOTclGetClass_TCL_DECLARED
-#define XOTclGetClass_TCL_DECLARED
+#ifndef NsfGetClass_TCL_DECLARED
+#define NsfGetClass_TCL_DECLARED
 /* 5 */
-EXTERN struct XOTcl_Class * XOTclGetClass(Tcl_Interp *interp,
+EXTERN struct Nsf_Class * NsfGetClass(Tcl_Interp *interp,
 				CONST char *name);
 #endif
-#ifndef XOTclCreateObject_TCL_DECLARED
-#define XOTclCreateObject_TCL_DECLARED
+#ifndef NsfCreateObject_TCL_DECLARED
+#define NsfCreateObject_TCL_DECLARED
 /* 6 */
-EXTERN int		XOTclCreateObject(Tcl_Interp *interp, Tcl_Obj *name,
-				struct XOTcl_Class *cl);
+EXTERN int		NsfCreateObject(Tcl_Interp *interp, Tcl_Obj *name,
+				struct Nsf_Class *cl);
 #endif
 /* Slot 7 is reserved */
 /* Slot 8 is reserved */
-#ifndef XOTclDeleteObject_TCL_DECLARED
-#define XOTclDeleteObject_TCL_DECLARED
+#ifndef NsfDeleteObject_TCL_DECLARED
+#define NsfDeleteObject_TCL_DECLARED
 /* 9 */
-EXTERN int		XOTclDeleteObject(Tcl_Interp *interp,
-				struct XOTcl_Object *obj);
+EXTERN int		NsfDeleteObject(Tcl_Interp *interp,
+				struct Nsf_Object *obj);
 #endif
 /* Slot 10 is reserved */
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
-#ifndef XOTclRemoveObjectMethod_TCL_DECLARED
-#define XOTclRemoveObjectMethod_TCL_DECLARED
+#ifndef NsfRemoveObjectMethod_TCL_DECLARED
+#define NsfRemoveObjectMethod_TCL_DECLARED
 /* 13 */
-EXTERN int		XOTclRemoveObjectMethod(Tcl_Interp *interp,
-				struct XOTcl_Object *obj, CONST char *nm);
+EXTERN int		NsfRemoveObjectMethod(Tcl_Interp *interp,
+				struct Nsf_Object *obj, CONST char *nm);
 #endif
-#ifndef XOTclRemoveClassMethod_TCL_DECLARED
-#define XOTclRemoveClassMethod_TCL_DECLARED
+#ifndef NsfRemoveClassMethod_TCL_DECLARED
+#define NsfRemoveClassMethod_TCL_DECLARED
 /* 14 */
-EXTERN int		XOTclRemoveClassMethod(Tcl_Interp *interp,
-				struct XOTcl_Class *cl, CONST char *nm);
+EXTERN int		NsfRemoveClassMethod(Tcl_Interp *interp,
+				struct Nsf_Class *cl, CONST char *nm);
 #endif
-#ifndef XOTclOSetInstVar_TCL_DECLARED
-#define XOTclOSetInstVar_TCL_DECLARED
+#ifndef NsfOSetInstVar_TCL_DECLARED
+#define NsfOSetInstVar_TCL_DECLARED
 /* 15 */
-EXTERN Tcl_Obj *	XOTclOSetInstVar(struct XOTcl_Object *obj,
+EXTERN Tcl_Obj *	NsfOSetInstVar(struct Nsf_Object *obj,
 				Tcl_Interp *interp, Tcl_Obj *name,
 				Tcl_Obj *value, int flgs);
 #endif
-#ifndef XOTclOGetInstVar_TCL_DECLARED
-#define XOTclOGetInstVar_TCL_DECLARED
+#ifndef NsfOGetInstVar_TCL_DECLARED
+#define NsfOGetInstVar_TCL_DECLARED
 /* 16 */
-EXTERN Tcl_Obj *	XOTclOGetInstVar(struct XOTcl_Object *obj,
+EXTERN Tcl_Obj *	NsfOGetInstVar(struct Nsf_Object *obj,
 				Tcl_Interp *interp, Tcl_Obj *name, int flgs);
 #endif
 /* Slot 17 is reserved */
 /* Slot 18 is reserved */
-#ifndef XOTcl_ObjSetVar2_TCL_DECLARED
-#define XOTcl_ObjSetVar2_TCL_DECLARED
+#ifndef Nsf_ObjSetVar2_TCL_DECLARED
+#define Nsf_ObjSetVar2_TCL_DECLARED
 /* 19 */
-EXTERN Tcl_Obj *	XOTcl_ObjSetVar2(struct XOTcl_Object *obj,
+EXTERN Tcl_Obj *	Nsf_ObjSetVar2(struct Nsf_Object *obj,
 				Tcl_Interp *interp, Tcl_Obj *name1,
 				Tcl_Obj *name2, Tcl_Obj *value, int flgs);
 #endif
-#ifndef XOTcl_ObjGetVar2_TCL_DECLARED
-#define XOTcl_ObjGetVar2_TCL_DECLARED
+#ifndef Nsf_ObjGetVar2_TCL_DECLARED
+#define Nsf_ObjGetVar2_TCL_DECLARED
 /* 20 */
-EXTERN Tcl_Obj *	XOTcl_ObjGetVar2(struct XOTcl_Object *obj,
+EXTERN Tcl_Obj *	Nsf_ObjGetVar2(struct Nsf_Object *obj,
 				Tcl_Interp *interp, Tcl_Obj *name1,
 				Tcl_Obj *name2, int flgs);
 #endif
-#ifndef XOTclUnsetInstVar2_TCL_DECLARED
-#define XOTclUnsetInstVar2_TCL_DECLARED
+#ifndef NsfUnsetInstVar2_TCL_DECLARED
+#define NsfUnsetInstVar2_TCL_DECLARED
 /* 21 */
-EXTERN int		XOTclUnsetInstVar2(struct XOTcl_Object *obj,
+EXTERN int		NsfUnsetInstVar2(struct Nsf_Object *obj,
 				Tcl_Interp *interp, CONST char *name1,
 				CONST char *name2, int flgs);
 #endif
 /* Slot 22 is reserved */
-#ifndef XOTclErrMsg_TCL_DECLARED
-#define XOTclErrMsg_TCL_DECLARED
+#ifndef NsfErrMsg_TCL_DECLARED
+#define NsfErrMsg_TCL_DECLARED
 /* 23 */
-EXTERN int		XOTclErrMsg(Tcl_Interp *interp, char *msg,
+EXTERN int		NsfErrMsg(Tcl_Interp *interp, char *msg,
 				Tcl_FreeProc *type);
 #endif
-#ifndef XOTclVarErrMsg_TCL_DECLARED
-#define XOTclVarErrMsg_TCL_DECLARED
+#ifndef NsfVarErrMsg_TCL_DECLARED
+#define NsfVarErrMsg_TCL_DECLARED
 /* 24 */
-EXTERN int		XOTclVarErrMsg(Tcl_Interp *interp, ...);
+EXTERN int		NsfVarErrMsg(Tcl_Interp *interp, ...);
 #endif
-#ifndef XOTclErrInProc_TCL_DECLARED
-#define XOTclErrInProc_TCL_DECLARED
+#ifndef NsfErrInProc_TCL_DECLARED
+#define NsfErrInProc_TCL_DECLARED
 /* 25 */
-EXTERN int		XOTclErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
+EXTERN int		NsfErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
 				Tcl_Obj *clName, CONST char *procName);
 #endif
 /* Slot 26 is reserved */
-#ifndef XOTclErrBadVal__TCL_DECLARED
-#define XOTclErrBadVal__TCL_DECLARED
+#ifndef NsfErrBadVal__TCL_DECLARED
+#define NsfErrBadVal__TCL_DECLARED
 /* 27 */
-EXTERN int		XOTclErrBadVal_(Tcl_Interp *interp, char *expected,
+EXTERN int		NsfErrBadVal_(Tcl_Interp *interp, char *expected,
 				char *value);
 #endif
-#ifndef XOTclObjErrType_TCL_DECLARED
-#define XOTclObjErrType_TCL_DECLARED
+#ifndef NsfObjErrType_TCL_DECLARED
+#define NsfObjErrType_TCL_DECLARED
 /* 28 */
-EXTERN int		XOTclObjErrType(Tcl_Interp *interp, Tcl_Obj *nm,
+EXTERN int		NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm,
 				char *wt, char *parameterName);
 #endif
-#ifndef XOTclStackDump_TCL_DECLARED
-#define XOTclStackDump_TCL_DECLARED
+#ifndef NsfStackDump_TCL_DECLARED
+#define NsfStackDump_TCL_DECLARED
 /* 29 */
-EXTERN void		XOTclStackDump(Tcl_Interp *interp);
+EXTERN void		NsfStackDump(Tcl_Interp *interp);
 #endif
 /* Slot 30 is reserved */
 /* Slot 31 is reserved */
-#ifndef XOTclSetObjClientData_TCL_DECLARED
-#define XOTclSetObjClientData_TCL_DECLARED
+#ifndef NsfSetObjClientData_TCL_DECLARED
+#define NsfSetObjClientData_TCL_DECLARED
 /* 32 */
-EXTERN void		XOTclSetObjClientData(XOTcl_Object *obj,
+EXTERN void		NsfSetObjClientData(Nsf_Object *obj,
 				ClientData data);
 #endif
-#ifndef XOTclGetObjClientData_TCL_DECLARED
-#define XOTclGetObjClientData_TCL_DECLARED
+#ifndef NsfGetObjClientData_TCL_DECLARED
+#define NsfGetObjClientData_TCL_DECLARED
 /* 33 */
-EXTERN ClientData	XOTclGetObjClientData(XOTcl_Object *obj);
+EXTERN ClientData	NsfGetObjClientData(Nsf_Object *obj);
 #endif
-#ifndef XOTclSetClassClientData_TCL_DECLARED
-#define XOTclSetClassClientData_TCL_DECLARED
+#ifndef NsfSetClassClientData_TCL_DECLARED
+#define NsfSetClassClientData_TCL_DECLARED
 /* 34 */
-EXTERN void		XOTclSetClassClientData(XOTcl_Class *cl,
+EXTERN void		NsfSetClassClientData(Nsf_Class *cl,
 				ClientData data);
 #endif
-#ifndef XOTclGetClassClientData_TCL_DECLARED
-#define XOTclGetClassClientData_TCL_DECLARED
+#ifndef NsfGetClassClientData_TCL_DECLARED
+#define NsfGetClassClientData_TCL_DECLARED
 /* 35 */
-EXTERN ClientData	XOTclGetClassClientData(XOTcl_Class *cl);
+EXTERN ClientData	NsfGetClassClientData(Nsf_Class *cl);
 #endif
-#ifndef XOTclRequireObjNamespace_TCL_DECLARED
-#define XOTclRequireObjNamespace_TCL_DECLARED
+#ifndef NsfRequireObjNamespace_TCL_DECLARED
+#define NsfRequireObjNamespace_TCL_DECLARED
 /* 36 */
-EXTERN void		XOTclRequireObjNamespace(Tcl_Interp *interp,
-				XOTcl_Object *obj);
+EXTERN void		NsfRequireObjNamespace(Tcl_Interp *interp,
+				Nsf_Object *obj);
 #endif
-#ifndef XOTclErrBadVal_TCL_DECLARED
-#define XOTclErrBadVal_TCL_DECLARED
+#ifndef NsfErrBadVal_TCL_DECLARED
+#define NsfErrBadVal_TCL_DECLARED
 /* 37 */
-EXTERN int		XOTclErrBadVal(Tcl_Interp *interp, char *context,
+EXTERN int		NsfErrBadVal(Tcl_Interp *interp, char *context,
 				char *expected, CONST char *value);
 #endif
-#ifndef XOTclNextObjCmd_TCL_DECLARED
-#define XOTclNextObjCmd_TCL_DECLARED
+#ifndef NsfNextObjCmd_TCL_DECLARED
+#define NsfNextObjCmd_TCL_DECLARED
 /* 38 */
-EXTERN int		XOTclNextObjCmd(ClientData cd, Tcl_Interp *interp,
+EXTERN int		NsfNextObjCmd(ClientData cd, Tcl_Interp *interp,
 				int objc, Tcl_Obj *CONST objv[]);
 #endif
-#ifndef XOTclCallMethodWithArgs_TCL_DECLARED
-#define XOTclCallMethodWithArgs_TCL_DECLARED
+#ifndef NsfCallMethodWithArgs_TCL_DECLARED
+#define NsfCallMethodWithArgs_TCL_DECLARED
 /* 39 */
-EXTERN int		XOTclCallMethodWithArgs(ClientData cd,
+EXTERN int		NsfCallMethodWithArgs(ClientData cd,
 				Tcl_Interp *interp, Tcl_Obj *method,
 				Tcl_Obj *arg, int objc,
 				Tcl_Obj *CONST objv[], int flags);
 #endif
-#ifndef XOTclObjErrArgCnt_TCL_DECLARED
-#define XOTclObjErrArgCnt_TCL_DECLARED
+#ifndef NsfObjErrArgCnt_TCL_DECLARED
+#define NsfObjErrArgCnt_TCL_DECLARED
 /* 40 */
-EXTERN int		XOTclObjErrArgCnt(Tcl_Interp *interp,
+EXTERN int		NsfObjErrArgCnt(Tcl_Interp *interp,
 				Tcl_Obj *cmdName, Tcl_Obj *methodName,
 				char *arglist);
 #endif
-#ifndef XOTclAddObjectMethod_TCL_DECLARED
-#define XOTclAddObjectMethod_TCL_DECLARED
+#ifndef NsfAddObjectMethod_TCL_DECLARED
+#define NsfAddObjectMethod_TCL_DECLARED
 /* 41 */
-EXTERN int		XOTclAddObjectMethod(Tcl_Interp *interp,
-				struct XOTcl_Object *obj, CONST char *nm,
+EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
+				struct Nsf_Object *obj, CONST char *nm,
 				Tcl_ObjCmdProc *proc, ClientData cd,
 				Tcl_CmdDeleteProc *dp, int flags);
 #endif
-#ifndef XOTclAddClassMethod_TCL_DECLARED
-#define XOTclAddClassMethod_TCL_DECLARED
+#ifndef NsfAddClassMethod_TCL_DECLARED
+#define NsfAddClassMethod_TCL_DECLARED
 /* 42 */
-EXTERN int		XOTclAddClassMethod(Tcl_Interp *interp,
-				struct XOTcl_Class *cl, CONST char *nm,
+EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
+				struct Nsf_Class *cl, CONST char *nm,
 				Tcl_ObjCmdProc *proc, ClientData cd,
 				Tcl_CmdDeleteProc *dp, int flags);
 #endif
-#ifndef XOTclCreate_TCL_DECLARED
-#define XOTclCreate_TCL_DECLARED
+#ifndef NsfCreate_TCL_DECLARED
+#define NsfCreate_TCL_DECLARED
 /* 43 */
-EXTERN int		XOTclCreate(Tcl_Interp *in, XOTcl_Class *class,
+EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
 				Tcl_Obj *name, ClientData data, int objc,
 				Tcl_Obj *CONST objv[]);
 #endif
@@ -241,26 +241,26 @@
 
     int (*nsf_Init) (Tcl_Interp *interp); /* 0 */
     void *reserved1;
-    struct XOTcl_Class * (*xOTclIsClass) (Tcl_Interp *interp, ClientData cd); /* 2 */
+    struct Nsf_Class * (*xOTclIsClass) (Tcl_Interp *interp, ClientData cd); /* 2 */
     void *reserved3;
-    struct XOTcl_Object * (*xOTclGetObject) (Tcl_Interp *interp, CONST char *name); /* 4 */
-    struct XOTcl_Class * (*xOTclGetClass) (Tcl_Interp *interp, CONST char *name); /* 5 */
-    int (*xOTclCreateObject) (Tcl_Interp *interp, Tcl_Obj *name, struct XOTcl_Class *cl); /* 6 */
+    struct Nsf_Object * (*xOTclGetObject) (Tcl_Interp *interp, CONST char *name); /* 4 */
+    struct Nsf_Class * (*xOTclGetClass) (Tcl_Interp *interp, CONST char *name); /* 5 */
+    int (*xOTclCreateObject) (Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl); /* 6 */
     void *reserved7;
     void *reserved8;
-    int (*xOTclDeleteObject) (Tcl_Interp *interp, struct XOTcl_Object *obj); /* 9 */
+    int (*xOTclDeleteObject) (Tcl_Interp *interp, struct Nsf_Object *obj); /* 9 */
     void *reserved10;
     void *reserved11;
     void *reserved12;
-    int (*xOTclRemoveObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm); /* 13 */
-    int (*xOTclRemoveClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm); /* 14 */
-    Tcl_Obj * (*xOTclOSetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, Tcl_Obj *value, int flgs); /* 15 */
-    Tcl_Obj * (*xOTclOGetInstVar) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs); /* 16 */
+    int (*xOTclRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm); /* 13 */
+    int (*xOTclRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm); /* 14 */
+    Tcl_Obj * (*xOTclOSetInstVar) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, Tcl_Obj *value, int flgs); /* 15 */
+    Tcl_Obj * (*xOTclOGetInstVar) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs); /* 16 */
     void *reserved17;
     void *reserved18;
-    Tcl_Obj * (*xOTcl_ObjSetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 19 */
-    Tcl_Obj * (*xOTcl_ObjGetVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 20 */
-    int (*xOTclUnsetInstVar2) (struct XOTcl_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 21 */
+    Tcl_Obj * (*xOTcl_ObjSetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 19 */
+    Tcl_Obj * (*xOTcl_ObjGetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 20 */
+    int (*xOTclUnsetInstVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 21 */
     void *reserved22;
     int (*xOTclErrMsg) (Tcl_Interp *interp, char *msg, Tcl_FreeProc *type); /* 23 */
     int (*xOTclVarErrMsg) (Tcl_Interp *interp, ...); /* 24 */
@@ -271,18 +271,18 @@
     void (*xOTclStackDump) (Tcl_Interp *interp); /* 29 */
     void *reserved30;
     void *reserved31;
-    void (*xOTclSetObjClientData) (XOTcl_Object *obj, ClientData data); /* 32 */
-    ClientData (*xOTclGetObjClientData) (XOTcl_Object *obj); /* 33 */
-    void (*xOTclSetClassClientData) (XOTcl_Class *cl, ClientData data); /* 34 */
-    ClientData (*xOTclGetClassClientData) (XOTcl_Class *cl); /* 35 */
-    void (*xOTclRequireObjNamespace) (Tcl_Interp *interp, XOTcl_Object *obj); /* 36 */
+    void (*xOTclSetObjClientData) (Nsf_Object *obj, ClientData data); /* 32 */
+    ClientData (*xOTclGetObjClientData) (Nsf_Object *obj); /* 33 */
+    void (*xOTclSetClassClientData) (Nsf_Class *cl, ClientData data); /* 34 */
+    ClientData (*xOTclGetClassClientData) (Nsf_Class *cl); /* 35 */
+    void (*xOTclRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *obj); /* 36 */
     int (*xOTclErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 37 */
     int (*xOTclNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 38 */
     int (*xOTclCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 39 */
     int (*xOTclObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 40 */
-    int (*xOTclAddObjectMethod) (Tcl_Interp *interp, struct XOTcl_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 41 */
-    int (*xOTclAddClassMethod) (Tcl_Interp *interp, struct XOTcl_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 42 */
-    int (*xOTclCreate) (Tcl_Interp *in, XOTcl_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */
+    int (*xOTclAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 41 */
+    int (*xOTclAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 42 */
+    int (*xOTclCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */
 } NsfStubs;
 
 #ifdef __cplusplus
@@ -304,136 +304,136 @@
 	(nsfStubsPtr->nsf_Init) /* 0 */
 #endif
 /* Slot 1 is reserved */
-#ifndef XOTclIsClass
-#define XOTclIsClass \
+#ifndef NsfIsClass
+#define NsfIsClass \
 	(nsfStubsPtr->xOTclIsClass) /* 2 */
 #endif
 /* Slot 3 is reserved */
-#ifndef XOTclGetObject
-#define XOTclGetObject \
+#ifndef NsfGetObject
+#define NsfGetObject \
 	(nsfStubsPtr->xOTclGetObject) /* 4 */
 #endif
-#ifndef XOTclGetClass
-#define XOTclGetClass \
+#ifndef NsfGetClass
+#define NsfGetClass \
 	(nsfStubsPtr->xOTclGetClass) /* 5 */
 #endif
-#ifndef XOTclCreateObject
-#define XOTclCreateObject \
+#ifndef NsfCreateObject
+#define NsfCreateObject \
 	(nsfStubsPtr->xOTclCreateObject) /* 6 */
 #endif
 /* Slot 7 is reserved */
 /* Slot 8 is reserved */
-#ifndef XOTclDeleteObject
-#define XOTclDeleteObject \
+#ifndef NsfDeleteObject
+#define NsfDeleteObject \
 	(nsfStubsPtr->xOTclDeleteObject) /* 9 */
 #endif
 /* Slot 10 is reserved */
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
-#ifndef XOTclRemoveObjectMethod
-#define XOTclRemoveObjectMethod \
+#ifndef NsfRemoveObjectMethod
+#define NsfRemoveObjectMethod \
 	(nsfStubsPtr->xOTclRemoveObjectMethod) /* 13 */
 #endif
-#ifndef XOTclRemoveClassMethod
-#define XOTclRemoveClassMethod \
+#ifndef NsfRemoveClassMethod
+#define NsfRemoveClassMethod \
 	(nsfStubsPtr->xOTclRemoveClassMethod) /* 14 */
 #endif
-#ifndef XOTclOSetInstVar
-#define XOTclOSetInstVar \
+#ifndef NsfOSetInstVar
+#define NsfOSetInstVar \
 	(nsfStubsPtr->xOTclOSetInstVar) /* 15 */
 #endif
-#ifndef XOTclOGetInstVar
-#define XOTclOGetInstVar \
+#ifndef NsfOGetInstVar
+#define NsfOGetInstVar \
 	(nsfStubsPtr->xOTclOGetInstVar) /* 16 */
 #endif
 /* Slot 17 is reserved */
 /* Slot 18 is reserved */
-#ifndef XOTcl_ObjSetVar2
-#define XOTcl_ObjSetVar2 \
+#ifndef Nsf_ObjSetVar2
+#define Nsf_ObjSetVar2 \
 	(nsfStubsPtr->xOTcl_ObjSetVar2) /* 19 */
 #endif
-#ifndef XOTcl_ObjGetVar2
-#define XOTcl_ObjGetVar2 \
+#ifndef Nsf_ObjGetVar2
+#define Nsf_ObjGetVar2 \
 	(nsfStubsPtr->xOTcl_ObjGetVar2) /* 20 */
 #endif
-#ifndef XOTclUnsetInstVar2
-#define XOTclUnsetInstVar2 \
+#ifndef NsfUnsetInstVar2
+#define NsfUnsetInstVar2 \
 	(nsfStubsPtr->xOTclUnsetInstVar2) /* 21 */
 #endif
 /* Slot 22 is reserved */
-#ifndef XOTclErrMsg
-#define XOTclErrMsg \
+#ifndef NsfErrMsg
+#define NsfErrMsg \
 	(nsfStubsPtr->xOTclErrMsg) /* 23 */
 #endif
-#ifndef XOTclVarErrMsg
-#define XOTclVarErrMsg \
+#ifndef NsfVarErrMsg
+#define NsfVarErrMsg \
 	(nsfStubsPtr->xOTclVarErrMsg) /* 24 */
 #endif
-#ifndef XOTclErrInProc
-#define XOTclErrInProc \
+#ifndef NsfErrInProc
+#define NsfErrInProc \
 	(nsfStubsPtr->xOTclErrInProc) /* 25 */
 #endif
 /* Slot 26 is reserved */
-#ifndef XOTclErrBadVal_
-#define XOTclErrBadVal_ \
+#ifndef NsfErrBadVal_
+#define NsfErrBadVal_ \
 	(nsfStubsPtr->xOTclErrBadVal_) /* 27 */
 #endif
-#ifndef XOTclObjErrType
-#define XOTclObjErrType \
+#ifndef NsfObjErrType
+#define NsfObjErrType \
 	(nsfStubsPtr->xOTclObjErrType) /* 28 */
 #endif
-#ifndef XOTclStackDump
-#define XOTclStackDump \
+#ifndef NsfStackDump
+#define NsfStackDump \
 	(nsfStubsPtr->xOTclStackDump) /* 29 */
 #endif
 /* Slot 30 is reserved */
 /* Slot 31 is reserved */
-#ifndef XOTclSetObjClientData
-#define XOTclSetObjClientData \
+#ifndef NsfSetObjClientData
+#define NsfSetObjClientData \
 	(nsfStubsPtr->xOTclSetObjClientData) /* 32 */
 #endif
-#ifndef XOTclGetObjClientData
-#define XOTclGetObjClientData \
+#ifndef NsfGetObjClientData
+#define NsfGetObjClientData \
 	(nsfStubsPtr->xOTclGetObjClientData) /* 33 */
 #endif
-#ifndef XOTclSetClassClientData
-#define XOTclSetClassClientData \
+#ifndef NsfSetClassClientData
+#define NsfSetClassClientData \
 	(nsfStubsPtr->xOTclSetClassClientData) /* 34 */
 #endif
-#ifndef XOTclGetClassClientData
-#define XOTclGetClassClientData \
+#ifndef NsfGetClassClientData
+#define NsfGetClassClientData \
 	(nsfStubsPtr->xOTclGetClassClientData) /* 35 */
 #endif
-#ifndef XOTclRequireObjNamespace
-#define XOTclRequireObjNamespace \
+#ifndef NsfRequireObjNamespace
+#define NsfRequireObjNamespace \
 	(nsfStubsPtr->xOTclRequireObjNamespace) /* 36 */
 #endif
-#ifndef XOTclErrBadVal
-#define XOTclErrBadVal \
+#ifndef NsfErrBadVal
+#define NsfErrBadVal \
 	(nsfStubsPtr->xOTclErrBadVal) /* 37 */
 #endif
-#ifndef XOTclNextObjCmd
-#define XOTclNextObjCmd \
+#ifndef NsfNextObjCmd
+#define NsfNextObjCmd \
 	(nsfStubsPtr->xOTclNextObjCmd) /* 38 */
 #endif
-#ifndef XOTclCallMethodWithArgs
-#define XOTclCallMethodWithArgs \
+#ifndef NsfCallMethodWithArgs
+#define NsfCallMethodWithArgs \
 	(nsfStubsPtr->xOTclCallMethodWithArgs) /* 39 */
 #endif
-#ifndef XOTclObjErrArgCnt
-#define XOTclObjErrArgCnt \
+#ifndef NsfObjErrArgCnt
+#define NsfObjErrArgCnt \
 	(nsfStubsPtr->xOTclObjErrArgCnt) /* 40 */
 #endif
-#ifndef XOTclAddObjectMethod
-#define XOTclAddObjectMethod \
+#ifndef NsfAddObjectMethod
+#define NsfAddObjectMethod \
 	(nsfStubsPtr->xOTclAddObjectMethod) /* 41 */
 #endif
-#ifndef XOTclAddClassMethod
-#define XOTclAddClassMethod \
+#ifndef NsfAddClassMethod
+#define NsfAddClassMethod \
 	(nsfStubsPtr->xOTclAddClassMethod) /* 42 */
 #endif
-#ifndef XOTclCreate
-#define XOTclCreate \
+#ifndef NsfCreate
+#define NsfCreate \
 	(nsfStubsPtr->xOTclCreate) /* 43 */
 #endif