Index: generic/nsfError.c
===================================================================
diff -u -r0e8b567e2a1808c514f6340430920ad4d59953bc -r8eddf67371ec031084a6ef98fdec21e38dff85ff
--- generic/nsfError.c	(.../nsfError.c)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
+++ generic/nsfError.c	(.../nsfError.c)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
@@ -5,7 +5,7 @@
  *  Copyright (C) 1999-2010 Gustaf Neumann, Uwe Zdun
  *
  *
- *  xotclError.c --
+ *  nsfError.c --
  *  
  *  error return functions for XOTcl
  *  
@@ -14,13 +14,13 @@
 #include "nsfInt.h"
 
 int
-XOTclErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc* type) {
+NsfErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc* type) {
     Tcl_SetResult(interp, msg, type);
     return TCL_ERROR;
 }
 
 int
-XOTclVarErrMsg TCL_VARARGS_DEF (Tcl_Interp *, arg1) {
+NsfVarErrMsg TCL_VARARGS_DEF (Tcl_Interp *, arg1) {
     va_list argList;
     char *string;
     Tcl_Interp *interp;
@@ -40,7 +40,7 @@
 
 
 int
-XOTclErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
+NsfErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
                Tcl_Obj *clName, CONST char *procName) {
   Tcl_DString errMsg;
   char *cName, *space;
@@ -63,7 +63,7 @@
 }
 
 int
-XOTclObjWrongArgs(Tcl_Interp *interp, char *msg, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist) {
+NsfObjWrongArgs(Tcl_Interp *interp, char *msg, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist) {
   int need_space = 0;
   Tcl_ResetResult(interp);
   Tcl_AppendResult(interp, msg, " should be \"", (char *) NULL);
@@ -85,29 +85,29 @@
 }
 
 int
-XOTclObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName,  Tcl_Obj *methodName, char *arglist) {
-  return XOTclObjWrongArgs(interp, "wrong # args:", cmdName, methodName, arglist);
+NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName,  Tcl_Obj *methodName, char *arglist) {
+  return NsfObjWrongArgs(interp, "wrong # args:", cmdName, methodName, arglist);
 }
 
 int
-XOTclErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value) {
+NsfErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value) {
   Tcl_ResetResult(interp);
   Tcl_AppendResult(interp, context, ": expected ", expected, " but got '", 
 		   value, "'", (char *) NULL);
   return TCL_ERROR;
 }
 
 int
-XOTclErrBadVal_(Tcl_Interp *interp, char *expected, char *value) {
-  fprintf(stderr, "Deprecated call, recompile your program with xotcl 1.5 or newer\n");
+NsfErrBadVal_(Tcl_Interp *interp, char *expected, char *value) {
+  fprintf(stderr, "Deprecated call, recompile your program with nsf 1.5 or newer\n");
   Tcl_ResetResult(interp);
   Tcl_AppendResult(interp, ": expected ", expected, " but got '", 
 		   value, "'", (char *) NULL);
   return TCL_ERROR;
 }
 
 extern int
-XOTclObjErrType(Tcl_Interp *interp, Tcl_Obj *value, char *type, char *parameterName) {
+NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *value, char *type, char *parameterName) {
   Tcl_ResetResult(interp);
   Tcl_AppendResult(interp,"expected ", type, " but got \"",  ObjStr(value), "\"", 
                    parameterName ? " for parameter " : "",