More subroutine name changes

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

8 files changed, 74 insertions, 74 deletions

diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index 75c12cd6..9ce96f70 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -47,8 +47,8 @@ static int DummyTimeToOutput(cGH *GH, int var);
    @desc 
                Registers a new IO method.
    @enddesc 
-   @calls      CCTK_GetHandle
-               CCTK_NewHandle
+   @calls      Util_GetHandle
+               Util_NewHandle
    @history 
    @endhistory
  
@@ -76,7 +76,7 @@ int CCTK_RegisterIOMethod(const char *name)
   struct IOMethod *new_method;
 
   /* Check that the method hasn't already been registered */
-  handle = CCTK_GetHandle(IOMethods, name, NULL);
+  handle = Util_GetHandle(IOMethods, name, NULL);
 
   if(handle < 0)
   {
@@ -86,7 +86,7 @@ int CCTK_RegisterIOMethod(const char *name)
     if(new_method)
     {
       /* Get a handle for it. */
-      handle = CCTK_NewHandle(&IOMethods, name, new_method);
+      handle = Util_NewHandle(&IOMethods, name, new_method);
 
       /* Initialise the IO method structure with dummy routines */
       new_method->OutputGH      = DummyOutputGH;
@@ -120,7 +120,7 @@ int CCTK_RegisterIOMethod(const char *name)
    @desc 
                Registers a function to register a routine for OutputGH.
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
    @calledby   
    @history 
    @endhistory 
@@ -155,7 +155,7 @@ int CCTK_RegisterIOMethodOutputGH(int handle, int (*func)(cGH *))
   struct IOMethod *method;
 
   /* Get the method. */
-  method = CCTK_GetHandledData(IOMethods, handle);
+  method = Util_GetHandledData(IOMethods, handle);
 
   if(method)
   {
@@ -178,7 +178,7 @@ int CCTK_RegisterIOMethodOutputGH(int handle, int (*func)(cGH *))
    @desc 
                Registers a function to register a routine for OutputVarAs
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
    @calledby   
    @history 
    @endhistory 
@@ -214,7 +214,7 @@ int CCTK_RegisterIOMethodOutputVarAs(int handle, int (*func)(cGH *,
   struct IOMethod *method;
 
   /* Get the extension. */
-  method = CCTK_GetHandledData(IOMethods, handle);
+  method = Util_GetHandledData(IOMethods, handle);
 
   if(method)
   {
@@ -235,7 +235,7 @@ int CCTK_RegisterIOMethodTriggerOutput(int handle, int (*func)(cGH *, int))
   struct IOMethod *method;
 
   /* Get the extension. */
-  method = CCTK_GetHandledData(IOMethods, handle);
+  method = Util_GetHandledData(IOMethods, handle);
 
   if(method)
   {
@@ -257,7 +257,7 @@ int CCTK_RegisterIOMethodTriggerOutput(int handle, int (*func)(cGH *, int))
    @desc 
                Registers a function to register a routine for TimeToOutput
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
    @calledby   
    @history 
    @endhistory 
@@ -292,7 +292,7 @@ int CCTK_RegisterIOMethodTimeToOutput(int handle, int (*func)(cGH *, int))
   struct IOMethod *method;
 
   /* Get the extension. */
-  method = CCTK_GetHandledData(IOMethods, handle);
+  method = Util_GetHandledData(IOMethods, handle);
 
   if(method)
   {
@@ -409,7 +409,7 @@ int CactusDefaultOutputGH(cGH *GH)
 
   for (handle = 0;;handle++)
   {
-    method = (struct IOMethod *)CCTK_GetHandledData(IOMethods, handle);
+    method = (struct IOMethod *)Util_GetHandledData(IOMethods, handle);
     if (method)
     {
 
@@ -484,7 +484,7 @@ int CactusDefaultOutputVarAsByMethod(cGH *GH,
 {
   struct IOMethod *method = NULL;
 
-  CCTK_GetHandle (IOMethods, methodname, (void **) &method);
+  Util_GetHandle (IOMethods, methodname, (void **) &method);
   if (! method)
   {
     return -1;
@@ -523,7 +523,7 @@ void FMODIFIER FORTRAN_NAME (CCTK_OutputVarAsByMethod)
                Loops over all methods for a given variable,
                calling each methods OutputVarAs routine
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
                IOMethod->OutputVarAs
    @history 
    @endhistory 
@@ -567,7 +567,7 @@ int CCTK_OutputVarAs(cGH *GH, const char *var, const char *alias)
   
   for (handle = 0;;handle++)
   {
-    method = (struct IOMethod *)CCTK_GetHandledData(IOMethods, handle);
+    method = (struct IOMethod *)Util_GetHandledData(IOMethods, handle);
     if (method)
     {
       method->OutputVarAs(GH, var, alias);
@@ -685,7 +685,7 @@ int CCTK_OutputVarByMethod(cGH *GH, const char *var, const char *method)
                Checks if a trigger registered for a routine is
                due for output by any IO method.
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
                IOMethod->TimeToOutput
    @history  
    @endhistory 
@@ -722,7 +722,7 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
   /* Loop over all registered IO methods */
   for (handle = 0;;handle++)
   {
-    method = (struct IOMethod *)CCTK_GetHandledData(IOMethods, handle);
+    method = (struct IOMethod *)Util_GetHandledData(IOMethods, handle);
     if (method)
     {
       /* Check if it is time to output this variable for this method*/
@@ -749,7 +749,7 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
                but now calls each IO method for which it is 
                time to output the trigger
    @enddesc 
-   @calls      CCTK_GetHandledData
+   @calls      Util_GetHandledData
                CCTK_FullName
 	       CCTK_VarName
                IOMethod->TimeToOutput
@@ -800,7 +800,7 @@ int CCTKi_rfrTriggerAction(void *GH, int variable)
   /* Loop over all registered IO methods */
   for (handle = 0;;handle++)
   {
-    method = (struct IOMethod *)CCTK_GetHandledData(IOMethods, handle);
+    method = (struct IOMethod *)Util_GetHandledData(IOMethods, handle);
     if (method)
     {
 
diff --git a/src/comm/Interp.c b/src/comm/Interp.c
index b0efca49..4f2b51eb 100644
--- a/src/comm/Interp.c
+++ b/src/comm/Interp.c
@@ -62,12 +62,12 @@ int CCTK_RegisterInterpOperator(int (*function)(REGISTER_INTERP_ARGLIST),
   int handle;
 
   /* Check that the method hasn't already been registered */
-  handle = CCTK_GetHandle(InterpOperators, name, NULL);
+  handle = Util_GetHandle(InterpOperators, name, NULL);
 
   if(handle < 0)
   {
     /* Get a handle for it. */
-    handle = CCTK_NewHandle(&InterpOperators, name, (void *)function);
+    handle = Util_NewHandle(&InterpOperators, name, (void *)function);
     
     /* Remember how many interpolation operators there are */
     num_interps++;
@@ -113,7 +113,7 @@ int CCTK_GetInterpHandle(const char *interp)
   int handle;
   void **data=NULL; /* isn't used here */
 
-  handle = CCTK_GetHandle(InterpOperators, interp, data);
+  handle = Util_GetHandle(InterpOperators, interp, data);
 
 #ifdef DEBUG_INTERP
   CCTK_PRINTSEPARATOR
@@ -235,7 +235,7 @@ int CCTK_InterpGF (cGH *GH,
   else
   {
     function = (int (*)(REGISTER_INTERP_ARGLIST))
-      CCTK_GetHandledData(InterpOperators,operation_handle);
+      Util_GetHandledData(InterpOperators,operation_handle);
     
     if (function)
     {
@@ -331,7 +331,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_InterpGF)(cGH *GH,
   else
   {
     function = (int (*)(REGISTER_INTERP_ARGLIST))
-      CCTK_GetHandledData(InterpOperators,*operation_handle);
+      Util_GetHandledData(InterpOperators,*operation_handle);
     
     if (function)
     {
@@ -513,7 +513,7 @@ int CCTK_Interp (cGH *GH,
   else
   {
     function = (int (*)(REGISTER_INTERP_ARGLIST))
-      CCTK_GetHandledData(InterpOperators,operation_handle);
+      Util_GetHandledData(InterpOperators,operation_handle);
     
     if (function)
     {
@@ -663,7 +663,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_Interp)(cGH *GH,
   else
   {
     function = (int (*)(REGISTER_INTERP_ARGLIST))
-      CCTK_GetHandledData(InterpOperators,*operation_handle);
+      Util_GetHandledData(InterpOperators,*operation_handle);
     
     if (function)
     {
diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c
index 9fe386bd..0cc25db8 100644
--- a/src/comm/Reduction.c
+++ b/src/comm/Reduction.c
@@ -57,12 +57,12 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
   int handle;
 
   /* Check that the method hasn't already been registered */
-  handle = CCTK_GetHandle(ReductionOperators, name, NULL);
+  handle = Util_GetHandle(ReductionOperators, name, NULL);
 
   if(handle < 0)
   {
     /* Get a handle for it. */
-    handle = CCTK_NewHandle(&ReductionOperators, name, (void *)function);
+    handle = Util_NewHandle(&ReductionOperators, name, (void *)function);
     
     /* Remember how many reduction operators there are */
     num_reductions++;
@@ -108,7 +108,7 @@ int CCTK_ReductionHandle(const char *reduction)
   int handle;
   void **data=NULL; /* isn't used here */
 
-  handle = CCTK_GetHandle(ReductionOperators, reduction, data);
+  handle = Util_GetHandle(ReductionOperators, reduction, data);
 
 #ifdef DEBUG_REDUCTION
   CCTK_PRINTSEPARATOR
@@ -160,7 +160,7 @@ int CCTK_Reduce(  cGH *GH,
   else
   {
     function = (void (*)(REGISTER_ARGLIST))
-      CCTK_GetHandledData(ReductionOperators,operation_handle);
+      Util_GetHandledData(ReductionOperators,operation_handle);
     
     if (function)
       {
@@ -209,7 +209,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_Reduce)(cGH *GH,
   else
   {
     function = (void (*)(REGISTER_ARGLIST))
-      CCTK_GetHandledData(ReductionOperators,*operation_handle);
+      Util_GetHandledData(ReductionOperators,*operation_handle);
     
     if (function)
       {
diff --git a/src/include/ParameterData.h b/src/include/ParameterData.h
index e4405b92..97e5283e 100644
--- a/src/include/ParameterData.h
+++ b/src/include/ParameterData.h
@@ -10,5 +10,5 @@
 
 int ProcessParameterDatabase(tFleshConfig *ConfigData);
 
-int CCTK_InitialiseParameters(tFleshConfig *ConfigData);
+int CCTKi_InitialiseParameters(tFleshConfig *ConfigData);
 
diff --git a/src/include/StoreHandledData.h b/src/include/StoreHandledData.h
index ec63394d..db7e36a7 100644
--- a/src/include/StoreHandledData.h
+++ b/src/include/StoreHandledData.h
@@ -34,11 +34,11 @@ extern "C"
 {
 #endif
 
-int CCTK_NewHandle(cHandledData **storage, const char *name, void *data);
-int CCTK_DeleteHandle(cHandledData *storage, int handle);
-void *CCTK_GetHandledData(cHandledData *storage, int handle);
-int CCTK_GetHandle(cHandledData *storage, const char *name, void **data);
-char *CCTK_GetHandleName(cHandledData *storage, int handle);
+int Util_NewHandle(cHandledData **storage, const char *name, void *data);
+int Util_DeleteHandle(cHandledData *storage, int handle);
+void *Util_GetHandledData(cHandledData *storage, int handle);
+int Util_GetHandle(cHandledData *storage, const char *name, void **data);
+char *Util_GetHandleName(cHandledData *storage, int handle);
 
 #ifdef __cplusplus 
 }
diff --git a/src/main/Coord.c b/src/main/Coord.c
index 5fcb7637..b7e10b60 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -33,7 +33,7 @@ static int num_coords = 0;
                Register a GF as a coordinate with a name, and index
 	       and a direction
    @enddesc 
-   @calls      CCTK_GetHandle, CCTK_NewHandle, CCTK_Warn
+   @calls      Util_GetHandle, Util_NewHandle, CCTK_Warn
 
    @var        name        
    @vdesc      Name coordinate is registered as
@@ -73,7 +73,7 @@ int CCTK_RegisterCoordI(const char *name, int index, int dir)
   struct Coordprops *new_coord;
 
   /* Check that the method hasn't already been registered */
-  handle = CCTK_GetHandle(coordinates, name, NULL);
+  handle = Util_GetHandle(coordinates, name, NULL);
 
   if(handle < 0)
   {
@@ -83,7 +83,7 @@ int CCTK_RegisterCoordI(const char *name, int index, int dir)
     if(new_coord)
     {
       /* Get a handle for it. */
-      handle = CCTK_NewHandle(&coordinates, name, new_coord);
+      handle = Util_NewHandle(&coordinates, name, new_coord);
 
       /* Initialise the coordinate properties structure */
       new_coord->name      = (char *)name;
@@ -196,7 +196,7 @@ int CCTK_CoordIndex(const char *name)
 
   for (handle = 0;;handle++)
   {
-    coord = (struct Coordprops *)CCTK_GetHandledData(coordinates, handle);
+    coord = (struct Coordprops *)Util_GetHandledData(coordinates, handle);
     if (coord)
     {
       if (CCTK_Equals(name,(const char *)coord->name))
@@ -230,7 +230,7 @@ CCTK_REAL CCTK_CoordOrigin(const char *name)
 
   for (handle = 0;;handle++)
   {
-    coord = (struct Coordprops *)CCTK_GetHandledData(coordinates, handle);
+    coord = (struct Coordprops *)Util_GetHandledData(coordinates, handle);
     if (coord)
     {
       if (CCTK_Equals(name,(const char *)coord->name))
diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c
index d91d7c7b..336bd6a8 100644
--- a/src/main/GHExtensions.c
+++ b/src/main/GHExtensions.c
@@ -82,7 +82,7 @@ int CCTK_RegisterGHExtension(const char *name)
   struct GHExtension *new_extension;
 
   /* Check that the extension hasn't already been registered */
-  handle = CCTK_GetHandle(GHExtensions, name, NULL);
+  handle = Util_GetHandle(GHExtensions, name, NULL);
 
   if(handle < 0)
   {
@@ -92,7 +92,7 @@ int CCTK_RegisterGHExtension(const char *name)
     if(new_extension)
     {
       /* Get a handle for it. */
-      handle = CCTK_NewHandle(&GHExtensions, name, new_extension);
+      handle = Util_NewHandle(&GHExtensions, name, new_extension);
 
       /* Initialise the extension structure. */
       new_extension->InitGH = NULL;
@@ -144,7 +144,7 @@ int CCTK_RegisterGHExtensionSetupGH(int handle,
   struct GHExtension *extension;
 
   /* Get the extension. */
-  extension = CCTK_GetHandledData(GHExtensions, handle);
+  extension = Util_GetHandledData(GHExtensions, handle);
 
   if(extension)
   {
@@ -179,7 +179,7 @@ int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *))
   struct GHExtension *extension;
 
   /* Get the extension. */
-  extension = CCTK_GetHandledData(GHExtensions, handle);
+  extension = Util_GetHandledData(GHExtensions, handle);
 
   if(extension)
   {
@@ -214,7 +214,7 @@ int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int))
   struct GHExtension *extension;
 
   /* Get the extension. */
-  extension = CCTK_GetHandledData(GHExtensions, handle);
+  extension = Util_GetHandledData(GHExtensions, handle);
 
   if(extension)
   {
@@ -268,7 +268,7 @@ int CCTKi_SetupGHExtensions(tFleshConfig *config,
       for(handle = 0; handle < num_extensions; handle++)
       {
 	/* Call the SetupGH routines for each extension. */
-	extension =  (struct GHExtension *)CCTK_GetHandledData(GHExtensions, handle);
+	extension =  (struct GHExtension *)Util_GetHandledData(GHExtensions, handle);
 	GH->extensions[handle] = extension->SetupGH(config, 
 						    convergence_level, 
 						    GH);
@@ -313,7 +313,7 @@ int CCTKi_InitGHExtensions(cGH *GH)
 
   for(handle = 0; handle < num_extensions; handle++)
   {
-    extension =  (struct GHExtension *)CCTK_GetHandledData(GHExtensions, handle);
+    extension =  (struct GHExtension *)Util_GetHandledData(GHExtensions, handle);
     extension->InitGH(GH);
   }
 
@@ -342,7 +342,7 @@ int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint)
 
   for(handle = 0; handle < num_extensions; handle++)
   {
-    extension =  (struct GHExtension *)CCTK_GetHandledData(GHExtensions, handle);
+    extension =  (struct GHExtension *)Util_GetHandledData(GHExtensions, handle);
     extension->rfrTraverseGH(GH, rfrpoint);
   }
 
@@ -382,7 +382,7 @@ static int CheckAllExtensionsSetup(void)
   /* Check all registered extensions. */
   for(handle = 0; handle < num_extensions; handle++)
   {
-    extension =  (struct GHExtension *)CCTK_GetHandledData(GHExtensions, handle);
+    extension =  (struct GHExtension *)Util_GetHandledData(GHExtensions, handle);
 
     /* Check that each function has been registered.
      * Print a warning if not, and then register a dummy function.
@@ -391,7 +391,7 @@ static int CheckAllExtensionsSetup(void)
     /* SetupGH */
     if(!extension->SetupGH)
     {
-      const char *handlename = CCTK_GetHandleName(GHExtensions, handle);
+      const char *handlename = Util_GetHandleName(GHExtensions, handle);
       char *message = (char *)malloc(300*sizeof(char));
       sprintf(message,"GH Extension '%s' has not registered a SetupGH routine",handlename);
       CCTK_Warn(4,__LINE__,CCTK_THORNSTRING,message,__FILE__) ;
@@ -402,7 +402,7 @@ static int CheckAllExtensionsSetup(void)
     /*  InitGH */
     if(!extension->InitGH)
     {   
-      const char *handlename = CCTK_GetHandleName(GHExtensions, handle);
+      const char *handlename = Util_GetHandleName(GHExtensions, handle);
       char *message = (char *)malloc(300*sizeof(char));
       sprintf(message,"GH Extension '%s' has not registered a InitGH routine",handlename);
       CCTK_Warn(4,__LINE__,CCTK_THORNSTRING,message,__FILE__) ;
@@ -413,7 +413,7 @@ static int CheckAllExtensionsSetup(void)
     /* rfrTraverse */
     if(!extension->rfrTraverseGH)
     {
-      const char *handlename = CCTK_GetHandleName(GHExtensions, handle);
+      const char *handlename = Util_GetHandleName(GHExtensions, handle);
       char *message = (char *)malloc(300*sizeof(char));
       sprintf(message,"GH Extension '%s' has not registered a rfrTraverse routine",handlename);
       CCTK_Warn(4,__LINE__,CCTK_THORNSTRING,message,__FILE__) ;
@@ -448,7 +448,7 @@ static int CheckAllExtensionsSetup(void)
 @@*/
 int CCTK_GHExtensionHandle(const char *name)
 {
-  return CCTK_GetHandle(GHExtensions, name, NULL);
+  return Util_GetHandle(GHExtensions, name, NULL);
 }
 
 
diff --git a/src/util/StoreHandledData.c b/src/util/StoreHandledData.c
index da530695..9bf0967f 100644
--- a/src/util/StoreHandledData.c
+++ b/src/util/StoreHandledData.c
@@ -29,7 +29,7 @@ static int FindNextUnused(cHandledData *storage, int first);
 
 
  /*@@
-   @routine    CCTK_NewHandle
+   @routine    Util_NewHandle
    @date       Fri May  8 12:56:43 1998
    @author     Tom Goodale
    @desc 
@@ -44,7 +44,7 @@ static int FindNextUnused(cHandledData *storage, int first);
 
 @@*/
 
-int CCTK_NewHandle(cHandledData **storage, const char *name, void *data)
+int Util_NewHandle(cHandledData **storage, const char *name, void *data)
 {
   int return_code;
 
@@ -133,7 +133,7 @@ int CCTK_NewHandle(cHandledData **storage, const char *name, void *data)
 }
 
  /*@@
-   @routine    CCTK_DeleteHandle
+   @routine    Util_DeleteHandle
    @date       Fri May  8 14:13:16 1998
    @author     Tom Goodale
    @desc 
@@ -146,7 +146,7 @@ int CCTK_NewHandle(cHandledData **storage, const char *name, void *data)
    @endhistory 
 
 @@*/
-int CCTK_DeleteHandle(cHandledData *storage, int handle)
+int Util_DeleteHandle(cHandledData *storage, int handle)
 {
   int return_code;
 
@@ -213,7 +213,7 @@ static int FindNextUnused(cHandledData *storage, int first)
 }
     
  /*@@
-   @routine    CCTK_GetHandledData
+   @routine    Util_GetHandledData
    @date       Fri May  8 17:36:33 1998
    @author     Tom Goodale
    @desc 
@@ -226,7 +226,7 @@ static int FindNextUnused(cHandledData *storage, int first)
    @endhistory 
 
 @@*/
-void *CCTK_GetHandledData(cHandledData *storage, int handle)
+void *Util_GetHandledData(cHandledData *storage, int handle)
 {
   void *data;
 
@@ -255,7 +255,7 @@ void *CCTK_GetHandledData(cHandledData *storage, int handle)
 }
 
  /*@@
-   @routine    CCTK_GetHandle
+   @routine    Util_GetHandle
    @date       Tue Feb  2 10:55:34 1999
    @author     Tom Goodale
    @desc 
@@ -269,7 +269,7 @@ void *CCTK_GetHandledData(cHandledData *storage, int handle)
    @endhistory 
 
 @@*/
-int CCTK_GetHandle(cHandledData *storage, const char *name, void **data)
+int Util_GetHandle(cHandledData *storage, const char *name, void **data)
 {
   int handle;
   int current;
@@ -306,7 +306,7 @@ int CCTK_GetHandle(cHandledData *storage, const char *name, void **data)
 }
 
  /*@@
-   @routine    CCTK_GetHandleName
+   @routine    Util_GetHandleName
    @date       Wed Feb  3 12:52:53 1999
    @author     Tom Goodale
    @desc 
@@ -319,7 +319,7 @@ int CCTK_GetHandle(cHandledData *storage, const char *name, void **data)
    @endhistory 
 
 @@*/
-char *CCTK_GetHandleName(cHandledData *storage, int handle)
+char *Util_GetHandleName(cHandledData *storage, int handle)
 {
   char *name;
 
@@ -374,39 +374,39 @@ int main(void)
 
 
   /* Test creation of the data. */
-  handle1 = CCTK_NewHandle(&handledata, first_name, first_data);
-  handle2 = CCTK_NewHandle(&handledata, second_name, second_data);
-  handle3 = CCTK_NewHandle(&handledata, third_name, third_data);
+  handle1 = Util_NewHandle(&handledata, first_name, first_data);
+  handle2 = Util_NewHandle(&handledata, second_name, second_data);
+  handle3 = Util_NewHandle(&handledata, third_name, third_data);
 
   /* Test accessing the data. */
-  if((data = CCTK_GetHandledData(handledata, handle1)))
+  if((data = Util_GetHandledData(handledata, handle1)))
   {
     printf("Name %s (%d) has data %s\n", first_name, handle1, data);
   };
 
-  if((data = CCTK_GetHandledData(handledata, handle2)))
+  if((data = Util_GetHandledData(handledata, handle2)))
   {
     printf("Name %s (%d) has data %s\n", second_name, handle2, data);
   };
 
-  if((data = CCTK_GetHandledData(handledata, handle3)))
+  if((data = Util_GetHandledData(handledata, handle3)))
   {
     printf("Name %s (%d) has data %s\n", third_name, handle3, data);
   };
 
   /* Test getting by name */
 
-  if((handle = CCTK_GetHandle(handledata, first_name, (void **)&data)) > -1)
+  if((handle = Util_GetHandle(handledata, first_name, (void **)&data)) > -1)
   {
     printf("Name %s (%d, was %d) has data %s\n", first_name, handle, handle1, data);
   };
 
-  if((handle = CCTK_GetHandle(handledata, second_name, (void **)&data)) > -1)
+  if((handle = Util_GetHandle(handledata, second_name, (void **)&data)) > -1)
   {
     printf("Name %s (%d, was %d) has data %s\n", second_name, handle, handle2, data);
   };
 
-  if((handle = CCTK_GetHandle(handledata, third_name, (void **)&data)) > -1)
+  if((handle = Util_GetHandle(handledata, third_name, (void **)&data)) > -1)
   {
     printf("Name %s (%d, was %d) has data %s\n", third_name, handle, handle3, data);
   };