Index: TODO
===================================================================
diff -u -r0c7e47e58354106c6810812efe41008ce5ae939b -rcec13372cd20131e3283e5ec1c864d734441ba61
--- TODO	(.../TODO)	(revision 0c7e47e58354106c6810812efe41008ce5ae939b)
+++ TODO	(.../TODO)	(revision cec13372cd20131e3283e5ec1c864d734441ba61)
@@ -1380,12 +1380,12 @@
 - rennamed tests/subcmd.tcl info tests/submethods.tcl
 - moved relevant tests from tests/parameters into tests/submethods.tcl
 
+- renamed functions in nsfStack.c to follow Tcl naming guidelines
+
 TODO: 
 - subcmd
    * handle sucmd for other method factories
    * handle absence of -create  flag in resolve_method_path (for introspection)
-   * move tests from parameters into submethods
-names in nsfStack
 
 - next noargs
 
Index: generic/nsf.c
===================================================================
diff -u -r38f8651fe4c101ee7ad98aa46bcadc32459bfdc7 -rcec13372cd20131e3283e5ec1c864d734441ba61
--- generic/nsf.c	(.../nsf.c)	(revision 38f8651fe4c101ee7ad98aa46bcadc32459bfdc7)
+++ generic/nsf.c	(.../nsf.c)	(revision cec13372cd20131e3283e5ec1c864d734441ba61)
@@ -2156,7 +2156,7 @@
 
 #if defined(CMD_RESOLVER_TRACE)
   fprintf(stderr, "    ... not found %s\n", cmdName);
-  tcl85showStack(interp);
+  Tcl85showStack(interp);
 #endif
   return TCL_CONTINUE;
 }
@@ -6546,7 +6546,7 @@
 
     /*fprintf(stderr, "... check ok, cscPtr = %p\n", cscPtr);
     if (!cscPtr) {
-      tcl85showStack(interp);
+      Tcl85showStack(interp);
       }*/
     if (!cscPtr || (object != cscPtr->self ||
                     cscPtr->frameType != NSF_CSC_TYPE_ACTIVE_FILTER)) {
@@ -6646,7 +6646,7 @@
 	unknown = 1;
         fprintf(stderr, "+++ %s is protected, therefore maybe unknown %p %s lastself=%p o=%p cd %p flags = %.6x\n",
                 methodName, cmdObj, ObjStr(cmdObj), lastSelf, o, clientData, flags);
-        /*tcl85showStack(interp);*/
+        /*Tcl85showStack(interp);*/
       }
     }
 
@@ -10167,7 +10167,7 @@
   Tcl_CallFrame *framePtr;
   Tcl_Namespace *nsPtr;
 
-  /*tcl85showStack(interp);*/
+  /*Tcl85showStack(interp);*/
 
   /*
   * Find last incovation outside the Next Scripting system namespaces. For
@@ -10176,7 +10176,7 @@
   * would use this namespace, we would resolve non-fully-qualified
   * names against the root namespace).
   */
