Changing some routine names.

Internal functions are CCTKi_

Utility functions are Util_


git-svn-id: http://svn.cactuscode.org/flesh/trunk@777 17b73243-c579-4c4c-a9d2-2d5706c11dac

25 files changed, 202 insertions, 202 deletions

diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index 0b6e576b..75c12cd6 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -678,7 +678,7 @@ int CCTK_OutputVarByMethod(cGH *GH, const char *var, const char *method)
  ************************************************************************/
 
  /*@@
-   @routine    CCTK_rfrTriggerSaysGo
+   @routine    CCTKi_rfrTriggerSaysGo
    @date       Sat March 6 1999
    @author     Gabrielle Allen
    @desc 
@@ -713,7 +713,7 @@ int CCTK_OutputVarByMethod(cGH *GH, const char *var, const char *method)
    @version    $Header$
  */
 
-int CCTK_rfrTriggerSaysGo(cGH *GH, int variable)
+int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
 {
   int handle;
   int flag;
@@ -741,11 +741,11 @@ int CCTK_rfrTriggerSaysGo(cGH *GH, int variable)
 
 
  /*@@
-   @routine    CCTK_rfrTriggerAction
+   @routine    CCTKi_rfrTriggerAction
    @date       Sat March 6 1999
    @author     Gabrielle Allen
    @desc 
-               Essentially the same as CCTK_rfrTriggerSaysGo, 
+               Essentially the same as CCTKi_rfrTriggerSaysGo, 
                but now calls each IO method for which it is 
                time to output the trigger
    @enddesc 
@@ -775,7 +775,7 @@ int CCTK_rfrTriggerSaysGo(cGH *GH, int variable)
    @returndesc
                0    = This should never happen, since at least
                       one IO method should have been found by
-		      CCTK_rfrTriggerSaysGo
+		      CCTKi_rfrTriggerSaysGo
 	       >0   = Number of IO methods called for output for
                       this variable
    @endreturndesc
@@ -783,7 +783,7 @@ int CCTK_rfrTriggerSaysGo(cGH *GH, int variable)
    @version    $Header$
  */
 
-int CCTK_rfrTriggerAction(void *GH, int variable)
+int CCTKi_rfrTriggerAction(void *GH, int variable)
 {
   char *varname;
   char *fullvarname;
diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index a9d569f9..6fea7003 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -157,7 +157,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
      thisGH->GroupData)
   {
     /* Traverse list of GH setup routines. */
-    CCTK_SetupGHExtensions(config, convergence_level, thisGH);
+    CCTKi_SetupGHExtensions(config, convergence_level, thisGH);
 
     retval = thisGH;
   }
diff --git a/src/include/ActiveThorns.h b/src/include/ActiveThorns.h
index 9794f612..69e54e66 100644
--- a/src/include/ActiveThorns.h
+++ b/src/include/ActiveThorns.h
@@ -15,12 +15,12 @@
 extern "C" {
 #endif
 
-int CCTK_RegisterThorn(const char *name, const char *imp);
-int CCTK_ActivateThorn(const char *name);
+int CCTKi_RegisterThorn(const char *name, const char *imp);
+int CCTKi_ActivateThorn(const char *name);
 int CCTK_IsThornActive(const char *name);
 int CCTK_IsImplementationActive(const char *name);
-int CCTK_ListThorns(FILE *file, const char *format, int active);
-int CCTK_ListImplementations(FILE *file, const char *format, int active);
+int CCTKi_ListThorns(FILE *file, const char *format, int active);
+int CCTKi_ListImplementations(FILE *file, const char *format, int active);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/CCTK_Bindings.h b/src/include/CCTK_Bindings.h
index c182d3eb..6c9c4eac 100644
--- a/src/include/CCTK_Bindings.h
+++ b/src/include/CCTK_Bindings.h
@@ -15,13 +15,13 @@
 extern "C" {
 #endif
 
-int CCTK_BindingsParametersInitialise(void);
-int CCTK_BindingsVariablesInitialise(void);
-int CCTK_BindingsScheduleInitialise(void);
+int CCTKi_BindingsParametersInitialise(void);
+int CCTKi_BindingsVariablesInitialise(void);
+int CCTKi_BindingsScheduleInitialise(void);
 
-int CCTK_BindingsScheduleRegister(const char *type, void *data);
+int CCTKi_BindingsScheduleRegister(const char *type, void *data);
 
-int CCTK_BindingsParameterHelp(const char *identifier, const char *format, FILE *file);
+int CCTKi_BindingsParameterHelp(const char *identifier, const char *format, FILE *file);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/CactusrfrInterface.h b/src/include/CactusrfrInterface.h
index 2a9dbd25..0bd77ae6 100644
--- a/src/include/CactusrfrInterface.h
+++ b/src/include/CactusrfrInterface.h
@@ -14,21 +14,21 @@
 extern "C" {
 #endif
 
-int CCTK_rfrStorageOn(void *GH, int group);
+int CCTKi_rfrStorageOn(void *GH, int group);
 
-int CCTK_rfrStorageOff(void *GH, int group);
+int CCTKi_rfrStorageOff(void *GH, int group);
 
-int CCTK_rfrCommunicationOn(void *GH, int group);
+int CCTKi_rfrCommunicationOn(void *GH, int group);
 
-int CCTK_rfrCommunicationOff(void *GH, int group);
+int CCTKi_rfrCommunicationOff(void *GH, int group);
 
-int CCTK_rfrTriggerable(int variable);
+int CCTKi_rfrTriggerable(int variable);
 
-int CCTK_rfrTriggerSaysGo(void *GH, int variable);
+int CCTKi_rfrTriggerSaysGo(void *GH, int variable);
 
-int CCTK_rfrTriggerAction(void *GH, int group);
+int CCTKi_rfrTriggerAction(void *GH, int group);
 
-int CCTK_rfrCallFunc(void *GH, int language, void *function);
+int CCTKi_rfrCallFunc(void *GH, int language, void *function);
 
 
 #ifdef __cplusplus
diff --git a/src/include/CommandLine.h b/src/include/CommandLine.h
index 72286863..8c873d90 100644
--- a/src/include/CommandLine.h
+++ b/src/include/CommandLine.h
@@ -14,18 +14,18 @@
 extern "C" {
 #endif
 
-void CCTK_CommandLineTestThornCompiled(const char *optarg);
-void CCTK_CommandLineDescribeAllParameters(void);
-void CCTK_CommandLineDescribeParameter(const char *optarg);
-void CCTK_CommandLineTestParameters(const char *optarg);
-void CCTK_CommandLineWarningLevel(const char *optarg);
-void CCTK_CommandLineErrorLevel(const char *optarg);
-void CCTK_CommandLineRedirectStdout(void);
-void CCTK_CommandLineListThorns(void);
-void CCTK_CommandLineVersion(void);
-void CCTK_CommandLineHelp(void);
-void CCTK_CommandLineUsage(void);
-void CCTK_CommandLineFinished(void);
+void CCTKi_CommandLineTestThornCompiled(const char *optarg);
+void CCTKi_CommandLineDescribeAllParameters(void);
+void CCTKi_CommandLineDescribeParameter(const char *optarg);
+void CCTKi_CommandLineTestParameters(const char *optarg);
+void CCTKi_CommandLineWarningLevel(const char *optarg);
+void CCTKi_CommandLineErrorLevel(const char *optarg);
+void CCTKi_CommandLineRedirectStdout(void);
+void CCTKi_CommandLineListThorns(void);
+void CCTKi_CommandLineVersion(void);
+void CCTKi_CommandLineHelp(void);
+void CCTKi_CommandLineUsage(void);
+void CCTKi_CommandLineFinished(void);
 
 #ifdef __cplusplus 
 }
diff --git a/src/include/Dummies.h b/src/include/Dummies.h
index 76b06dde..b0801260 100644
--- a/src/include/Dummies.h
+++ b/src/include/Dummies.h
@@ -15,21 +15,21 @@
 extern "C" {
 #endif
 
-int CCTK_DummyStorageOn(void *GH, int group);
+int CCTKi_DummyStorageOn(void *GH, int group);
 
-int CCTK_DummyStorageOff(void *GH, int group);
+int CCTKi_DummyStorageOff(void *GH, int group);
 
-int CCTK_DummyCommunicationOn(void *GH, int group);
+int CCTKi_DummyCommunicationOn(void *GH, int group);
 
-int CCTK_DummyCommunicationOff(void *GH, int group);
+int CCTKi_DummyCommunicationOff(void *GH, int group);
 
-int CCTK_DummyTriggerable(int variable);
+int CCTKi_DummyTriggerable(int variable);
 
-int CCTK_DummyTriggerSaysGo(void *GH, int variable);
+int CCTKi_DummyTriggerSaysGo(void *GH, int variable);
 
-int CCTK_DummyTriggerAction(void *GH, int group);
+int CCTKi_DummyTriggerAction(void *GH, int group);
 
-int CCTK_DummyCallFunc(void *GH, int language, void *function);
+int CCTKi_DummyCallFunc(void *GH, int language, void *function);
 
 
 #ifdef __cplusplus
diff --git a/src/include/FortranString.h b/src/include/FortranString.h
index 6d413e4e..d2bcd9d6 100644
--- a/src/include/FortranString.h
+++ b/src/include/FortranString.h
@@ -28,19 +28,19 @@
     _fcd fcd_arg1, _fcd fcd_arg2, _fcd fcd_arg3
 #define ONE_FORTSTRING_CREATE(argn)\
        int len = _fcdlen(fcdarg); \
-       char *argn    = CCTK_NullTerminateString(_fcdtocp(fcdarg),len);;
+       char *argn    = Util_NullTerminateString(_fcdtocp(fcdarg),len);;
 #define TWO_FORTSTRINGS_CREATE(argn,argw)\
        int  nl    = _fcdlen(fcd_n);\
        int  wl    = _fcdlen(fcd_w);\
-       char *argn = CCTK_NullTerminateString(_fcdtocp(fcd_n),nl);\
-       char *argw = CCTK_NullTerminateString(_fcdtocp(fcd_w),wl);
+       char *argn = Util_NullTerminateString(_fcdtocp(fcd_n),nl);\
+       char *argw = Util_NullTerminateString(_fcdtocp(fcd_w),wl);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
        int  narg1    = _fcdlen(fcd_arg1);\
        int  narg2    = _fcdlen(fcd_arg2);\
        int  narg3    = _fcdlen(fcd_arg3);\
-       char *arg1 = CCTK_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\
-       char *arg2 = CCTK_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\
-       char *arg3 = CCTK_NullTerminateString(_fcdtocp(fcd_arg3),narg3);
+       char *arg1 = Util_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\
+       char *arg2 = Util_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\
+       char *arg3 = Util_NullTerminateString(_fcdtocp(fcd_arg3),narg3);
 
 #elif defined WIN32
 
@@ -56,14 +56,14 @@
    unsigned int CCTK_len2,\
    unsigned int CCTK_len3
 #define ONE_FORTSTRING_CREATE(argn)\
-        char *argn = CCTK_NullTerminateString(n,nl);
+        char *argn = Util_NullTerminateString(n,nl);
 #define TWO_FORTSTRINGS_CREATE(argn,argw)\
-    char *argn = CCTK_NullTerminateString(n,nl);\
-    char *argw = CCTK_NullTerminateString(w,wl);
+    char *argn = Util_NullTerminateString(n,nl);\
+    char *argw = Util_NullTerminateString(w,wl);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\
-   char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\
+   char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3);
 
 #else
 
@@ -83,14 +83,14 @@
    unsigned int CCTK_len2,\
    unsigned int CCTK_len3
 #define ONE_FORTSTRING_CREATE(arg1)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);
 #define TWO_FORTSTRINGS_CREATE(arg1,arg2)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);
 #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\
-   char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\
-   char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\
-   char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3);
+   char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\
+   char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\
+   char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3);
 
 #endif
 
diff --git a/src/include/GHExtensions.h b/src/include/GHExtensions.h
index 645c8558..04c57d15 100644
--- a/src/include/GHExtensions.h
+++ b/src/include/GHExtensions.h
@@ -24,13 +24,13 @@ int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *));
 
 int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int));
 
