Index: generic/gentclAPI.tcl
===================================================================
diff -u -N -r880487204ff2da18d2d25ebd727b9b4bbda86c8e -r48a6cfe1b7285aadc94437635dc09dd925db4ce6
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 880487204ff2da18d2d25ebd727b9b4bbda86c8e)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 48a6cfe1b7285aadc94437635dc09dd925db4ce6)
@@ -102,7 +102,7 @@
       }
     }
     if {$converter in {Tclobj Integer Int32 Boolean String Class Object Pointer}} {
-      set conv Nsf_ConvertTo$converter
+      set conv Nsf_ConvertTo_$converter
     } else {
       set conv ConvertTo$converter
     }
@@ -482,6 +482,51 @@
  * part of the Next Scripting Framework.
  */
 
+#if defined(USE_NSF_STUBS)
+int Nsf_ConvertTo_Boolean(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToBoolean(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Class(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToClass(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Int32(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToInt32(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Integer(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToInteger(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Object(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToObject(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Pointer(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToPointer(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_String(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToString(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+int Nsf_ConvertTo_Tclobj(Tcl_Interp *interp, Tcl_Obj *objPtr,  Nsf_Param CONST *pPtr,
+			  ClientData *clientData, Tcl_Obj **outObjPtr) {
+  return Nsf_ConvertToTclobj(interp, objPtr, pPtr, clientData, outObjPtr);
+}
+#else
+# define Nsf_ConvertTo_Boolean Nsf_ConvertToBoolean
+# define Nsf_ConvertTo_Class Nsf_ConvertToClass
+# define Nsf_ConvertTo_Int32 Nsf_ConvertToInt32
+# define Nsf_ConvertTo_Integer Nsf_ConvertToInteger
+# define Nsf_ConvertTo_Object Nsf_ConvertToObject
+# define Nsf_ConvertTo_Pointer Nsf_ConvertToPointer
+# define Nsf_ConvertTo_String Nsf_ConvertToString
+# define Nsf_ConvertTo_Tclobj Nsf_ConvertToTclobj
+#endif
+
+
 #if !defined(likely) 
 # if defined(__GNUC__) && __GNUC__ > 2
 /* Use gcc branch prediction hint to minimize cost of e.g. DTrace