-  for (framePtr = activeProcFrame((Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp));
+  for (framePtr = CallStackGetActiveProcFrame((Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp));
        framePtr;
        framePtr = Tcl_CallFrame_callerVarPtr(framePtr)) {
     nsPtr = Tcl_CallFrame_nsPtr(framePtr);
@@ -12918,7 +12918,7 @@
   NsfCallStackContent *cscPtr;
   int result = TCL_OK;
 
-  /*fprintf(stderr, "getSelfObj returns %p\n", object); tcl85showStack(interp);*/
+  /*fprintf(stderr, "getSelfObj returns %p\n", object); Tcl85showStack(interp);*/
 
   if (selfoption == 0 || selfoption == CurrentoptionObjectIdx) {
     if (object) {
@@ -13035,7 +13035,7 @@
   case CurrentoptionIsnextcallIdx: {
     Tcl_CallFrame *framePtr;
     cscPtr = CallStackGetTopFrame(interp, &framePtr);
-    framePtr = nextFrameOfType(Tcl_CallFrame_callerPtr(framePtr), FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD);
+    framePtr = CallStackNextFrameOfType(Tcl_CallFrame_callerPtr(framePtr), FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD);
     cscPtr = framePtr ? Tcl_CallFrame_clientData(framePtr) : NULL;
 
     Tcl_SetBooleanObj(Tcl_GetObjResult(interp),
@@ -13904,7 +13904,7 @@
 
     /*fprintf(stderr, "### setting trace for %s on frame %p\n", fullName, 
       Tcl_Interp_varFramePtr(interp));
-      tcl85showStack(interp);*/
+      Tcl85showStack(interp);*/
     result = Tcl_TraceVar(interp, vn, TCL_TRACE_UNSETS,
 			  (Tcl_VarTraceProc*)NsfUnsetTrace,
                           (ClientData)objPtr);
Index: generic/nsfShadow.c
===================================================================
diff -u -r1e14e709ba184c6daf7a2f94605a2cff65d7706c -rcec13372cd20131e3283e5ec1c864d734441ba61
--- generic/nsfShadow.c	(.../nsfShadow.c)	(revision 1e14e709ba184c6daf7a2f94605a2cff65d7706c)
+++ generic/nsfShadow.c	(.../nsfShadow.c)	(revision cec13372cd20131e3283e5ec1c864d734441ba61)
@@ -136,7 +136,7 @@
     }
     frameFlags = Tcl_CallFrame_isProcCallFrame(varFramePtr);
     /*fprintf(stderr, " ... frame %p varFramePtr %p frameFlags %.6x\n", framePtr, varFramePtr, frameFlags);
-      tcl85showStack(interp);*/
+      Tcl85showStack(interp);*/
     if (frameFlags & (FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD)) {
       NsfCallStackContent *cscPtr = 
         ((NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr));
Index: generic/nsfStack.c
===================================================================
diff -u -rbc9096dbfe6718828baf2359730f098d66598065 -rcec13372cd20131e3283e5ec1c864d734441ba61
--- generic/nsfStack.c	(.../nsfStack.c)	(revision bc9096dbfe6718828baf2359730f098d66598065)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision cec13372cd20131e3283e5ec1c864d734441ba61)
@@ -2,10 +2,10 @@
 static TclVarHashTable *VarHashTableCreate();
 static void NsfCleanupObject(NsfObject *object);
 
-void tcl85showStack(Tcl_Interp *interp) {
+void Tcl85showStack(Tcl_Interp *interp) {
   Tcl_CallFrame *framePtr;
 
-  fprintf(stderr, "tcl85showStack framePtr %p varFramePtr %p\n",
+  fprintf(stderr, "Tcl85showStack framePtr %p varFramePtr %p\n",
           Tcl_Interp_framePtr(interp), Tcl_Interp_varFramePtr(interp));
   /* framePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
     for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
@@ -107,7 +107,7 @@
  */
 
 static Tcl_CallFrame *
-activeProcFrame(Tcl_CallFrame *framePtr) {
+CallStackGetActiveProcFrame(Tcl_CallFrame *framePtr) {
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     register int flag = Tcl_CallFrame_isProcCallFrame(framePtr);
 
@@ -124,7 +124,7 @@
 }
 
 static Tcl_CallFrame *
-nextFrameOfType(Tcl_CallFrame *framePtr, int flags) {
+CallStackNextFrameOfType(Tcl_CallFrame *framePtr, int flags) {
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     if (Tcl_CallFrame_isProcCallFrame(framePtr) & flags)
       return framePtr;
@@ -246,10 +246,10 @@
 
   /*NsfCallStackFindActiveFrame(interp, 0, &activeFramePtr);*/
 # if defined(TCL85STACK_TRACE)
-  tcl85showStack(interp);
+  Tcl85showStack(interp);
 # endif
   /* Get the first active non object frame */
-  framePtr = activeProcFrame(inFramePtr);
+  framePtr = CallStackGetActiveProcFrame(inFramePtr);
 
   /*fprintf(stderr,"... use frameptr %p \n", framePtr);*/
 
@@ -392,7 +392,7 @@
  * callframe
  */
 static void CallStackPopAll(Tcl_Interp *interp) {
-  /*tcl85showStack(interp);*/
+  /*Tcl85showStack(interp);*/
 
   while (1) {
     Tcl_CallFrame *framePtr = Tcl_Interp_framePtr(interp);