Index: generic/nsfProfile.c
===================================================================
diff -u -r0e8b567e2a1808c514f6340430920ad4d59953bc -r8eddf67371ec031084a6ef98fdec21e38dff85ff
--- generic/nsfProfile.c	(.../nsfProfile.c)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
+++ generic/nsfProfile.c	(.../nsfProfile.c)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
@@ -17,7 +17,7 @@
 
 #if defined(NSF_PROFILE)
 void
-XOTclProfileFillTable(Tcl_HashTable* table, Tcl_DString* key,
+NsfProfileFillTable(Tcl_HashTable* table, Tcl_DString* key,
 		 double totalMicroSec) {
   Tcl_HashEntry* hPtr;
   char* keyStr = Tcl_DStringValue(key);
@@ -46,13 +46,13 @@
 }
 
 void
-XOTclProfileEvaluateData(Tcl_Interp* interp, long int startSec, long int startUsec,
-		    XOTclObject* obj, XOTclClass *cl, char *methodName) {
+NsfProfileEvaluateData(Tcl_Interp* interp, long int startSec, long int startUsec,
+		    NsfObject* obj, NsfClass *cl, char *methodName) {
   double totalMicroSec;
   struct timeval trt;
   Tcl_DString objectKey, methodKey;
 
-  XOTclProfile* profile = &RUNTIME_STATE(interp)->profile;
+  NsfProfile* profile = &RUNTIME_STATE(interp)->profile;
 
   gettimeofday(&trt, NULL);
 
@@ -77,14 +77,14 @@
   else
     Tcl_DStringAppend(&methodKey, " (proc)", 7);
 
-  XOTclProfileFillTable(&profile->objectData, &objectKey, totalMicroSec);
-  XOTclProfileFillTable(&profile->methodData, &methodKey, totalMicroSec);
+  NsfProfileFillTable(&profile->objectData, &objectKey, totalMicroSec);
+  NsfProfileFillTable(&profile->methodData, &methodKey, totalMicroSec);
   DSTRING_FREE(&objectKey);
   DSTRING_FREE(&methodKey);
 }
 
 void
-XOTclProfilePrintTable(Tcl_HashTable* table) {
+NsfProfilePrintTable(Tcl_HashTable* table) {
   Tcl_HashEntry* topValueHPtr;
   long int* topValue;
 
@@ -115,8 +115,8 @@
 }
 
 void
-XOTclProfilePrintData(Tcl_Interp *interp) {
-  XOTclProfile* profile = &RUNTIME_STATE(interp)->profile;
+NsfProfilePrintData(Tcl_Interp *interp) {
+  NsfProfile* profile = &RUNTIME_STATE(interp)->profile;
 
   fprintf(stderr, "------------------------------------------------------------------\n");
   fprintf(stderr, "\nXOTcl Profile Information\n\n");
@@ -125,15 +125,15 @@
 	  profile->overallTime);
   fprintf(stderr, "------------------------------------------------------------------\n");
   fprintf(stderr, "     MICROSECONDS   OBJECT-NAME\n");
-  XOTclProfilePrintTable(&profile->objectData);
+  NsfProfilePrintTable(&profile->objectData);
   fprintf(stderr, "------------------------------------------------------------------\n");
   fprintf(stderr, "     MICROSECONDS   (CL/OBJ)->METHOD-NAME\n");
-  XOTclProfilePrintTable(&profile->methodData);
+  NsfProfilePrintTable(&profile->methodData);
   fprintf(stderr, "------------------------------------------------------------------\n");
 }
 
 void 
-XOTclProfileInit(Tcl_Interp *interp) {
+NsfProfileInit(Tcl_Interp *interp) {
   RUNTIME_STATE(interp)->profile.overallTime = 0;
   Tcl_InitHashTable(&RUNTIME_STATE(interp)->profile.objectData,
 		    TCL_STRING_KEYS);