Index: library/xotcl/library/xml/TclExpat-1.1/tclexpat.c
===================================================================
diff -u -r0e8b567e2a1808c514f6340430920ad4d59953bc -r8eddf67371ec031084a6ef98fdec21e38dff85ff
--- library/xotcl/library/xml/TclExpat-1.1/tclexpat.c	(.../tclexpat.c)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
+++ library/xotcl/library/xml/TclExpat-1.1/tclexpat.c	(.../tclexpat.c)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
@@ -158,12 +158,12 @@
    simply export */
 #ifdef VISUAL_CC
 DLLEXPORT extern int Xotclexpat_Init(Tcl_Interp * interp);
-# define CONST_XOTCL_EXPAT
+# define CONST_NSF_EXPAT
 #else
 # if defined(PRE84)
-#  define CONST_XOTCL_EXPAT
+#  define CONST_NSF_EXPAT
 # else
-#  define CONST_XOTCL_EXPAT CONST84
+#  define CONST_NSF_EXPAT CONST84
 # endif
 #endif
 
@@ -187,7 +187,7 @@
 #endif
 
 
-  Tcl_PkgProvide(interp, "xotcl::xml::expat", PACKAGE_VERSION);
+  Tcl_PkgProvide(interp, "nsf::xml::expat", PACKAGE_VERSION);
 
   Tcl_CreateObjCommand(interp, "expat", TclExpatObjCmd, NULL, NULL);
 
@@ -386,7 +386,7 @@
   char *data;
   int len;
   int index, result = TCL_OK;
-  static char CONST_XOTCL_EXPAT *options[] = {
+  static char CONST_NSF_EXPAT *options[] = {
     "configure", "cget", "parse", "reset", NULL
   };
   enum options {
@@ -542,7 +542,7 @@
      int objc;
      Tcl_Obj *CONST objv[];
 {
-  static CONST_XOTCL_EXPAT char *switchTable[] = {
+  static CONST_NSF_EXPAT char *switchTable[] = {
     "-final",
     "-baseurl",
     "-elementstartcommand",