-int CCTK_SetupGHExtensions(tFleshConfig *config, 
+int CCTKi_SetupGHExtensions(tFleshConfig *config, 
 			   int convergence_level, 
 			   cGH *GH);
 
-int CCTK_InitGHExtensions(cGH *GH);
+int CCTKi_InitGHExtensions(cGH *GH);
 
-int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
+int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
 
 int CCTK_GHExtensionHandle(const char *name);
 
diff --git a/src/include/Misc.h b/src/include/Misc.h
index 35dc47d8..127c815b 100644
--- a/src/include/Misc.h
+++ b/src/include/Misc.h
@@ -19,14 +19,14 @@ int CCTK_SplitString(char **before, char **after, const char *string, const char
 
 int CCTK_Equals(const char *string1, const char *string2);
 
-char *CCTK_NullTerminateString(const char *, unsigned int);
+char *Util_NullTerminateString(const char *, unsigned int);
 
 int CCTK_InList(const char *string1, int n_elements, ...);
 
-int CCTK_IntInRange(int inval, const char *range);
-int CCTK_DoubleInRange(double inval, const char *range);
-int CCTK_IntInRangeList(int inval, int n_elements, ...);
-int CCTK_DoubleInRangeList(double inval, int n_elements, ...);
+int Util_IntInRange(int inval, const char *range);
+int Util_DoubleInRange(double inval, const char *range);
+int Util_IntInRangeList(int inval, int n_elements, ...);
+int Util_DoubleInRangeList(double inval, int n_elements, ...);
 
 int CCTK_SetDoubleInRangeList(CCTK_REAL *data, const char *value, 
 			      int n_elements, ...);
diff --git a/src/include/flesh.h b/src/include/flesh.h
index 8f99beec..107b71f5 100644
--- a/src/include/flesh.h
+++ b/src/include/flesh.h
@@ -92,7 +92,7 @@ int ProcessParameterDatabase(tFleshConfig *ConfigData);
 
 int CallStartupFunctions(tFleshConfig *ConfigData);
 
-int CCTK_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
+int CCTKi_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
 
 int CCTK_MaxDim(void);
 
@@ -104,7 +104,7 @@ int CCTK_VarTypeNumber(const char *type);
 
 int CCTK_GroupTypeNumber(const char *type);
 
-int CCTK_BindingsImplementationsInitialise(void);
+int CCTKi_BindingsImplementationsInitialise(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/include/rfrInterface.h b/src/include/rfrInterface.h
index 11eaba91..19d62e26 100644
--- a/src/include/rfrInterface.h
+++ b/src/include/rfrInterface.h
@@ -16,14 +16,14 @@
 extern "C" {
 #endif
 
-int CCTK_rfrTraverse(cGH *GH, int rfrpoint);
-int CCTK_rfrPrintTree(cGH *GH,void *rfr_top);
-int CCTK_rfrStorageOn(void *GH, int group);
-int CCTK_rfrStorageOff(void *GH, int group);
-int CCTK_rfrCommunicationOn(void *GH, int group);
-int CCTK_rfrCommunicationOff(void *GH, int group);
-int CCTK_rfrTriggerable(int entrypoint);
-int CCTK_rfrCallFunc(void *GH, int language, void *function);
+int CCTKi_rfrTraverse(cGH *GH, int rfrpoint);
+int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top);
+int CCTKi_rfrStorageOn(void *GH, int group);
+int CCTKi_rfrStorageOff(void *GH, int group);
+int CCTKi_rfrCommunicationOn(void *GH, int group);
+int CCTKi_rfrCommunicationOff(void *GH, int group);
+int CCTKi_rfrTriggerable(int entrypoint);
+int CCTKi_rfrCallFunc(void *GH, int language, void *function);
 
 #ifdef __cplusplus
 }
diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c
index fe008555..da012c09 100644
--- a/src/main/ActiveThorns.c
+++ b/src/main/ActiveThorns.c
@@ -41,7 +41,7 @@ static t_sktree *implist   = NULL;
 
 
  /*@@
-   @routine    CCTK_RegisterThorn
+   @routine    CCTKi_RegisterThorn
    @date       Sun Jul  4 17:44:14 1999
    @author     Tom Goodale
    @desc 
@@ -54,7 +54,7 @@ static t_sktree *implist   = NULL;
    @endhistory 
 
 @@*/
-int CCTK_RegisterThorn(const char *name, const char *imp)
+int CCTKi_RegisterThorn(const char *name, const char *imp)
 {
   int retval;
   t_sktree *node;
@@ -188,7 +188,7 @@ static int CCTKi_RegisterImp(const char *name, const char *thorn)
 
 
  /*@@
-   @routine    CCTK_ActivateThorn
+   @routine    CCTKi_ActivateThorn
    @date       Sun Jul  4 17:46:15 1999
    @author     Tom Goodale
    @desc 
@@ -202,7 +202,7 @@ static int CCTKi_RegisterImp(const char *name, const char *thorn)
    @endhistory 
 
 @@*/
-int CCTK_ActivateThorn(const char *name)
+int CCTKi_ActivateThorn(const char *name)
 {
   int retval;
   t_sktree *thornnode;
@@ -349,7 +349,7 @@ int CCTK_IsImplementationActive(const char *name)
 }
 
  /*@@
-   @routine    CCTK_ListThorns
+   @routine    CCTKi_ListThorns
    @date       Mon Jul  5 10:02:15 1999
    @author     Tom Goodale
    @desc 
@@ -363,7 +363,7 @@ int CCTK_IsImplementationActive(const char *name)
    @endhistory 
 
 @@*/
-int CCTK_ListThorns(FILE *file, const char *format, int active)
+int CCTKi_ListThorns(FILE *file, const char *format, int active)
 {
   int retval;
   t_sktree *node;
@@ -388,7 +388,7 @@ int CCTK_ListThorns(FILE *file, const char *format, int active)
 }
 
  /*@@
-   @routine    CCTK_ListImplementations
+   @routine    CCTKi_ListImplementations
    @date       Mon Jul  5 10:08:19 1999
    @author     Tom Goodale
    @desc 
@@ -402,7 +402,7 @@ int CCTK_ListThorns(FILE *file, const char *format, int active)
    @endhistory 
 
 @@*/
-int CCTK_ListImplementations(FILE *file, const char *format, int active)
+int CCTKi_ListImplementations(FILE *file, const char *format, int active)
 {
   int retval;
   t_sktree *node;
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 0adbd1cb..5c3cb6fc 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -88,7 +88,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
   /*** an rfrTraverse with CCTK_ANALYSIS      ***/
   ForallConvLevels(iteration, convergence_level)
   {
-      CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
+      CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
       CCTK_OutputGH(config->GH[convergence_level]);
   }
   EndForallConvLevels;
@@ -133,7 +133,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
     /* Dump out checkpoint data on all levels */
     ForallConvLevels(iteration, convergence_level)
     {
-      CCTK_rfrTraverse(config->GH[convergence_level],CCTK_CHECKPOINT);
+      CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_CHECKPOINT);
     }
     EndForallConvLevels;
 
@@ -144,7 +144,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
     /*** an rfrTraverse with CCTK_ANALYSIS      ***/
     ForallConvLevels(iteration, convergence_level)
     {
-        CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
+        CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
 	CCTK_OutputGH(config->GH[convergence_level]);
     }
     EndForallConvLevels;
@@ -247,7 +247,7 @@ void PreStepper(cGH *GH) {
   int Rstep;  
 
   /* Call the rfr with CCTK_PRESTEP */
-  CCTK_rfrTraverse(GH, CCTK_PRESTEP);
+  CCTKi_rfrTraverse(GH, CCTK_PRESTEP);
 }
  /*@@
    @routine    EvolStepper
@@ -267,7 +267,7 @@ void EvolStepper(cGH *GH)
 {
 
   /* Call the rfr with Evolution */
-  CCTK_rfrTraverse(GH, CCTK_EVOL);
+  CCTKi_rfrTraverse(GH, CCTK_EVOL);
   /* after Evolution check for NANs */
 
 }
@@ -289,7 +289,7 @@ void EvolStepper(cGH *GH)
 @@*/
 
 void BoundStepper(cGH *GH) {
-  CCTK_rfrTraverse(GH,CCTK_BOUND);
+  CCTKi_rfrTraverse(GH,CCTK_BOUND);
 }
 
  /*@@
@@ -309,7 +309,7 @@ void BoundStepper(cGH *GH) {
 void PostStepper(cGH *GH) {
   int Rstep;  
    /* Call the rfr with post step */
-    CCTK_rfrTraverse(GH, CCTK_POSTSTEP); 
+    CCTKi_rfrTraverse(GH, CCTK_POSTSTEP); 
 }
  /*@@
    @routine    TerminationStepper
@@ -349,5 +349,5 @@ void TerminationStepper(cGH *GH) {
     cactus_terminate=TERMINATION_RAISED_BRDCAST;
     printf("RECEIVED GLOBAL TERMINATION SIGNAL \n");
   }
-  CCTK_rfrTraverse(GH,CCTK_TERMINATE);
+  CCTKi_rfrTraverse(GH,CCTK_TERMINATE);
 }
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 8df990d9..0a70da4e 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -59,7 +59,7 @@ int CactusDefaultInitialise(tFleshConfig *config)
   convergence_level = 0;
   while((GH = CCTK_SetupGH(config, convergence_level)))
   {
-    CCTK_AddGH(config, convergence_level, GH);
+    CCTKi_AddGH(config, convergence_level, GH);
 
     CactusInitialiseGH(GH);
 
@@ -116,23 +116,23 @@ int CactusInitialiseGH(cGH *GH)
   GH->rfr_top = NULL;
 
   rfrInitTree(&(GH->rfr_top), 
-	      CCTK_rfrStorageOn,
-	      CCTK_rfrStorageOff,
-	      CCTK_rfrCommunicationOn,
-	      CCTK_rfrCommunicationOff,
-	      CCTK_rfrTriggerable,
-	      CCTK_rfrTriggerSaysGo,
-	      CCTK_rfrTriggerAction,
-	      CCTK_rfrCallFunc);
+	      CCTKi_rfrStorageOn,
+	      CCTKi_rfrStorageOff,
+	      CCTKi_rfrCommunicationOn,
+	      CCTKi_rfrCommunicationOff,
+	      CCTKi_rfrTriggerable,
+	      CCTKi_rfrTriggerSaysGo,
+	      CCTKi_rfrTriggerAction,
+	      CCTKi_rfrCallFunc);
 
   /* Do the rfr initialisation on this GH */
-  CCTK_BindingsScheduleRegister("RFRINIT", (void *)GH);
+  CCTKi_BindingsScheduleRegister("RFRINIT", (void *)GH);
 
   /* Report the rfr tree */
-  CCTK_rfrPrintTree(GH,GH->rfr_top);
+  CCTKi_rfrPrintTree(GH,GH->rfr_top);
 
   /* Initialise all the extensions. */
-  CCTK_InitGHExtensions(GH);
+  CCTKi_InitGHExtensions(GH);
 
 #define PUGH
 
@@ -140,23 +140,23 @@ int CactusInitialiseGH(cGH *GH)
   /* Do various rfr traversals.  Will tidy up later. */
 
   /* FIXME : PARAM_CHECK SHOULD BE BEFORE HERE */
-  CCTK_rfrTraverse(GH, CCTK_PARAMCHECK);
+  CCTKi_rfrTraverse(GH, CCTK_PARAMCHECK);
   CCTKi_FinaliseParamWarn();
 
-  CCTK_rfrTraverse(GH, CCTK_BASEGRID); 
+  CCTKi_rfrTraverse(GH, CCTK_BASEGRID); 
 
   /* Traverse routines setting up initial data */
-  CCTK_rfrTraverse(GH,CCTK_INITIAL);
+  CCTKi_rfrTraverse(GH,CCTK_INITIAL);
 
   /* Traverse poststep initial routines which should only be done once */
-  CCTK_rfrTraverse(GH,CCTK_POSTINITIAL);
+  CCTKi_rfrTraverse(GH,CCTK_POSTINITIAL);
 
   /* Ignore checkpointing for now.
-   * CCTK_rfrTraverse(GH,CCTK_RECOVER);
-   * CCTK_rfrTraverse(GH,CCTK_CPINITIAL);
+   * CCTKi_rfrTraverse(GH,CCTK_RECOVER);
+   * CCTKi_rfrTraverse(GH,CCTK_CPINITIAL);
    */
 
-  CCTK_rfrTraverse(GH,CCTK_POSTSTEP);
+  CCTKi_rfrTraverse(GH,CCTK_POSTSTEP);
 
 #endif
 
diff --git a/src/main/CallStartupFunctions.c b/src/main/CallStartupFunctions.c
index 9e70e39f..dfeab5c4 100644
--- a/src/main/CallStartupFunctions.c
+++ b/src/main/CallStartupFunctions.c
@@ -35,7 +35,7 @@ int CallStartupFunctions(tFleshConfig *ConfigData)
 {
 
 
-  CCTK_BindingsScheduleRegister("STARTUP", NULL);
+  CCTKi_BindingsScheduleRegister("STARTUP", NULL);
 
   /*  These used to be here to set the defaults afterwards.  Now set the default before. 
    *   SetupMainFunctions();
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index b400f5d6..6a73ca51 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -54,7 +54,7 @@ int CCTK_IsThornCompiled(const char *thorn) ;
 
 @@*/
 
-void CCTK_CommandLineTestThornCompiled(const char *optarg)
+void CCTKi_CommandLineTestThornCompiled(const char *optarg)
 {
   if(CCTK_IsThornCompiled(optarg))
   {
@@ -67,19 +67,19 @@ void CCTK_CommandLineTestThornCompiled(const char *optarg)
   exit(1);
 }
 
-void CCTK_CommandLineDescribeAllParameters(void)
+void CCTKi_CommandLineDescribeAllParameters(void)
 {
-  CCTK_BindingsParameterHelp(NULL,"%s",stdout);
+  CCTKi_BindingsParameterHelp(NULL,"%s",stdout);
   exit(1);
 }
 
-void CCTK_CommandLineDescribeParameter(const char *optarg)
+void CCTKi_CommandLineDescribeParameter(const char *optarg)
 {
-  CCTK_BindingsParameterHelp(optarg,"%s",stdout);
+  CCTKi_BindingsParameterHelp(optarg,"%s",stdout);
   exit(1);
 }
 
-void CCTK_CommandLineTestParameters(const char *optarg)
+void CCTKi_CommandLineTestParameters(const char *optarg)
 {
   int nprocs;
 
@@ -95,7 +95,7 @@ void CCTK_CommandLineTestParameters(const char *optarg)
 }
 
 /*@@
-   @routine    CCTK_CommandLineWarningLevel
+   @routine    CCTKi_CommandLineWarningLevel
    @date       Wed Feb 17 00:58:56 1999
    @author     Tom Goodale
    @desc 
@@ -108,7 +108,7 @@ void CCTK_CommandLineTestParameters(const char *optarg)
    @endhistory 
 @@*/
 
-void CCTK_CommandLineWarningLevel(const char *optarg)
+void CCTKi_CommandLineWarningLevel(const char *optarg)
 {
   int warninglevel;
 
@@ -119,7 +119,7 @@ void CCTK_CommandLineWarningLevel(const char *optarg)
 }
 
  /*@@
-   @routine    CCTK_CommandLineErrorLevel
+   @routine    CCTKi_CommandLineErrorLevel
    @date       Wed Feb 17 00:58:56 1999
    @author     Tom Goodale
    @desc 
@@ -132,7 +132,7 @@ void CCTK_CommandLineWarningLevel(const char *optarg)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineErrorLevel(const char *optarg)
+void CCTKi_CommandLineErrorLevel(const char *optarg)
 {
   int errorlevel;
 
@@ -143,7 +143,7 @@ void CCTK_CommandLineErrorLevel(const char *optarg)
 }
 
  /*@@
-   @routine    CCTK_CommandLineRedirectStdout
+   @routine    CCTKi_CommandLineRedirectStdout
    @date       Fri Jul 23 11:32:46 1999
    @author     Tom Goodale
    @desc 
@@ -156,7 +156,7 @@ void CCTK_CommandLineErrorLevel(const char *optarg)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineRedirectStdout(void)
+void CCTKi_CommandLineRedirectStdout(void)
 {
   /* Set the flag to say we need to redirect the stdout. */
 
@@ -164,7 +164,7 @@ void CCTK_CommandLineRedirectStdout(void)
 
 }
 
-void CCTK_CommandLineListThorns(void)
+void CCTKi_CommandLineListThorns(void)
 {
   int i;
   printf ("\n---------------Compiled Thorns-------------\n");
@@ -177,7 +177,7 @@ void CCTK_CommandLineListThorns(void)
 }
 
  /*@@
-   @routine    CCTK_CommandLineVersion
+   @routine    CCTKi_CommandLineVersion
    @date       Fri Jul 23 12:57:45 1999
    @author     Tom Goodale
    @desc 
@@ -190,7 +190,7 @@ void CCTK_CommandLineListThorns(void)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineVersion(void)
+void CCTKi_CommandLineVersion(void)
 {
   int argc;
   char **argv;
@@ -203,7 +203,7 @@ void CCTK_CommandLineVersion(void)
 }
 
  /*@@
-   @routine    CCTK_CommandLineHelp
+   @routine    CCTKi_CommandLineHelp
    @date       Fri Jul 23 12:57:23 1999
    @author     Tom Goodale
    @desc 
@@ -216,7 +216,7 @@ void CCTK_CommandLineVersion(void)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineHelp(void)
+void CCTKi_CommandLineHelp(void)
 {
   int argc;
   char **argv;
@@ -245,7 +245,7 @@ void CCTK_CommandLineHelp(void)
 }
 
  /*@@
-   @routine    CCTK_CommandLineUsage
+   @routine    CCTKi_CommandLineUsage
    @date       Fri Jul 23 12:57:04 1999
    @author     Tom Goodale
    @desc 
@@ -258,7 +258,7 @@ void CCTK_CommandLineHelp(void)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineUsage(void)
+void CCTKi_CommandLineUsage(void)
 {
   int argc;
   char **argv;
@@ -270,7 +270,7 @@ void CCTK_CommandLineUsage(void)
 }  
 
  /*@@
-   @routine    CCTK_CommandLineFinished
+   @routine    CCTKi_CommandLineFinished
    @date       Fri Jul 23 12:55:39 1999
    @author     Tom Goodale
    @desc 
@@ -284,7 +284,7 @@ void CCTK_CommandLineUsage(void)
    @endhistory 
 
 @@*/
-void CCTK_CommandLineFinished(void)
+void CCTKi_CommandLineFinished(void)
 {
   int myproc;
 
diff --git a/src/main/ConfigData.c b/src/main/ConfigData.c
index 6fb1f896..6f144ff6 100644
--- a/src/main/ConfigData.c
+++ b/src/main/ConfigData.c
@@ -15,7 +15,7 @@
 static char *rcsid = "$Id$";
 
  /*@@
-   @routine    CCTK_AddGH
+   @routine    CCTKi_AddGH
    @date       Fri Jan 15 13:43:11 1999
    @author     Tom Goodale
    @desc 
@@ -28,7 +28,7 @@ static char *rcsid = "$Id$";
    @endhistory 
 
 @@*/
-int CCTK_AddGH(tFleshConfig *config, int convergence_level, cGH *GH)
+int CCTKi_AddGH(tFleshConfig *config, int convergence_level, cGH *GH)
 {
   int retval;
 
diff --git a/src/main/Dummies.c b/src/main/Dummies.c
index 78a018ff..ff35d577 100644
--- a/src/main/Dummies.c
+++ b/src/main/Dummies.c
@@ -11,37 +11,37 @@
 
 static char *rcsid = "$Id$";
 
-int CCTK_DummyStorageOn(void *GH, int group)
+int CCTKi_DummyStorageOn(void *GH, int group)
 {
   return 0;
 }
 
-int CCTK_DummyStorageOff(void *GH, int group)
+int CCTKi_DummyStorageOff(void *GH, int group)
 {
   return 0;
 }
 
-int CCTK_DummyCommunicationOn(void *GH, int group)
+int CCTKi_DummyCommunicationOn(void *GH, int group)
 {
   return 0;
 }
 
-int CCTK_DummyCommunicationOff(void *GH, int group)
+int CCTKi_DummyCommunicationOff(void *GH, int group)
 {
   return 0;
 }
 
-int CCTK_DummyTriggerable(int variable)
+int CCTKi_DummyTriggerable(int variable)
 {
   return 0;
 }
 
-int CCTK_DummyTriggerSaysGo(void *GH, int variable)
+int CCTKi_DummyTriggerSaysGo(void *GH, int variable)
 {
   return 1;
 }
 
-int CCTK_DummyTriggerAction(void *GH, int group)
+int CCTKi_DummyTriggerAction(void *GH, int group)
 {
   return 0;
 }
diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c
index 7331169b..d91d7c7b 100644
--- a/src/main/GHExtensions.c
+++ b/src/main/GHExtensions.c
@@ -237,7 +237,7 @@ int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int))
  ***************************************************************************/
 
  /*@@
-   @routine    CCTK_SetupGHExtensions
+   @routine    CCTKi_SetupGHExtensions
    @date       Wed Feb  3 13:32:26 1999
    @author     Tom Goodale
    @desc 
@@ -250,7 +250,7 @@ int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int))
    @endhistory 
 
 @@*/
-int CCTK_SetupGHExtensions(tFleshConfig *config, 
+int CCTKi_SetupGHExtensions(tFleshConfig *config, 
 			   int convergence_level, 
 			   cGH *GH)
 {
@@ -293,7 +293,7 @@ int CCTK_SetupGHExtensions(tFleshConfig *config,
 
 
  /*@@
-   @routine    CCTK_InitGHExtensions
+   @routine    CCTKi_InitGHExtensions
    @date       Wed Feb  3 14:12:18 1999
    @author     Tom Goodale
    @desc 
@@ -306,7 +306,7 @@ int CCTK_SetupGHExtensions(tFleshConfig *config,
    @endhistory 
 
 @@*/
-int CCTK_InitGHExtensions(cGH *GH)
+int CCTKi_InitGHExtensions(cGH *GH)
 {
   int handle;
   struct GHExtension *extension;
@@ -322,7 +322,7 @@ int CCTK_InitGHExtensions(cGH *GH)
 
 
  /*@@
-   @routine    CCTK_rfrTraverseGHExtensions
+   @routine    CCTKi_rfrTraverseGHExtensions
    @date       Wed Feb  3 14:16:17 1999
    @author     Tom Goodale
    @desc 
@@ -335,7 +335,7 @@ int CCTK_InitGHExtensions(cGH *GH)
    @endhistory 
 
 @@*/
-int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint)
+int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint)
 {
   int handle;
   struct GHExtension *extension;
diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c
index fb416ada..69fd52e8 100644
--- a/src/main/InitialiseDataStructures.c
+++ b/src/main/InitialiseDataStructures.c
@@ -45,12 +45,12 @@ int InitialiseDataStructures(tFleshConfig *ConfigData)
 
   /* Initialise appropriate subsystems. */
 
-  CCTK_BindingsImplementationsInitialise();
-  CCTK_BindingsParametersInitialise();
-  CCTK_BindingsVariablesInitialise();
-  CCTK_BindingsScheduleInitialise();
+  CCTKi_BindingsImplementationsInitialise();
+  CCTKi_BindingsParametersInitialise();
+  CCTKi_BindingsVariablesInitialise();
+  CCTKi_BindingsScheduleInitialise();
 
-  CCTK_ActivateThorn("Cactus");
+  CCTKi_ActivateThorn("Cactus");
 
   return 0;
 }
diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 989044d5..fe2f84d2 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -72,18 +72,18 @@ int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData)
   
       switch (c)
       {
-	case 't': CCTK_CommandLineTestThornCompiled(optarg); break;
-	case 'O': CCTK_CommandLineDescribeAllParameters(); break;
-	case 'o': CCTK_CommandLineDescribeParameter(optarg); break;
-	case 'x': CCTK_CommandLineTestParameters(optarg); break;
-	case 'W': CCTK_CommandLineWarningLevel(optarg); break;
-	case 'E': CCTK_CommandLineErrorLevel(optarg); break;
-	case 'r': CCTK_CommandLineRedirectStdout(); break;
-	case 'T': CCTK_CommandLineListThorns(); break;
-	case 'v': CCTK_CommandLineVersion(); break;
+	case 't': CCTKi_CommandLineTestThornCompiled(optarg); break;
+	case 'O': CCTKi_CommandLineDescribeAllParameters(); break;
+	case 'o': CCTKi_CommandLineDescribeParameter(optarg); break;
+	case 'x': CCTKi_CommandLineTestParameters(optarg); break;
+	case 'W': CCTKi_CommandLineWarningLevel(optarg); break;
+	case 'E': CCTKi_CommandLineErrorLevel(optarg); break;
+	case 'r': CCTKi_CommandLineRedirectStdout(); break;
+	case 'T': CCTKi_CommandLineListThorns(); break;
+	case 'v': CCTKi_CommandLineVersion(); break;
 	case 'h': 
 	case '?':
-	  CCTK_CommandLineHelp(); break;
+	  CCTKi_CommandLineHelp(); break;
 	default:
 	  printf ("?? getopt returned character code 0%o ??\n", c);
       }
@@ -95,15 +95,15 @@ int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData)
     }
     else
     {
-      CCTK_CommandLineUsage();
+      CCTKi_CommandLineUsage();
     }
   }
   else
   {
-    CCTK_CommandLineUsage();
+    CCTKi_CommandLineUsage();
   }
 
