CCTK function name changes

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

37 files changed, 522 insertions, 342 deletions

diff --git a/src/include/ParameterBindings.h b/src/include/ParameterBindings.h
index c1b055df..3720d75f 100644
--- a/src/include/ParameterBindings.h
+++ b/src/include/ParameterBindings.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-int ParameterCreate(const char *name,        /* The parameter name */
+int CCTKi_ParameterCreate(const char *name,        /* The parameter name */
                     const char *thorn,       /* The thorn          */ 
                     const char *type,       /* The parameter type */
                     const char *scope,       /* The scoping block  */
@@ -27,7 +27,7 @@ int ParameterCreate(const char *name,        /* The parameter name */
                     int n_ranges,            /* How many allowed ranges it has */
                     ...);
 
-int ParameterAddRange(const char *implementation, 
+int CCTKi_ParameterAddRange(const char *implementation, 
                       const char *name,
                       const char *range_origin,
                       const char *range,
diff --git a/src/include/cctk.h b/src/include/cctk.h
index 249976d8..e4f55fbb 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -81,6 +81,7 @@
 #include "cctk_ActiveThorns.h"
 #include "cctk_Banner.h"
 #include "cctk_Cache.h"
+#include "cctk_CommandLine.h"
 #include "cctk_Complex.h"
 #include "cctk_Coord.h"
 #include "cctk_File.h"
diff --git a/src/include/cctk_ActiveThorns.h b/src/include/cctk_ActiveThorns.h
index 4f7a7dab..f0eb6e7a 100644
--- a/src/include/cctk_ActiveThorns.h
+++ b/src/include/cctk_ActiveThorns.h
@@ -1,5 +1,5 @@
  /*@@
-   @header    ActiveThorns.h
+   @header    cctk_ActiveThorns.h
    @date      Sun Jul  4 17:39:50 1999
    @author    Tom Goodale
    @desc 
@@ -18,29 +18,19 @@
 extern "C" {
 #endif
 
-int CCTKi_RegisterThorn(const char *name, const char *imp);
-int CCTKi_ActivateThorn(const char *name);
-int CCTK_IsThornActive(const char *name);
-int CCTK_IsThornCompiled(const char *name);
-int CCTK_IsImplementationActive(const char *name);
-int CCTKi_ListThorns(FILE *file, const char *format, int active);
-int CCTKi_ListImplementations(FILE *file, const char *format, int active);
+int         CCTK_IsThornActive(const char *name);
+int         CCTK_IsThornCompiled(const char *name);
+int         CCTK_IsImplementationActive(const char *name);
 const char *CCTK_ActivatingThorn(const char *imp);
 
 /* FIXME - should return a list or something */
 t_sktree *CCTK_ImpThornList (const char *imp);
 
-/* public routines to get information about thorns and imps */
-int CCTK_ImplementationList   (int active,      char ***list, int *n_implementations);
-int CCTK_ImplementationThornList (const char *imp, char ***list, int *n_thorns);
-int CCTK_ThornList(int active, char ***list, int *n_items);
-
 const char *CCTK_ThornImplementation(const char *name);
 const char *CCTK_ImplementationThorn(const char *name);
 
-
 #ifdef __cplusplus 
 }
 #endif
 
-#endif /* _ACTIVETHORNS_H_ */
+#endif /* _CCTK_ACTIVETHORNS_H_ */
diff --git a/src/include/cctk_Cache.h b/src/include/cctk_Cache.h
index 1790bf63..b099443d 100644
--- a/src/include/cctk_Cache.h
+++ b/src/include/cctk_Cache.h
@@ -16,7 +16,7 @@ extern "C"
 {
 #endif
 
-void *CCTK_CacheMalloc(unsigned index, 
+void *Util_CacheMalloc(unsigned index, 
                        unsigned long size, 
                        void **realstart);
 
diff --git a/src/include/cctk_CommandLine.h b/src/include/cctk_CommandLine.h
new file mode 100644
index 00000000..aef2cced
--- /dev/null
+++ b/src/include/cctk_CommandLine.h
@@ -0,0 +1,25 @@
+ /*@@
+   @header    cctk_CommandLine.h
+   @date      Thu Jan 20 2000
+   @author    Gabrielle Allen
+   @desc 
+   Prototypes and constants for command line functions
+   @enddesc 
+   @version $Header$
+ @@*/
+
+#ifndef _CCTK_COMMANDLINE_H_
+#define _CCTK_COMMANDLINE_H_
+
+#ifdef __cplusplus 
+extern "C" 
+{
+#endif
+
+int CCTK_CommandLine(char ***outargv);
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _CCTK_COMMANDLINE_H_ */
diff --git a/src/include/cctk_Flesh.h b/src/include/cctk_Flesh.h
index 7f1b2bc7..35c38ad8 100644
--- a/src/include/cctk_Flesh.h
+++ b/src/include/cctk_Flesh.h
@@ -36,57 +36,18 @@ extern "C"
 {
 #endif
 
-int InitialiseCactus(int *, char ***, tFleshConfig *);
-
-int InitialiseSubsystemDefaults(void);
-
-void CactusBanner(void);
-
-int InitialiseScheduler(tFleshConfig *ConfigData);
-
-void CCTK_PrintBanners(void);
-
 int CCTKi_SetParameter(const char *parameter, const char *value);
 
-int ShutdownCactus(tFleshConfig *);
+int CCTKi_ProcessCommandLine(int *argc, char ***argv, tFleshConfig *ConfigData);
 
-int ProcessCommandLine(int *argc, char ***argv, tFleshConfig *ConfigData);
+int CCTKi_InitialiseDataStructures(tFleshConfig *ConfigData);
 
-int InitialiseDataStructures(tFleshConfig *ConfigData);
+int CCTKi_ProcessParameterDatabase(tFleshConfig *ConfigData);
 
-int ProcessParameterDatabase(tFleshConfig *ConfigData);
-
-int CallStartupFunctions(tFleshConfig *ConfigData);
+int CCTKi_CallStartupFunctions(tFleshConfig *ConfigData);
 
 int CCTKi_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
 
-int CCTK_MaxDim(void);
-
-int CCTK_NumVars(void);
-
-int CCTK_NumGroups(void);
-
-int CCTK_VarTypeNumber(const char *type);
-
-int CCTK_GroupTypeNumber(const char *type);
-
-int CCTKi_BindingsImplementationsInitialise(void);
-int CCTKi_BindingsScheduleInitialise(void);
-int CCTKi_BindingsVariablesInitialise(void);
-int CCTKi_BindingsParametersInitialise(void);
-
-int CCTKi_RegisterDefaultTimerFunctions(void);
-
-int CCTK_MainLoopIndex (void);
-
-int CCTK_SetMainLoopIndex (int main_loop_index);
-
-int SetupMainFunctions(void);
-int SetupCommFunctions(void);
-int SetupIOFunctions(void);
-
-int CCTKi_SetupCache(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/cctk_GHExtensions.h b/src/include/cctk_GHExtensions.h
index 0a50b449..8b6072a9 100644
--- a/src/include/cctk_GHExtensions.h
+++ b/src/include/cctk_GHExtensions.h
@@ -15,25 +15,33 @@
 extern "C" {
 #endif
 
-int CCTK_RegisterGHExtension(const char *name);
-
-int CCTK_RegisterGHExtensionSetupGH(int handle, 
-                                    void *(*func)(tFleshConfig *, int, cGH *));
-
-int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *));
-
-int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int));
-
-int CCTKi_SetupGHExtensions(tFleshConfig *config, 
-                           int convergence_level, 
-                           cGH *GH);
-
-int CCTKi_InitGHExtensions(cGH *GH);
-
-int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
-
-int CCTK_GHExtensionHandle(const char *name);
-
+int CCTK_RegisterGHExtension
+  (
+   const char *name
+  );
+
+int CCTK_RegisterGHExtensionSetupGH
+  (
+   int handle, 
+   void *(*func)(tFleshConfig *, int, cGH *)
+  );
+
+int CCTK_RegisterGHExtensionInitGH
+  (
+   int handle, 
+   int (*func)(cGH *)
+  );
+
+int CCTK_RegisterGHExtensionrfrTraverseGH
+  (
+   int handle, 
+   int (*func)(cGH *, int)
+  );
+
+int CCTK_GHExtensionHandle
+  (
+   const char *name
+   );
 
 #ifdef __cplusplus
 }
diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 915717ad..35642065 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -27,46 +27,44 @@ typedef struct
 extern "C" {
 #endif
 
-void CCTK_DumpGroupInfo(void); 
-
-int     CCTK_StaggeredGrids(void); 
-int     CCTK_StaggerCodeName(const char *stype); 
-int     CCTK_DirStaggerCodeVal(int dir, int staggercode); 
-int     CCTK_DirStaggerCodeName(int dir, const char *stype); 
-int     CCTK_DecomposeName(const char *fullname, 
-			   char **implementation, 
-			   char **name);
-
-int     CCTK_FirstVarIndex(const char *group);
-int     CCTK_FirstVarIndexI(int group);
-char   *CCTK_FullName(int var);
-
-int     CCTK_GroupData(int group, cGroup *gp);
-int     CCTK_GroupIndex(const char *groupname);
-int     CCTK_GroupIndexFromVar(const char *var);
-int     CCTK_GroupIndexFromVarI(int var);
-char   *CCTK_GroupName(int varnum);
-char   *CCTK_GroupNameFromVarI(int var);
-int     CCTK_GroupScopeNumber(const char *type);
-int     CCTK_GroupTypeFromVarI(int var);
-int     CCTK_GroupTypeNumber(const char *type);
-
-char   *CCTK_ImpFromVarI(int var);
-
-int     CCTK_MaxDim(void);
-
-int     CCTK_NumGroups(void);
-int     CCTK_NumTimeLevelsFromVar(const char *var);
-int     CCTK_NumTimeLevelsFromVarI(int var);
-int     CCTK_NumVars(void);
-int     CCTK_NumVarsInGroup(const char *group);
-int     CCTK_NumVarsInGroupI(int group);
-
-int     CCTK_VarIndex(const char *variablename);
-char   *CCTK_VarName(int varnum);
-int     CCTK_VarTypeI(int var);
-int     CCTK_VarTypeNumber(const char *type);
-char   *CCTK_VarTypeName(int vartype);
+#include "cctk_Types.h"
+
+int        CCTK_DecomposeName(const char *fullname, 
+			      char **implementation, 
+			      char **name);
+
+int        CCTK_FirstVarIndex(const char *group);
+int        CCTK_FirstVarIndexI(int group);
+char      *CCTK_FullName(int var);
+
+int        CCTK_GroupData(int group, cGroup *gp);
+CCTK_INT **CCTK_GroupGhostsizesI(int group);
+int        CCTK_GroupIndex(const char *groupname);
+int        CCTK_GroupIndexFromVar(const char *var);
+int        CCTK_GroupIndexFromVarI(int var);
+char      *CCTK_GroupName(int varnum);
+char      *CCTK_GroupNameFromVarI(int var);
+int        CCTK_GroupScopeNumber(const char *type);
+CCTK_INT **CCTK_GroupSizesI(int group);
+int        CCTK_GroupTypeFromVarI(int var);
+int        CCTK_GroupTypeNumber(const char *type);
+
+char      *CCTK_ImpFromVarI(int var);
+
+int        CCTK_MaxDim(void);
+
+int        CCTK_NumGroups(void);
+int        CCTK_NumTimeLevelsFromVar(const char *var);
+int        CCTK_NumTimeLevelsFromVarI(int var);
+int        CCTK_NumVars(void);
+int        CCTK_NumVarsInGroup(const char *group);
+int        CCTK_NumVarsInGroupI(int group);
+
+int        CCTK_VarIndex(const char *variablename);
+char      *CCTK_VarName(int varnum);
+int        CCTK_VarTypeI(int var);
+int        CCTK_VarTypeNumber(const char *type);
+char      *CCTK_VarTypeName(int vartype);
 
 #ifdef __cplusplus 
 }
@@ -83,4 +81,12 @@ char   *CCTK_VarTypeName(int vartype);
 #define GROUP_PROTECTED 2
 #define GROUP_PUBLIC    3
 
+#define CCTK_SCALAR 1
+#define CCTK_GF     2
+#define CCTK_ARRAY  3
+
+#define CCTK_PRIVATE   1
+#define CCTK_PROTECTED 2
+#define CCTK_PUBLIC    3
+
 #endif
diff --git a/src/include/cctk_ParameterFunctions.h b/src/include/cctk_ParameterFunctions.h
index 78c7df61..4d54b57b 100644
--- a/src/include/cctk_ParameterFunctions.h
+++ b/src/include/cctk_ParameterFunctions.h
@@ -97,12 +97,14 @@ extern "C" {
 #endif
 
 /* set the value of a parameter */
-int ParameterSet   (const char *name,        /* The name of the parameter  */
+int CCTK_ParameterSet (
+		    const char *name,        /* The name of the parameter  */
                     const char *thorn,       /* The originating thorn      */
                     const char *value);      /* The value of the parameter */
 
 /* get the data pointer to and type of a parameter's value */
-void *ParameterGet (const char *name,        /* The name of the parameter  */
+void *ParameterGet (
+		    const char *name,        /* The name of the parameter  */
                     const char *thorn,       /* The originating thorn      */
                     int *type);              /* Holds type of parameter    */
 
@@ -112,7 +114,7 @@ char *ParameterValString (const char *name,  /* The name of the parameter  */
                     const char *thorn);      /* The originating thorn      */
 
 /* walk through list of parameters */
-const char *ParameterWalk(
+const char *CCTK_ParameterWalk(
                     int first,               /* Get first parameter or not */
                     const char *origin);     /* The origin of this walk    */
 
diff --git a/src/include/cctk_Schedule.h b/src/include/cctk_Schedule.h
index 1f0ca6a4..8e14fc2b 100644
--- a/src/include/cctk_Schedule.h
+++ b/src/include/cctk_Schedule.h
@@ -33,7 +33,7 @@ typedef struct
 extern "C" {
 #endif
 
-int CCTK_ScheduleFunction(void *function,
+  /*int CCTK_ScheduleFunction(void *function,
                           const char *name,
                           const char *thorn,
                           const char *implementation,
@@ -70,6 +70,7 @@ int CCTK_ScheduleTraverse(const char *where,
                           int (*calling_function)(void *, void *, void *));
 
 int CCTK_ScheduleGHInit(void *GH);
+  */
 
 int CCTK_SchedulePrint(const char *where);
 int CCTK_SchedulePrintTimes(const char *where);
diff --git a/src/include/cctk_Stagger.h b/src/include/cctk_Stagger.h
index 060a40b6..655a704c 100644
--- a/src/include/cctk_Stagger.h
+++ b/src/include/cctk_Stagger.h
@@ -1,21 +1,27 @@
+ /*@@
+   @header    cctk_Stagger.h
+   @date      Thu Jan 20 2000
+   @author    Gerd Lanfermann
+   @desc 
+   Prototypes and constants for stagger functions.
+   @enddesc 
+   @version $Header$
+ @@*/
 
 #ifndef _CCTK_STAGGER_H_
 #define _CCTK_STAGGER_H_
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int CCTK_StaggeredGrids(void);
+int CCTK_StaggerVars(void);
 int CCTK_StaggerCodeGrpIdx(int gindex);
 int CCTK_StaggerCodeGrp(const char *gname);
 int CCTK_StaggerCodeName(const char *stype);
 int CCTK_DirStaggerCodeVal(int dir, int sc);
 int CCTK_DirStaggerCodeName(int dir, const char *stype);
 
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/cctk_WarnLevel.h b/src/include/cctk_WarnLevel.h
index 3da90c21..52cbda39 100644
--- a/src/include/cctk_WarnLevel.h
+++ b/src/include/cctk_WarnLevel.h
@@ -16,21 +16,19 @@ extern "C"
 {
 #endif
 
-void CCTK_Warn(int level, 
+int CCTK_Warn(int level, 
                int line, 
                const char *file, 
                const char *thorn, 
                const char *message);
-void CCTK_VWarn(int level, 
+int CCTK_VWarn(int level, 
                 int line, 
                 const char *file, 
                 const char *thorn, 
                 const char *format, ...);
-void CCTK_ParamWarn(const char *thorn, const char *message);
-void CCTK_Info(const char *thorn, const char *message);
+int CCTK_ParamWarn(const char *thorn, const char *message);
+int CCTK_Info(const char *thorn, const char *message);
 
-void CCTKi_NotYetImplemented(const char *message);
- 
 #ifdef __cplusplus 
 }
 #endif
diff --git a/src/include/cctk_arguments.h b/src/include/cctk_arguments.h
new file mode 100644
index 00000000..abbc3ae1
--- /dev/null
+++ b/src/include/cctk_arguments.h
@@ -0,0 +1 @@
+#include "cctk_Arguments.h"
diff --git a/src/include/cctk_parameters.h b/src/include/cctk_parameters.h
new file mode 100644
index 00000000..eadb1eee
--- /dev/null
+++ b/src/include/cctk_parameters.h
@@ -0,0 +1 @@
+#include "cctk_Parameters.h"
diff --git a/src/include/cctki_ActiveThorns.h b/src/include/cctki_ActiveThorns.h
new file mode 100644
index 00000000..e3a33cd4
--- /dev/null
+++ b/src/include/cctki_ActiveThorns.h
@@ -0,0 +1,49 @@
+ /*@@
+   @header    cctki_ActiveThorns.h
+   @date      Sun Jul  4 17:39:50 1999
+   @author    Tom Goodale
+   @desc 
+   
+   @enddesc
+   @version $Header$
+ @@*/
+
+#ifndef __CCTKI_ACTIVETHORNS_H_
+#define __CCTKI_ACTIVETHORNS_H_
+
+#include <stdio.h>
+#include "SKBinTree.h"   
+
+#ifdef __cplusplus 
+extern "C" {
+#endif
+
+int CCTKi_RegisterThorn(const char *name, const char *imp);
+int CCTKi_ActivateThorn(const char *name);
+int CCTKi_PrintThorns(FILE *file, const char *format, int active);
+int CCTKi_PrintImps(FILE *file, const char *format, int active);
+
+int CCTKi_ImplementationList
+ (
+  int active,
+  char ***list,
+  int *n_implementations
+ );
+int CCTKi_ImplementationThornList 
+ (
+  const char *imp, 
+  char ***list, 
+  int *n_thorns
+ );
+int CCTKi_ThornList
+ (
+  int active, 
+  char ***list, 
+  int *n_items
+ );
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _CCTKI_ACTIVETHORNS_H_ */
diff --git a/src/include/cctki_Cache.h b/src/include/cctki_Cache.h
index c924f3bf..b38ed7e8 100644
--- a/src/include/cctki_Cache.h
+++ b/src/include/cctki_Cache.h
@@ -15,10 +15,10 @@ extern "C"
 {
 #endif
 
-int CCTKi_CacheDataSet(unsigned long cacheline_bytes,
+int Utili_CacheDataSet(unsigned long cacheline_bytes,
                        unsigned long cache_size);
 
-int CCTKi_CacheDataGet(unsigned long *cacheline_bytes,
+int Utili_CacheDataGet(unsigned long *cacheline_bytes,
                        unsigned long *cache_size);
 
 #ifdef __cplusplus
diff --git a/src/include/cctki_FortranWrappers.h b/src/include/cctki_FortranWrappers.h
new file mode 100644
index 00000000..3c581007
--- /dev/null
+++ b/src/include/cctki_FortranWrappers.h
@@ -0,0 +1,26 @@
+ /*@@
+   @header    cctki_FortranWrappers.h
+   @date      Sat Sep 18 00:52:35 1999
+   @author    Tom Goodale
+   @desc 
+   Routines for dealing with Fortran wrappers
+   @enddesc 
+ @@*/
+
+#ifndef __CCTKI_FORTRANWRAPPERS_H_
+#define __CCTKI_FORTRANWRAPPERS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_RegisterFortranWrapper(const char *name, int (*function)(void *, void *));
+
+int (*CCTKi_FortranWrapper(const char *name))(void *, void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/include/cctki_GHExtensions.h b/src/include/cctki_GHExtensions.h
new file mode 100644
index 00000000..c06a650b
--- /dev/null
+++ b/src/include/cctki_GHExtensions.h
@@ -0,0 +1,31 @@
+ /*@@
+   @header    cctki_GHExtensions.h
+   @date      Fri Jan 15 14:15:20 1999
+   @author    Tom Goodale
+   @desc 
+   Prototypes for functions dealing with GH extensions.
+   @enddesc
+   @version $Header$
+ @@*/
+
+#ifndef _CCTKI_GHEXTENSIONS_H_
+#define _CCTKI_GHEXTENSIONS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_SetupGHExtensions(tFleshConfig *config, 
+                           int convergence_level, 
+                           cGH *GH);
+
+int CCTKi_InitGHExtensions(cGH *GH);
+
+int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/include/cctki_Groups.h b/src/include/cctki_Groups.h
index 07625fc7..6cc215f2 100644
--- a/src/include/cctki_Groups.h
+++ b/src/include/cctki_Groups.h
@@ -17,35 +17,25 @@
 extern "C" {
 #endif
 
-int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
-                      const char *gtype,
-                      const char *vtype,
-                      const char *gscope,
-                      int dimension,
-                      int ntimelevels,
-                      const char *stype,
-                      const char *size,
-                      int n_variables,
-                      ...);
-
-int CCTKi_ParseStaggerString(int dim,  
-			     const char *imp, 
-			     const char *gname,  
-			     const char *stype); 
+void CCTKi_DumpGroupInfo(void); 
+
+int  CCTKi_CreateGroup
+  (const char* gname, 
+   const char* thorn,  
+   const char* imp,
+   const char* gtype,
+   const char* vtype,
+   const char* gscope,
+   int         dimension,
+   int         ntimelevels,
+   const char* stype,
+   const char* size,
+   const char* ghostsize,
+   int         n_variables,
+   ...);
 
 #ifdef __cplusplus 
 }
 #endif
 
-
-/* Group Types */
-
-#define GROUP_SCALAR 1
-#define GROUP_GF     2
-#define GROUP_ARRAY  3
-
-#define GROUP_PRIVATE   1
-#define GROUP_PROTECTED 2
-#define GROUP_PUBLIC    3
-
 #endif
diff --git a/src/include/cctki_Schedule.h b/src/include/cctki_Schedule.h
index 52f8210f..82d6c861 100644
--- a/src/include/cctki_Schedule.h
+++ b/src/include/cctki_Schedule.h
@@ -35,27 +35,81 @@ t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig,
                                            const char *modifier, 
                                            const char *argument);
 
-int CCTKi_ScheduleFunction(const char *gname, 
-                           const char *fname, 
-                           void *func, 
-                           t_sched_modifier *modifiers, 
-                           void *attributes);
+int CCTKi_ScheduleFunction
+  (
+   void *function,
+   const char *name,
+   const char *thorn,
+   const char *implementation,
+   const char *description,
+   const char *where,
+   const char *language,
+   int n_mem_groups,
+   int n_comm_groups,
+   int n_trigger_groups,
+   int n_before,
+   int n_after,
+   int n_while,
+   ...
+  );
 
-int CCTKi_ScheduleGroup(const char *gname, 
-                        const char *thisname, 
-                        t_sched_modifier *modifiers, 
-                        void *attributes);
+int CCTKi_ScheduleGroup
+  (
+   const char *name,
+   const char *thorn,
+   const char *implementation,
+   const char *description,
+   const char *where,
+   int n_mem_groups,
+   int n_comm_groups,
+   int n_trigger_groups,
+   int n_before,
+   int n_after,
+   int n_while,
+   ...
+  );
+
+int CCTKi_ScheduleGroupStorage(const char *group);
+
+int CCTKi_ScheduleGroupComm(const char *group);
+
+int CCTKi_ScheduleTraverse(const char *where, 
+			   void *GH,   
+			   int (*calling_function)(void *, void *, void *));
+
+int CCTKi_ScheduleGHInit(void *GH);
+
+
+int CCTKi_DoScheduleFunction
+  (
+   const char *gname, 
+   const char *fname, 
+   void *func, 
+   t_sched_modifier *modifiers, 
+   void *attributes
+  );
+
+int CCTKi_DoScheduleGroup
+  (
+   const char *gname, 
+   const char *thisname, 
+   t_sched_modifier *modifiers, 
+   void *attributes
+  );
 
 /* Routine to sort the groups - must be called before traversal. */
-int CCTKi_ScheduleSortAllGroups(void);
+int CCTKi_DoScheduleSortAllGroups(void);
 
 /* Traversal routine */
-int CCTKi_ScheduleTraverse(const char *group_name,
-                           int (*item_entry)(void *, void *),
-                           int (*item_exit)(void *, void *),
-                           int  (*while_check)(int, char **, void *, void *),
-                           int (*function_process)(void *, void *, void *),
-                           void *data);
+int CCTKi_DoScheduleTraverse
+  (
+   const char *group_name,
+   int (*item_entry)(void *, void *),
+   int (*item_exit)(void *, void *),
+   int  (*while_check)(int, char **, void *, void *),
+   int (*function_process)(void *, void *, void *),
+   void *data
+  );
 
 #ifdef __cplusplus
 }
diff --git a/src/include/cctki_Stagger.h b/src/include/cctki_Stagger.h
new file mode 100644
index 00000000..1018232d
--- /dev/null
+++ b/src/include/cctki_Stagger.h
@@ -0,0 +1,27 @@
+ /*@@
+   @header    cctki_Stagger.h
+   @date      Thu Jan 20 2000
+   @author    Gerd Lanfermann
+   @desc 
+   Prototypes and constants for stagger functions.
+   @enddesc 
+   @version $Header$
+ @@*/
+
+#ifndef _CCTKI_STAGGER_H_
+#define _CCTKI_STAGGER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_ParseStaggerString(int dim,  
+			     const char *imp, 
+			     const char *gname,  
+			     const char *stype); 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/cctki_WarnLevel.h b/src/include/cctki_WarnLevel.h
index 034ca568..b4786cd5 100644
--- a/src/include/cctki_WarnLevel.h
+++ b/src/include/cctki_WarnLevel.h
@@ -17,7 +17,8 @@ extern "C" {
 int CCTKi_SetWarnLevel(int level);
 void CCTKi_FinaliseParamWarn(void);
 int CCTKi_SetErrorLevel(int level);
- 
+void CCTKi_NotYetImplemented(const char *message);
+  
 #ifdef __cplusplus 
 }
 #endif
diff --git a/src/include/rfrConstants.h b/src/include/rfrConstants.h
index c6a03600..2c56eb1d 100644
--- a/src/include/rfrConstants.h
+++ b/src/include/rfrConstants.h
@@ -15,7 +15,9 @@
 #define CCTK_PARAMCHECK  0
 #define CCTK_BASEGRID  1
 
-#define CCTK_RECOVER   5
+#define CCTK_RECOVER
+#define CCTK_RECOVER_PARAMETERS   4
+#define CCTK_RECOVER_VARIABLES   5
 
 /* Be sure to keep the INITIAL*, POSTSTEP*, etc... contiguous */
 #define CCTK_INITIAL   11
diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c
index 59c54990..f669665f 100644
--- a/src/main/ActiveThorns.c
+++ b/src/main/ActiveThorns.c
@@ -20,7 +20,7 @@
 static char *rcsid = "$Header$";
 
 /* Local routine */
-static int CCTK_RegisterImp(const char *name, const char *thorn);
+static int RegisterImp(const char *name, const char *thorn);
 
 /* Structures used to store data */
 struct THORN
@@ -95,7 +95,7 @@ int CCTKi_RegisterThorn(const char *name, const char *imp)
         {
 
           /* Register the implementation */
-          CCTK_RegisterImp(imp, name);
+          RegisterImp(imp, name);
 
           retval = 0;
         }
@@ -123,7 +123,7 @@ int CCTKi_RegisterThorn(const char *name, const char *imp)
 }
 
  /*@@
-   @routine    CCTK_RegisterImp
+   @routine    RegisterImp
    @date       Sun Jul  4 17:44:42 1999
    @author     Tom Goodale
    @desc 
@@ -136,7 +136,7 @@ int CCTKi_RegisterThorn(const char *name, const char *imp)
    @endhistory 
 
 @@*/
-static int CCTK_RegisterImp(const char *name, const char *thorn)
+static int RegisterImp(const char *name, const char *thorn)
 {
   int retval;
   t_sktree *node;
@@ -483,7 +483,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_IsImplementationActive)
 }
 
  /*@@
-   @routine    CCTKi_ListThorns
+   @routine    CCTKi_PrintThorns
    @date       Mon Jul  5 10:02:15 1999
    @author     Tom Goodale
    @desc 
@@ -497,7 +497,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_IsImplementationActive)
    @endhistory 
 
 @@*/
-int CCTKi_ListThorns(FILE *file, const char *format, int active)
+int CCTKi_PrintThorns(FILE *file, const char *format, int active)
 {
   int retval;
   t_sktree *node;
@@ -522,7 +522,7 @@ int CCTKi_ListThorns(FILE *file, const char *format, int active)
 }
 
  /*@@
-   @routine    CCTKi_ListImplementations
+   @routine    CCTKi_PrintImps
    @date       Mon Jul  5 10:08:19 1999
    @author     Tom Goodale
    @desc 
@@ -536,7 +536,7 @@ int CCTKi_ListThorns(FILE *file, const char *format, int active)
    @endhistory 
 
 @@*/
-int CCTKi_ListImplementations(FILE *file, const char *format, int active)
+int CCTKi_PrintImps(FILE *file, const char *format, int active)
 {
   int retval;
   t_sktree *node;
@@ -561,7 +561,7 @@ int CCTKi_ListImplementations(FILE *file, const char *format, int active)
 }
 
  /*@@
-   @routine    CCTK_ImplementationList
+   @routine    CCTKi_ImplementationList
    @date       Thu Oct 14 16:14:22 1999
    @author     Andre Merzky
    @desc 
@@ -574,7 +574,7 @@ int CCTKi_ListImplementations(FILE *file, const char *format, int active)
    @endhistory 
 
 @@*/
-int CCTK_ImplementationList(int active, char ***list, int *n_implementations)
+int CCTKi_ImplementationList(int active, char ***list, int *n_implementations)
 {
   int retval;
   t_sktree *node;
@@ -605,7 +605,7 @@ int CCTK_ImplementationList(int active, char ***list, int *n_implementations)
 
 
  /*@@
-   @routine    CCTK_ThornList
+   @routine    CCTKi_ThornList
    @date       Sun Oct 17 17:49:23 1999
    @author     Tom Goodale
    @desc 
@@ -618,7 +618,7 @@ int CCTK_ImplementationList(int active, char ***list, int *n_implementations)
    @endhistory 
 
 @@*/
-int CCTK_ThornList(int active, char ***list, int *n_items)
+int CCTKi_ThornList(int active, char ***list, int *n_items)
 {
   int retval;
   t_sktree *node;
@@ -649,7 +649,7 @@ int CCTK_ThornList(int active, char ***list, int *n_items)
 
 
  /*@@
-   @routine    CCTK_ImplementationThornList
+   @routine    CCTKi_ImplementationThornList
    @date       Thu Oct 14 16:04:59 1999
    @author     Andre Merzky
    @desc 
@@ -662,7 +662,7 @@ int CCTK_ThornList(int active, char ***list, int *n_items)
    @endhistory 
 
 @@*/
-int CCTK_ImplementationThornList (const char *imp, char ***list, int *n_items)
+int CCTKi_ImplementationThornList (const char *imp, char ***list, int *n_items)
 {
   int       retval;
   t_sktree *node;
diff --git a/src/main/Banner.c b/src/main/Banner.c
index ee39b200..ec7b972d 100644
--- a/src/main/Banner.c
+++ b/src/main/Banner.c
@@ -28,7 +28,7 @@ void CCTK_PrintBanners(void);
 
 
  /*@@
-   @routine    CactusBanner
+   @routine    CCTKi_CactusBanner
    @date       Wed Oct 13 21:41:28 CEST 1999
    @author     Gabrielle Allen
    @desc 
@@ -36,7 +36,7 @@ void CCTK_PrintBanners(void);
    @enddesc 
 @@*/
 
-void CactusBanner(void)
+void CCTKi_CactusBanner(void)
 {
   
   const char *string;
@@ -134,7 +134,7 @@ void  FMODIFIER FORTRAN_NAME(CCTK_RegisterBanner)(ONE_FORTSTRING_ARG)
 }
 
  /*@@
-   @routine    CCTK_PrintBanners
+   @routine    CCTKi_PrintBanners
    @date       July 16 00:11:26 1999
    @author     Gabrielle Allen
    @desc 
@@ -148,7 +148,7 @@ void  FMODIFIER FORTRAN_NAME(CCTK_RegisterBanner)(ONE_FORTSTRING_ARG)
    @endvar 
 @@*/
 
-void CCTK_PrintBanners(void)
+int CCTKi_PrintBanners(void)
 {
 
   DECLARE_CCTK_PARAMETERS
@@ -168,6 +168,8 @@ void CCTK_PrintBanners(void)
     printf("--------------------------------------------------------------------------------\n"); 
   }
 
+  return 0;
+
   USE_CCTK_PARAMETERS
 
 }
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 98b43dda..880dc8a8 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -12,8 +12,7 @@
 #include <stdio.h>
 
 #include "cctk_Flesh.h"
-#include "cctk.h"
-#include "cctk_parameters.h"
+#include "cctk_Parameters.h"
 #include "rfrConstants.h"
 #include "rfrInterface.h"
 
@@ -47,7 +46,7 @@ static int cactus_terminate_global = 0;
 
 /* Local function prototypes. */
 
-int CCTK_StepGH(cGH *GH);
+int StepGH(cGH *GH);
  
 
 /* the iteration counter used in the evolution loop */
@@ -162,7 +161,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
     ForallConvLevels(iteration, convergence_level)
     {
 
-      CCTK_StepGH(config->GH[convergence_level]);
+      StepGH(config->GH[convergence_level]);
       /*
       CCTK_InfoOutput(config->GH[convergence_level], convergence_level);
       */
@@ -217,14 +216,8 @@ int CactusDefaultEvolve(tFleshConfig *config)
 
 /************************************************************************/
 
-/* The following routines have been nicked from 3.0 for the moment. */
-
-
-
-
-
  /*@@
-   @routine    CStepper
+   @routine    StepGH
    @date       Fri Aug 14 12:39:49 1998
    @author     Gerd Lanfermann
    @desc 
@@ -236,7 +229,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
    @calledby main   
  @@*/
 
-int CCTK_StepGH(cGH *GH) 
+int StepGH(cGH *GH) 
 {
 
   void PreStepper(cGH *GH);
@@ -246,7 +239,7 @@ int CCTK_StepGH(cGH *GH)
   /* Advance GH->iteration BEFORE evolving */
 #ifdef DEBUG_CCTK
   CCTK_PRINTSEPARATOR
-  printf("In CCTK_StepGH\n--------------\n");
+  printf("In StepGH\n--------------\n");
   printf("  Advancing GH->iteration to %lu = %lu + 1\n",(GH->cctk_iteration+1),
          GH->cctk_iteration);
   CCTK_PRINTSEPARATOR
@@ -260,7 +253,7 @@ int CCTK_StepGH(cGH *GH)
   /* Advance GH->time AFTER evolving */
 #ifdef DEBUG_CCTK
   CCTK_PRINTSEPARATOR
-  printf("In CCTK_StepGH\n--------------\n");
+  printf("In StepGH\n--------------\n");
   printf("  Advancing GH->cctk_time %f = %f + %f\n",GH->cctk_time+GH->cctk_delta_time,
          GH->cctk_time,GH->cctk_delta_time);
   CCTK_PRINTSEPARATOR
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index d838b0a9..6aa2cf9f 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -13,16 +13,16 @@
 #include <stdlib.h>
 
 #include "cctk_Flesh.h"
+#include "cctk_GHExtensions.h"
+#include "cctk_Bindings.h"
+#include "cctk_Parameters.h"
+
+#include "CactusrfrInterface.h"
 #include "CactusMainDefaults.h"
 #include "CactusCommFunctions.h"
-#include "cctk_GHExtensions.h"
 #include "rfrConstants.h"
-#include "CactusrfrInterface.h"
-#include "cctk_Bindings.h"
 #include "rfrInterface.h"
 
-#include "cctk_parameters.h"
-
 static char *rcsid = "$Id$";
 
 /* Local function prototypes */
@@ -118,7 +118,7 @@ int CactusInitialiseGH(cGH *GH)
   GH->rfr_top = NULL;
 
   /* Do the rfr initialisation on this GH */
-  CCTK_ScheduleGHInit((void *)GH);
+  CCTKi_ScheduleGHInit((void *)GH);
 
   /* Initialise all the extensions. */
   CCTKi_InitGHExtensions(GH);
@@ -141,7 +141,7 @@ int CactusInitialiseGH(cGH *GH)
   CCTK_rfrTraverse(GH,CCTK_POSTINITIAL);
 
   /* Traverse recovery and ID checkpoint routines */
-  CCTK_rfrTraverse(GH,CCTK_RECOVER);
+  CCTK_rfrTraverse(GH,CCTK_RECOVER_VARIABLES);
   CCTK_rfrTraverse(GH,CCTK_CPINITIAL);
 
   CCTK_rfrTraverse(GH,CCTK_POSTSTEP);
diff --git a/src/main/CallStartupFunctions.c b/src/main/CallStartupFunctions.c
index 28673590..3005cc01 100644
--- a/src/main/CallStartupFunctions.c
+++ b/src/main/CallStartupFunctions.c
@@ -1,5 +1,5 @@
  /*@@
-   @file      CallStartupFunctions.c
+   @file      CCTKi_CallStartupFunctions.c
    @date      Mon Sep 28 14:16:19 1998
    @author    Tom Goodale
    @desc 
@@ -13,10 +13,11 @@ static char *rcsid = "$Header$";
 #include <stdio.h>
 
 #include "cctk_Flesh.h"
-#include "cctk_Schedule.h"
+#include "cctki_Schedule.h"
+
 
  /*@@
-   @routine    CallStartupFunctions
+   @routine    CCTKi_CallStartupFunctions
    @date       Mon Sep 28 14:24:39 1998
    @author     Tom Goodale
    @desc 
@@ -29,10 +30,11 @@ static char *rcsid = "$Header$";
    @endhistory 
 
 @@*/
-int CallStartupFunctions(tFleshConfig *ConfigData)
+
+int CCTKi_CallStartupFunctions(tFleshConfig *ConfigData)
 {
 
-  CCTK_ScheduleTraverse("CCTK_STARTUP", NULL, NULL);
+  CCTKi_ScheduleTraverse("CCTK_STARTUP", NULL, NULL);
 
   return 0;
 }
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index f39b5416..730f23fd 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -19,6 +19,7 @@
 #include "cctk_WarnLevel.h"
 #include "cctk_Bindings.h"
 #include "cctk_Misc.h"
+#include "cctki_ActiveThorns.h"
 #include "cctk_ActiveThorns.h"
 #include "cctk_ParameterFunctions.h"
 #include "cctki_WarnLevel.h"
@@ -30,9 +31,9 @@ static char *rcsid = "$Header$";
 char *compileTime(void);
 char *compileDate(void);
 char *CCTK_FullVersion(void);
-int CCTK_GetCommandLine(char ***outargv);
+int CCTK_CommandLine(char ***outargv);
 
-static void CCTKi_CommandLinePrintParameter(t_param_prop *properties);
+static void CommandLinePrintParameter(t_param_prop *properties);
 
 static int redirectsubs;
 
@@ -83,7 +84,7 @@ void CCTKi_CommandLineDescribeAllParameters(const char *optarg)
   const char *implementation;
   t_param_prop *properties;
 
-  CCTK_ThornList(0, &thornlist, &n_thorns);
+  CCTKi_ThornList(0, &thornlist, &n_thorns);
 
   for(thorn = 0; thorn < n_thorns; thorn++)
   {
@@ -99,7 +100,7 @@ void CCTKi_CommandLineDescribeAllParameters(const char *optarg)
         switch(*optarg)
         {
           case 'v':
-            CCTKi_CommandLinePrintParameter(properties);
+            CommandLinePrintParameter(properties);
             break;
           default :
             fprintf(stderr, "Unknown verbosity option %s\n", optarg);
@@ -157,7 +158,7 @@ void CCTKi_CommandLineDescribeParameter(const char *optarg)
     free(param);
   }
 
-  CCTKi_CommandLinePrintParameter(properties);
+  CommandLinePrintParameter(properties);
     
   exit(0);
 }
@@ -250,7 +251,7 @@ void CCTKi_CommandLineRedirectStdout(void)
 void CCTKi_CommandLineListThorns(void)
 {
   printf ("\n---------------Compiled Thorns-------------\n");
-  CCTKi_ListThorns(stdout, "  %s\n", 0);
+  CCTKi_PrintThorns(stdout, "  %s\n", 0);
   printf ("-------------------------------------------\n\n");
   exit(1);
 }
@@ -276,7 +277,7 @@ void CCTKi_CommandLineVersion(void)
 
   const char *version=NULL;
 
-  argc = CCTK_GetCommandLine(&argv);
+  argc = CCTK_CommandLine(&argv);
 
   version = (const char *)CCTK_FullVersion();
 
@@ -305,7 +306,7 @@ void CCTKi_CommandLineHelp(void)
   int argc;
   char **argv;
 
-  argc = CCTK_GetCommandLine(&argv);
+  argc = CCTK_CommandLine(&argv);
 
   printf("%s, compiled on %s at %s\n", argv[0], compileDate(), compileTime());
   printf("Usage: %s [-h] [-O] [-o paramname] [-x [nprocs]] [-W n] [-E n] [-r] [-T] [-t name] [-v] <parameter_file_name>\n", argv[0]);
@@ -347,7 +348,7 @@ void CCTKi_CommandLineUsage(void)
   int argc;
   char **argv;
 
-  argc = CCTK_GetCommandLine(&argv);
+  argc = CCTK_CommandLine(&argv);
 
   printf("Usage: %s [-h] [-O] [-o paramname] [-x [nprocs]] [-W n] [-E n] [-r] [-T] [-t name] [-v] <parameter_file_name>\n", argv[0]);
   exit(1);
@@ -397,7 +398,7 @@ void CCTKi_CommandLineFinished(void)
 
 
  /*@@
-   @routine    CCTKi_CommandLinePrintParameter
+   @routine    CommandLinePrintParameter
    @date       Sun Oct 17 22:11:31 1999
    @author     Tom Goodale
    @desc 
@@ -410,7 +411,7 @@ void CCTKi_CommandLineFinished(void)
    @endhistory 
 
 @@*/
-static void CCTKi_CommandLinePrintParameter(t_param_prop *properties)
+static void CommandLinePrintParameter(t_param_prop *properties)
 {
   t_range *range;
 
diff --git a/src/main/FortranWrappers.c b/src/main/FortranWrappers.c
index e10baae9..a7366e25 100644
--- a/src/main/FortranWrappers.c
+++ b/src/main/FortranWrappers.c
@@ -11,14 +11,14 @@ static char *rcsid = "$Header$";
 
 #include <stdlib.h>
 
-#include "cctk_FortranWrappers.h"
+#include "cctki_FortranWrappers.h"
 
 #include "StoreNamedData.h"
 
 static pNamedData *registry = NULL;
 
  /*@@
-   @routine    CCTK_RegisterFortranWrapper
+   @routine    CCTKi_RegisterFortranWrapper
    @date       Sat Sep 18 00:51:21 1999
    @author     Tom Goodale
    @desc 
@@ -31,7 +31,7 @@ static pNamedData *registry = NULL;
    @endhistory 
 
 @@*/
-int CCTK_RegisterFortranWrapper(const char *name, int (*function)(void *, void *))
+int CCTKi_RegisterFortranWrapper(const char *name, int (*function)(void *, void *))
 {
   int retcode;
   retcode = StoreNamedData(&registry, name, (void *)function);
@@ -40,7 +40,7 @@ int CCTK_RegisterFortranWrapper(const char *name, int (*function)(void *, void *
 }
 
  /*@@
-   @routine    CCTK_FortranWrapper
+   @routine    CCTKi_FortranWrapper
    @date       Sat Sep 18 00:51:57 1999
    @author     Tom Goodale
    @desc 
@@ -54,7 +54,7 @@ int CCTK_RegisterFortranWrapper(const char *name, int (*function)(void *, void *
    @endhistory 
 
 @@*/
-int (*CCTK_FortranWrapper(const char *name))(void *, void *)
+int (*CCTKi_FortranWrapper(const char *name))(void *, void *)
 {
   return (int (*)(void *,void *))GetNamedData(registry, name);
 }
diff --git a/src/main/InitialiseCactus.c b/src/main/InitialiseCactus.c
index e925053d..46f7b313 100644
--- a/src/main/InitialiseCactus.c
+++ b/src/main/InitialiseCactus.c
@@ -21,9 +21,8 @@ int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData);
 int ProcessEnvironment(int *argc, char ***argv,tFleshConfig *ConfigData);
 
 
-
  /*@@
-   @routine    InitialiseCactus
+   @routine    CCTKi_InitialiseCactus
    @date       Fri Sep 18 14:05:21 1998
    @author     Tom Goodale
    @desc 
@@ -57,32 +56,33 @@ int ProcessEnvironment(int *argc, char ***argv,tFleshConfig *ConfigData);
    @endvar 
 
 @@*/
-int InitialiseCactus(int *argc, char ***argv, tFleshConfig *ConfigData)
+int CCTKi_InitialiseCactus(int *argc, char ***argv, tFleshConfig *ConfigData)
 {
 
-  InitialiseSubsystemDefaults();
+  CCTKi_InitialiseSubsystemDefaults();
 
-  ProcessEnvironment(argc, argv, ConfigData);
+  CCTKi_ProcessEnvironment(argc, argv, ConfigData);
 
-  ProcessCommandLine(argc, argv, ConfigData);
+  CCTKi_ProcessCommandLine(argc, argv, ConfigData);
 
-  CactusBanner();
+  CCTKi_CactusBanner();
 
-  InitialiseDataStructures(ConfigData);
+  CCTKi_InitialiseDataStructures(ConfigData);
 
-  ProcessParameterDatabase(ConfigData);
+  CCTKi_ProcessParameterDatabase(ConfigData);
 
-  InitialiseScheduler(ConfigData);
+  CCTKi_InitialiseScheduler(ConfigData);
 
-  CallStartupFunctions(ConfigData);
+  CCTKi_CallStartupFunctions(ConfigData);
 
-  CCTK_PrintBanners();
+  CCTKi_PrintBanners();
 
   return 0;
 }
 
+
  /*@@
-   @routine    InitialiseScheduler
+   @routine    CCTKi_InitialiseScheduler
    @date       Fri Sep 17 19:34:55 1999
    @author     Tom Goodale
    @desc 
@@ -95,13 +95,14 @@ int InitialiseCactus(int *argc, char ***argv, tFleshConfig *ConfigData)
    @endhistory 
 
 @@*/
-int InitialiseScheduler(tFleshConfig *ConfigData)
+
+int CCTKi_InitialiseScheduler(tFleshConfig *ConfigData)
 {
   int retcode;
   
   CCTKi_BindingsScheduleInitialise();
 
-  retcode = CCTKi_ScheduleSortAllGroups();
+  retcode = CCTKi_DoScheduleSortAllGroups();
 
   CCTK_PRINTSEPARATOR
   CCTK_SchedulePrint(NULL);
diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c
index 6bf1443c..341efff1 100644
--- a/src/main/InitialiseDataStructures.c
+++ b/src/main/InitialiseDataStructures.c
@@ -14,16 +14,16 @@ static char *rcsid = "$Id$";
 #include <string.h>
 
 #include "cctk_Flesh.h"
+#include "cctk_ActiveThorns.h"
+#include "cctki_ActiveThorns.h"
+#include "cctki_Cache.h"
 
 /* FIXME - remove this when ActiveThorns doesn't need it */
 #include "SKBinTree.h"
 
-#include "cctk_ActiveThorns.h"
-
-#include "cctki_Cache.h"
 
  /*@@
-   @routine    InitialiseDataStructures
+   @routine    CCTKi_InitialiseDataStructures
    @date       Wed Jan 20 09:27:56 1999
    @author     Tom Goodale
    @desc 
@@ -37,7 +37,7 @@ static char *rcsid = "$Id$";
 
 @@*/
 
-int InitialiseDataStructures(tFleshConfig *ConfigData)
+int CCTKi_InitialiseDataStructures(tFleshConfig *ConfigData)
 {
 
   CCTKi_RegisterDefaultTimerFunctions();
diff --git a/src/main/OverloadMain.c b/src/main/OverloadMain.c
index fd8b5872..4bd49c3c 100644
--- a/src/main/OverloadMain.c
+++ b/src/main/OverloadMain.c
@@ -45,7 +45,7 @@ static char *rcsid="$Header$";
 #undef OVERLOADABLE
 
  /*@@
-   @routine    SetupMainFunctions
+   @routine    CCTKi_SetupMainFunctions
    @date       Thu Feb  4 09:02:49 1999
    @author     Tom Goodale
    @desc 
@@ -58,7 +58,7 @@ static char *rcsid="$Header$";
    @endhistory 
 
 @@*/
-int SetupMainFunctions(void)
+int CCTKi_SetupMainFunctions(void)
 {
 
 #define OVERLOADABLE(name) OVERLOADABLE_CHECK(name)
diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 708cc07f..d08d1772 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -81,26 +81,26 @@ typedef struct PARAMTREENODE
 } t_paramtreenode;
 
 static t_param *ParameterFind(const char *name, 
-                                  const char *thorn, 
-                                  int scope);
+			      const char *thorn, 
+			      int scope);
 
 static t_param *ParameterNew(const char *thorn,
-                                 const char *name,
-                                 const char *type,
-                                 const char *scope,
-                                 int        steerable,
-                                 const char *description,
-                                 const char *defval,
-                                 void       *data);
-
-static int ParameterCheck       (const char *thorn,
-                                 const char *name,
-                                 const char *type,
-                                 const char *scope,
-                                 int        steerable,
-                                 const char *description,
-                                 const char *defval,
-                                 void       *data);
+			     const char *name,
+			     const char *type,
+			     const char *scope,
+			     int        steerable,
+			     const char *description,
+			     const char *defval,
+			     void       *data);
+
+static int ParameterCheck(const char *thorn,
+			  const char *name,
+			  const char *type,
+			  const char *scope,
+			  int        steerable,
+			  const char *description,
+			  const char *defval,
+			  void       *data);
 
 static void *ParameterGetSimple (t_param *param, 
                                  int *type);
@@ -143,7 +143,7 @@ static int ParameterSetBoolean  (t_param *param, const char *value);
 static t_sktree *paramtree=NULL;
 
 /*@@
-   @routine    ParameterCreate
+   @routine    CCTKi_ParameterCreate
    @date       Tue Jun 29 10:08:56 1999
    @author     Tom Goodale
    @desc 
@@ -213,16 +213,16 @@ static t_sktree *paramtree=NULL;
    @endreturndesc
 
 @@*/
-int ParameterCreate(const char *name,
-                    const char *thorn,
-                    const char *type,
-                    const char *scope,
-                    int        steerable,
-                    const char *description,
-                    const char *defval,
-                    void       *data,
-                    int n_ranges,
-                    ...)
+int CCTKi_ParameterCreate(const char *name,
+			  const char *thorn,
+			  const char *type,
+			  const char *scope,
+			  int        steerable,
+			  const char *description,
+			  const char *defval,
+			  void       *data,
+			  int n_ranges,
+			  ...)
 {
   int retval;
   int iscope;
@@ -269,7 +269,7 @@ int ParameterCreate(const char *name,
 }
 
 /*@@
-   @routine    ParameterAddRange
+   @routine    CCTKi_ParameterAddRange
    @date       Tue Jun 29 10:15:53 1999
    @author     Tom Goodale
    @desc 
@@ -323,11 +323,11 @@ int ParameterCreate(const char *name,
    @endreturndesc
 
 @@*/
-int ParameterAddRange(const char *implementation, 
-                      const char *name,
-                      const char *range_origin,
-                      const char *range,
-                      const char *range_description)
+int CCTKi_ParameterAddRange(const char *implementation, 
+			    const char *name,
+			    const char *range_origin,
+			    const char *range,
+			    const char *range_description)
 {
   int retval;
   t_param *param;
@@ -412,9 +412,10 @@ int ParameterAddRange(const char *implementation,
    @endreturndesc
 
 @@*/
-int ParameterSet(const char *name,
-                 const char *thorn,
-                 const char *value)
+
+int CCTK_ParameterSet(const char *name,
+		      const char *thorn,
+		      const char *value)
 {
   int retval;
   t_param *param;
@@ -1730,11 +1731,11 @@ struct
 
 int main(void)
 {
-  ParameterCreate("a", "thorn1", "imp1", "int", "global", 0,
-                  "The a param", "2", &(params.a));
+  CCTKi_ParameterCreate("a", "thorn1", "imp1", "int", "global", 0,
+			"The a param", "2", &(params.a));
 
-  ParameterCreate("foo", "thorn2", "imp2", "keyword", "private", 0,
-                  "The foo param", "bingo", &(params.foo));
+  CCTKi_ParameterCreate("foo", "thorn2", "imp2", "keyword", "private", 0,
+			"The foo param", "bingo", &(params.foo));
 
   printf("Testing thorn,null\n");
 
diff --git a/src/schedule/ScheduleCreater.c b/src/schedule/ScheduleCreater.c
index bfedfa1a..18586ffd 100644
--- a/src/schedule/ScheduleCreater.c
+++ b/src/schedule/ScheduleCreater.c
@@ -46,7 +46,7 @@ static cHandledData *schedule_groups = NULL;
  ********************************************************************/
 
  /*@@
-   @routine    CCTKi_ScheduleAddModifer
+   @routine    CCTKi_DoScheduleAddModifer
    @date       Thu Sep  9 21:45:25 1999
    @author     Tom Goodale
    @desc 
@@ -59,7 +59,7 @@ static cHandledData *schedule_groups = NULL;
    @endhistory 
 
 @@*/
-t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig, 
+t_sched_modifier *CCTKi_DoScheduleAddModifier(t_sched_modifier *orig, 
                                             const char *modifier, 
                                             const char *argument)
 {
@@ -89,7 +89,7 @@ t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig,
 }
 
  /*@@
-   @routine    CCTKi_ScheduleFunction
+   @routine    CCTKi_DoScheduleFunction
    @date       Thu Sep  9 21:42:58 1999
    @author     Tom Goodale
    @desc 
@@ -102,7 +102,7 @@ t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig,
    @endhistory 
 
 @@*/
-int CCTKi_ScheduleFunction(const char *gname, 
+int CCTKi_DoScheduleFunction(const char *gname, 
                            const char *fname, 
                            void *func, 
                            t_sched_modifier *modifiers, 
@@ -144,7 +144,7 @@ int CCTKi_ScheduleFunction(const char *gname,
 }
     
  /*@@
-   @routine    CCTKi_ScheduleGroup
+   @routine    CCTKi_DoScheduleGroup
    @date       Thu Sep  9 21:43:44 1999
    @author     Tom Goodale
    @desc 
@@ -157,7 +157,7 @@ int CCTKi_ScheduleFunction(const char *gname,
    @endhistory 
 
 @@*/
-int CCTKi_ScheduleGroup(const char *gname, 
+int CCTKi_DoScheduleGroup(const char *gname, 
                         const char *thisname, 
                         t_sched_modifier *modifiers, 
                         void *attributes)
@@ -208,7 +208,7 @@ int CCTKi_ScheduleGroup(const char *gname,
 }
 
  /*@@
-   @routine    CCTKi_ScheduleSortAllGroups
+   @routine    CCTKi_DoScheduleSortAllGroups
    @date       Wed Sep 15 22:37:49 1999
    @author     Tom Goodale
    @desc 
@@ -221,7 +221,7 @@ int CCTKi_ScheduleGroup(const char *gname,
    @endhistory 
 
 @@*/
-int CCTKi_ScheduleSortAllGroups(void)
+int CCTKi_DoScheduleSortAllGroups(void)
 {
   int group;
   t_sched_group *gdata;
@@ -251,7 +251,7 @@ int CCTKi_ScheduleSortAllGroups(void)
   return -n_errors;
 }
 
-cHandledData *CCTKi_ScheduleGetGroups(void)
+cHandledData *CCTKi_DoScheduleGetGroups(void)
 {
   return schedule_groups;
 }
@@ -722,17 +722,17 @@ int main(int argc, char *argv[])
 {
   t_sched_modifier *modifier;
 
-  modifier = CCTKi_ScheduleAddModifier(NULL, "before", "c");
-  modifier = CCTKi_ScheduleAddModifier(modifier, "after",  "a");
+  modifier = CCTKi_DoScheduleAddModifier(NULL, "before", "c");
+  modifier = CCTKi_DoScheduleAddModifier(modifier, "after",  "a");
 
-  CCTKi_ScheduleFunction("group_a", "c", func_c, NULL, NULL);
-  CCTKi_ScheduleFunction("group_a", "b", func_b, modifier, NULL);
-  CCTKi_ScheduleFunction("group_a", "a", func_a, NULL, NULL);
-  CCTKi_ScheduleFunction("group_b", "a", func_a, NULL, NULL);
-  CCTKi_ScheduleFunction("group_b", "b", func_b, NULL, NULL);
-  CCTKi_ScheduleGroup("group_a", "group_b", modifier, NULL);
+  CCTKi_DoScheduleFunction("group_a", "c", func_c, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_a", "b", func_b, modifier, NULL);
+  CCTKi_DoScheduleFunction("group_a", "a", func_a, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_b", "a", func_a, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_b", "b", func_b, NULL, NULL);
+  CCTKi_DoScheduleGroup("group_a", "group_b", modifier, NULL);
 
-  CCTKi_ScheduleSortAllGroups();
+  CCTKi_DoScheduleSortAllGroups();
 
   return 0;
 }
diff --git a/src/schedule/ScheduleTraverse.c b/src/schedule/ScheduleTraverse.c
index 0a3afb6b..8ddf0b8b 100644
--- a/src/schedule/ScheduleTraverse.c
+++ b/src/schedule/ScheduleTraverse.c
@@ -42,7 +42,7 @@ static int ScheduleTraverseFunction(void *function,
  ********************************************************************/
 
  /*@@
-   @routine    CCTKi_ScheduleTraverse
+   @routine    CCTKi_DoScheduleTraverse
    @date       Thu Sep 16 09:05:23 1999
    @author     Tom Goodale
    @desc 
@@ -55,7 +55,7 @@ static int ScheduleTraverseFunction(void *function,
    @endhistory 
 
 @@*/
-int CCTKi_ScheduleTraverse(const char *group_name,
+int CCTKi_DoScheduleTraverse(const char *group_name,
                            int (*item_entry)(void *, void *),
                            int (*item_exit)(void *, void *),
                            int  (*while_check)(int, char **, void *, void *),
@@ -67,7 +67,7 @@ int CCTKi_ScheduleTraverse(const char *group_name,
   int handle;
   int retcode;
 
-  schedule_groups = CCTKi_ScheduleGetGroups();
+  schedule_groups = CCTKi_DoScheduleGetGroups();
 
   handle = Util_GetHandle(schedule_groups, group_name, (void *)&group);
 
@@ -330,19 +330,19 @@ int main(int argc, char *argv[])
 {
   t_sched_modifier *modifier;
 
-  modifier = CCTKi_ScheduleAddModifer(NULL, "before", "c");
-  modifier = CCTKi_ScheduleAddModifer(modifier, "after",  "a");
+  modifier = CCTKi_DoScheduleAddModifer(NULL, "before", "c");
+  modifier = CCTKi_DoScheduleAddModifer(modifier, "after",  "a");
 
-  CCTKi_ScheduleFunction("group_a", "c", func_c, NULL, NULL);
-  CCTKi_ScheduleFunction("group_a", "b", func_b, modifier, NULL);
-  CCTKi_ScheduleFunction("group_a", "a", func_a, NULL, NULL);
-  CCTKi_ScheduleFunction("group_b", "a", func_a, NULL, NULL);
-  CCTKi_ScheduleFunction("group_b", "b", func_b, NULL, NULL);
-  CCTKi_ScheduleGroup("group_a", "group_b", modifier, NULL);
+  CCTKi_DoScheduleFunction("group_a", "c", func_c, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_a", "b", func_b, modifier, NULL);
+  CCTKi_DoScheduleFunction("group_a", "a", func_a, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_b", "a", func_a, NULL, NULL);
+  CCTKi_DoScheduleFunction("group_b", "b", func_b, NULL, NULL);
+  CCTKi_DoScheduleGroup("group_a", "group_b", modifier, NULL);
 
-  CCTKi_ScheduleSortAllGroups();
+  CCTKi_DoScheduleSortAllGroups();
 
-  CCTKi_ScheduleTraverse("group_a", NULL, NULL, NULL, fprocess, NULL);
+  CCTKi_DoScheduleTraverse("group_a", NULL, NULL, NULL, fprocess, NULL);
 
   return 0;
 }
diff --git a/src/util/Cache.c b/src/util/Cache.c
index 42a99a4d..a0e37c4e 100644
--- a/src/util/Cache.c
+++ b/src/util/Cache.c
@@ -33,7 +33,7 @@ static int cache_set = 0;
  ********************************************************************/
 
  /*@@
-   @routine    CCTK_CacheMalloc
+   @routine    Util_CacheMalloc
    @date       Tue Nov 30 08:13:03 1999
    @author     Tom Goodale
    @desc 
@@ -73,7 +73,7 @@ static int cache_set = 0;
    @endreturndesc
 
 @@*/
-void *CCTK_CacheMalloc(unsigned index, 
+void *Util_CacheMalloc(unsigned index, 
                        unsigned long size, 
                        void **realstart)
 {
@@ -85,7 +85,7 @@ void *CCTK_CacheMalloc(unsigned index,
   unsigned long initial_index;
   unsigned long pad;
 
-  if(CCTKi_CacheDataGet(&cacheline_bytes, &cache_size))
+  if(Utili_CacheDataGet(&cacheline_bytes, &cache_size))
   {
     cacheline_bytes = 0;
     cache_size = 0;
@@ -126,7 +126,7 @@ void *CCTK_CacheMalloc(unsigned index,
  ********************************************************************/
 
  /*@@
-   @routine    CCTKi_CacheDataSet
+   @routine    Utili_CacheDataSet
    @date       Tue Nov 30 08:12:05 1999
    @author     Tom Goodale
    @desc 
@@ -159,7 +159,7 @@ void *CCTK_CacheMalloc(unsigned index,
    @endreturndesc
 
 @@*/
-int CCTKi_CacheDataSet(unsigned long cacheline_bytes,
+int Utili_CacheDataSet(unsigned long cacheline_bytes,
                        unsigned long cache_size)
 {
   cache_data.cacheline_bytes = cacheline_bytes;
@@ -171,7 +171,7 @@ int CCTKi_CacheDataSet(unsigned long cacheline_bytes,
 }
 
  /*@@
-   @routine    CCTKi_CacheDataGet
+   @routine    Utili_CacheDataGet
    @date       Tue Nov 30 08:12:41 1999
    @author     Tom Goodale
    @desc 
@@ -205,7 +205,7 @@ int CCTKi_CacheDataSet(unsigned long cacheline_bytes,
    @endreturndesc
 
 @@*/
-int CCTKi_CacheDataGet(unsigned long *cacheline_bytes,
+int Utili_CacheDataGet(unsigned long *cacheline_bytes,
                        unsigned long *cache_size)
 {
   int retcode;