Index: src/Registration.c
===================================================================
RCS file: /cactusdevcvs/CactusPUGH/PUGH/src/Registration.c,v
retrieving revision 1.1
diff -u -r1.1 Registration.c
--- src/Registration.c	14 Dec 2005 22:14:41 -0000	1.1
+++ src/Registration.c	24 Mar 2006 04:08:27 -0000
@@ -64,11 +64,11 @@
  *********************  Local Data  *********************************
  ********************************************************************/
 
-int (*PUGHi_GenerateTopology) (int dim, 
-                               int total_procs, 
-                               const int *nsize, 
-                               const int *nghostzones, 
-                               int *nprocs) = GenerateTopologyUnavailable;
+int (*PUGH_GenerateTopology) (int dim, 
+                              int total_procs, 
+                              const int *nsize, 
+                              const int *nghostzones, 
+                              int *nprocs) = GenerateTopologyUnavailable;
 
 void *(*PUGHi_CreateP2LTranslation) (int dim, 
                                      int *nprocs, 
@@ -109,7 +109,7 @@
   
   if (CCTK_Equals(processor_topology, topologyname))
   {
-    if (PUGHi_GenerateTopology != GenerateTopologyUnavailable)
+    if (PUGH_GenerateTopology != GenerateTopologyUnavailable)
     {
       CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                  "Attempted to register topology generator %s more than once!", 
@@ -117,7 +117,7 @@
     }
     else
     {
-      PUGHi_GenerateTopology = GenerateTopology;
+      PUGH_GenerateTopology = GenerateTopology;
       CCTK_VInfo(CCTK_THORNSTRING, "Using topology generator: %s", 
                  topologyname);
       
Index: src/SetupPGV.c
===================================================================
RCS file: /cactusdevcvs/CactusPUGH/PUGH/src/SetupPGV.c,v
retrieving revision 1.59
diff -u -r1.59 SetupPGV.c
--- src/SetupPGV.c	14 Dec 2005 22:14:41 -0000	1.59
+++ src/SetupPGV.c	24 Mar 2006 04:09:30 -0000
@@ -238,8 +239,8 @@
       this->neighbours[i] = this->neighbours[0]+(2*dim*i);
     }
 
-    PUGHi_GenerateTopology(dim, total_procs, nsize, nghostzones, 
-                             this->nprocs);
+    PUGH_GenerateTopology(dim, total_procs, nsize, nghostzones, 
+                          this->nprocs);
 
     PUGH_GenerateNeighbours(dim, total_procs, this->nprocs, this->neighbours,
                             this->perme);
Index: src/include/pugh.h
===================================================================
RCS file: /cactusdevcvs/CactusPUGH/PUGH/src/include/pugh.h,v
retrieving revision 1.33
diff -u -r1.33 pugh.h
--- src/include/pugh.h	29 Jan 2005 17:49:20 -0000	1.33
+++ src/include/pugh.h	24 Mar 2006 04:10:49 -0000
@@ -178,6 +188,12 @@
 
 int PUGH_SetTopology (int dim, const int topology[]);
 
+extern int (*PUGH_GenerateTopology)(int dim, 
+                                    int total_procs, 
+                                    const int *nsize,
+                                    const int *nghostzones, 
+                                    int *nprocs);
+
 #ifdef CCTK_MPI
 MPI_Datatype PUGH_MPIDataType (const pGH *pughGH, int cctk_type);
 #endif
Index: src/include/pughi.h
===================================================================
RCS file: /cactusdevcvs/CactusPUGH/PUGH/src/include/pughi.h,v
retrieving revision 1.18
diff -u -r1.18 pughi.h
--- src/include/pughi.h	14 Dec 2005 22:14:41 -0000	1.18
+++ src/include/pughi.h	24 Mar 2006 04:10:56 -0000
@@ -20,12 +20,6 @@
 extern int (*PUGHi_PhysicalToLogical) (void *table, int proc);
 extern int (*PUGHi_LogicalToPhysical) (void *table, int num);
 
-extern int (*PUGHi_GenerateTopology)(int dim, 
-                                     int total_procs, 
-                                     const int *nsize,
-                                     const int *nghostzones, 
-                                     int *nprocs);
-
 extern void *(*PUGHi_CreateP2LTranslation)(int dim, 
                                            int *nprocs, 
                                            int np);