-  CCTK_CommandLineFinished();
+  CCTKi_CommandLineFinished();
 
   return 0;
 }
diff --git a/src/main/SetParams.c b/src/main/SetParams.c
index 07d54226..2f766eb3 100644
--- a/src/main/SetParams.c
+++ b/src/main/SetParams.c
@@ -55,7 +55,7 @@ int CCTK_SetParameter(const char *parameter, const char *value)
       }
 
       thornname[length] = '\0';
-      n_errors += CCTK_ActivateThorn(thornname) != 0;
+      n_errors += CCTKi_ActivateThorn(thornname) != 0;
       if(*position) position++;
     }
 
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
index 17421162..ba484999 100644
--- a/src/main/rfrInterface.c
+++ b/src/main/rfrInterface.c
@@ -26,7 +26,7 @@ static char *rcsid = "$Header$";
 
 
  /*@@
-   @routine    CCTK_rfrTraverse
+   @routine    CCTKi_rfrTraverse
    @date       Wed Feb  3 14:45:57 1999
    @author     Tom Goodale
    @desc 
@@ -39,10 +39,10 @@ static char *rcsid = "$Header$";
    @endhistory 
 
 @@*/
-int CCTK_rfrTraverse(cGH *GH, int rfrpoint)
+int CCTKi_rfrTraverse(cGH *GH, int rfrpoint)
 {
   
-  CCTK_rfrTraverseGHExtensions(GH, rfrpoint);
+  CCTKi_rfrTraverseGHExtensions(GH, rfrpoint);
 
   return 0;
 }
