Index: generic/gentclAPI.tcl
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r1e14e709ba184c6daf7a2f94605a2cff65d7706c
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision 1e14e709ba184c6daf7a2f94605a2cff65d7706c)
@@ -25,7 +25,7 @@
   set enums [list ${name}NULL]
   foreach d $domain {lappend enums $name[string totitle [string map [list - _] $d]]Idx}
   subst {
-static int convertTo${name}(Tcl_Interp *interp, Tcl_Obj *objPtr, NsfParam CONST *pPtr, 
+static int ConvertTo${name}(Tcl_Interp *interp, Tcl_Obj *objPtr, NsfParam CONST *pPtr, 
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   $opts
@@ -70,7 +70,7 @@
 #     } else {
 #       set default ""
 #     }
-    lappend l "{\"$argName\", $(-required), $(-nrargs), convertTo$converter}"
+    lappend l "{\"$argName\", $(-required), $(-nrargs), ConvertTo$converter}"
   }
   join $l ",\n  "
 }
@@ -153,7 +153,7 @@
           lappend if "CONST char *${varName}String" "NsfObject *${varName}Obj"
           set ifSet 1
           append pre [subst -nocommands {
-    if (getMatchObject(interp, ${varName}, objc>$i ? objv[$i] : NULL, &${varName}Obj, &${varName}String) == -1) {
+    if (GetMatchObject(interp, ${varName}, objc>$i ? objv[$i] : NULL, &${varName}Obj, &${varName}String) == -1) {
       if (${varName}) {
         DECR_REF_COUNT(${varName});
       }
@@ -193,7 +193,7 @@
   return [subst -nocommands {
 static int
 ${stub}(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  parseContext pc;
+  ParseContext pc;
 $intro
   if (ArgumentParse(interp, objc, objv, $obj, objv[0], 
                      method_definitions[$idx].paramDefs, 
@@ -203,7 +203,7 @@
   } else {
     $cDefs
 $pre
-    parseContextRelease(&pc);
+    ParseContextRelease(&pc);
     $call
 $post
   }
@@ -286,9 +286,9 @@
 static int ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], 
                          NsfObject *obj, Tcl_Obj *procName,
                          NsfParam CONST *paramPtr, int nrParameters, int doCheck,
-			 parseContext *pc);
+			 ParseContext *pc);
 
-static int getMatchObject(Tcl_Interp *interp, Tcl_Obj *patternObj, Tcl_Obj *origObj,
+static int GetMatchObject(Tcl_Interp *interp, Tcl_Obj *patternObj, Tcl_Obj *origObj,
 			  NsfObject **matchObject, CONST char **pattern);
 
 /* just to define the symbol */
@@ -309,7 +309,7 @@
   puts "enum {\n $enumString\n} NsfMethods;\n"
   puts $fns
   set definitionString [join $ifds ",\n"]
-puts "static methodDefinition method_definitions\[\] = \{\n$definitionString,\{NULL\}\n\};\n"
+  puts "static methodDefinition method_definitions\[\] = \{\n$definitionString,\{NULL\}\n\};\n"
 }
 
 proc methodDefinition {methodName methodType implementation parameterDefinitions {ns ""}} {