@@ -75,7 +75,7 @@ int CCTK_rfrTraverse(cGH *GH, int rfrpoint)
    @version    $Header$
 @@*/
 
-int CCTK_rfrPrintTree(cGH *GH,void *rfr_top)
+int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top)
 {
   DECLARE_CCTK_PARAMETERS
 
@@ -117,7 +117,7 @@ int CCTK_rfrPrintTree(cGH *GH,void *rfr_top)
 }
 
  /*@@
-   @routine    CCTK_rfrStorageOn
+   @routine    CCTKi_rfrStorageOn
    @date       Sat Feb 13 17:06:30 1999
    @author     Tom Goodale
    @desc 
@@ -130,7 +130,7 @@ int CCTK_rfrPrintTree(cGH *GH,void *rfr_top)
    @endhistory 
 
 @@*/
-int CCTK_rfrStorageOn(void *GH, int group)
+int CCTKi_rfrStorageOn(void *GH, int group)
 {
   int retcode;
   char *group_name;
@@ -154,7 +154,7 @@ int CCTK_rfrStorageOn(void *GH, int group)
 }
 
  /*@@
-   @routine    CCTK_rfrStorageOff
+   @routine    CCTKi_rfrStorageOff
    @date       Sat Feb 13 17:06:30 1999
    @author     Tom Goodale
    @desc 
@@ -167,7 +167,7 @@ int CCTK_rfrStorageOn(void *GH, int group)
    @endhistory 
 
 @@*/
-int CCTK_rfrStorageOff(void *GH, int group)
+int CCTKi_rfrStorageOff(void *GH, int group)
 {
   int retcode;
   char *group_name;
@@ -191,7 +191,7 @@ int CCTK_rfrStorageOff(void *GH, int group)
 }
 
  /*@@
-   @routine    CCTK_rfrCommunicationOn
+   @routine    CCTKi_rfrCommunicationOn
    @date       Sat Feb 13 17:06:30 1999
    @author     Tom Goodale
    @desc 
@@ -204,7 +204,7 @@ int CCTK_rfrStorageOff(void *GH, int group)
    @endhistory 
 
 @@*/
-int CCTK_rfrCommunicationOn(void *GH, int group)
+int CCTKi_rfrCommunicationOn(void *GH, int group)
 {
   int retcode;
   char *group_name;
@@ -228,7 +228,7 @@ int CCTK_rfrCommunicationOn(void *GH, int group)
 }
 
  /*@@
-   @routine    CCTK_rfrCommunicationOff
+   @routine    CCTKi_rfrCommunicationOff
    @date       Sat Feb 13 17:06:30 1999
    @author     Tom Goodale
    @desc 
@@ -241,7 +241,7 @@ int CCTK_rfrCommunicationOn(void *GH, int group)
    @endhistory 
 
 @@*/
-int CCTK_rfrCommunicationOff(void *GH, int group)
+int CCTKi_rfrCommunicationOff(void *GH, int group)
 {
   int retcode;
   char *group_name;
@@ -265,7 +265,7 @@ int CCTK_rfrCommunicationOff(void *GH, int group)
 }
 
  /*@@
-   @routine    CCTK_rfrTriggerable
+   @routine    CCTKi_rfrTriggerable
    @date       Sat March 6 1999
    @author     Gabrielle Allen
    @desc 
@@ -286,7 +286,7 @@ int CCTK_rfrCommunicationOff(void *GH, int group)
    @endvar 
 @@*/
 
-int CCTK_rfrTriggerable(int entrypoint)
+int CCTKi_rfrTriggerable(int entrypoint)
 {
   if (entrypoint == CCTK_ANALYSIS)
     {
@@ -299,7 +299,7 @@ int CCTK_rfrTriggerable(int entrypoint)
 
 
  /*@@
-   @routine    CCTK_rfrCallFunc
+   @routine    CCTKi_rfrCallFunc
    @date       Sat Feb 13 17:08:39 1999
    @author     Tom Goodale
    @desc 
@@ -312,7 +312,7 @@ int CCTK_rfrTriggerable(int entrypoint)
    @endhistory 
 
 @@*/
-int CCTK_rfrCallFunc(void *GH, int language, void *function)
+int CCTKi_rfrCallFunc(void *GH, int language, void *function)
 {
 
   void (*calledfunc)(void *);
diff --git a/src/util/Misc.c b/src/util/Misc.c
index 39159e01..49915fda 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -161,7 +161,7 @@ int FMODIFIER FORTRAN_NAME(CCTK_Equals)(const char **arg1,ONE_FORTSTRING_ARG)
 
 
 /*@@
-  @routine CCTK_NullTerminateString
+  @routine Util_NullTerminateString
   @author Paul Walker
   @desc 
   Null terminates a fortran string. Remember to free
@@ -170,13 +170,13 @@ int FMODIFIER FORTRAN_NAME(CCTK_Equals)(const char **arg1,ONE_FORTSTRING_ARG)
 
 @@*/
 
-char *CCTK_NullTerminateString(const char *instring, unsigned int len) 
+char *Util_NullTerminateString(const char *instring, unsigned int len) 
 {
   char *outstring;
   unsigned int i;
 
 #ifdef DEBUG_MISC
-  printf("CCTK_NullTerminateString: -%s-, (%u)\n",instring,len);
+  printf("Util_NullTerminateString: -%s-, (%u)\n",instring,len);
 #endif
 
   outstring = (char *)malloc((len+2)*sizeof(char));
@@ -237,7 +237,7 @@ int CCTK_InList(const char *string1, int n_elements, ...)
 	 
 
  /*@@
-   @routine    CCTK_IntInRange
+   @routine    Util_IntInRange
    @date       Wed Jan 20 10:32:36 1999
    @author     Tom Goodale
    @desc 
@@ -251,13 +251,13 @@ int CCTK_InList(const char *string1, int n_elements, ...)
    @endhistory 
 
 @@*/
-int CCTK_IntInRange(int inval, const char *range)
+int Util_IntInRange(int inval, const char *range)
 {
   return 1;
 }
 
  /*@@
-   @routine    CCTK_DoubleInRange
+   @routine    Util_DoubleInRange
    @date       Wed Jan 20 10:32:36 1999
    @author     Tom Goodale
    @desc 
@@ -271,14 +271,14 @@ int CCTK_IntInRange(int inval, const char *range)
    @endhistory 
 
 @@*/
-int CCTK_DoubleInRange(double inval, const char *range)
+int Util_DoubleInRange(double inval, const char *range)
 {
   return 1;
 }
 
 
  /*@@
-   @routine    CCTK_IntInRangeList
+   @routine    Util_IntInRangeList
    @date       Wed Jan 20 10:36:31 1999
    @author     Tom Goodale
    @desc 
@@ -291,7 +291,7 @@ int CCTK_DoubleInRange(double inval, const char *range)
    @endhistory 
 
 @@*/
-int CCTK_IntInRangeList(int inval, int n_elements, ...)
+int Util_IntInRangeList(int inval, int n_elements, ...)
 {
   int retval;
   int arg;
@@ -308,7 +308,7 @@ int CCTK_IntInRangeList(int inval, int n_elements, ...)
   {    
     element = va_arg(ap, char *);
 
-    if(CCTK_IntInRange(inval, element))
+    if(Util_IntInRange(inval, element))
     {
       retval = 1;
       break;
@@ -323,7 +323,7 @@ int CCTK_IntInRangeList(int inval, int n_elements, ...)
 
 
  /*@@
-   @routine    CCTK_DoubleInRangeList
+   @routine    Util_DoubleInRangeList
    @date       Wed Jan 20 10:36:31 1999
    @author     Tom Goodale
    @desc 
@@ -336,7 +336,7 @@ int CCTK_IntInRangeList(int inval, int n_elements, ...)
    @endhistory 
 
 @@*/
-int CCTK_DoubleInRangeList(double inval, int n_elements, ...)
+int Util_DoubleInRangeList(double inval, int n_elements, ...)
 {
   int retval;
   int arg;
@@ -353,7 +353,7 @@ int CCTK_DoubleInRangeList(double inval, int n_elements, ...)
   {    
     element = va_arg(ap, char *);
 
-    if(CCTK_DoubleInRange(inval, element))
+    if(Util_DoubleInRange(inval, element))
     {
       retval = 1;
       break;
@@ -422,7 +422,7 @@ int CCTK_SetDoubleInRangeList(CCTK_REAL *data, const char *value,
   {    
     element = va_arg(ap, char *);
 
-    if(CCTK_DoubleInRange(inval, element))
+    if(Util_DoubleInRange(inval, element))
     {
       retval = 0;
       *data = inval;
@@ -474,7 +474,7 @@ int CCTK_SetIntInRangeList(CCTK_INT *data, const char *value,
   {    
     element = va_arg(ap, char *);
 
-    if(CCTK_IntInRange(inval, element))
+    if(Util_IntInRange(inval, element))
     {
       retval = 0;
       *data = inval;