diff --git a/test/H5Part/Bench.c b/test/H5Part/Bench.c
index 1b8d9ab..bae0021 100644
--- a/test/H5Part/Bench.c
+++ b/test/H5Part/Bench.c
@@ -55,7 +55,7 @@ int main(int argc,char *argv[]){
   int localnp;
   char filename[128]; /*= FILENAME; */
 #ifndef DISABLE_H5PART
-  H5PartFile *f;
+  h5_file_t *f;
 #endif
   char newfilename[128];
   FILE *fd;
diff --git a/test/H5Part/H5PartAndreasTest.cc b/test/H5Part/H5PartAndreasTest.cc
index d0ba2c9..aab48b8 100755
--- a/test/H5Part/H5PartAndreasTest.cc
+++ b/test/H5Part/H5PartAndreasTest.cc
@@ -16,8 +16,8 @@ int main(int argc,char *argv[]){
   int N = 10;
   int sz=0;
   double *x,*y,*z;
-  h5part_int64_t *id;
-  H5PartFile *file;
+  h5_int64_t *id;
+  h5_file_t *file;
   int i,t,nt,nds;
   int nprocs,myproc;
 
@@ -47,7 +47,7 @@ int main(int argc,char *argv[]){
     x =(double*)malloc(1+sz*sizeof(double));
     y =(double*)malloc(1+sz*sizeof(double));
     z =(double*)malloc(1+sz*sizeof(double));
-    id=(h5part_int64_t*)malloc(1+sz*sizeof(h5part_int64_t));
+    id=(h5_int64_t*)malloc(1+sz*sizeof(h5_int64_t));
 
     for(i=0;i<sz;i++) {
       x[i]=(double)(i+t)+10.0*(double)myproc;
@@ -101,7 +101,7 @@ int main(int argc,char *argv[]){
   file=H5PartOpenFileParallel("parttest.h5",H5PART_READ,comm);
   H5PartSetStep(file,0);
 
-  nt = H5PartGetNumSteps(file); /* get number of steps in file */
+  nt = H5GetNumSteps(file); /* get number of steps in file */
   nds=H5PartGetNumDatasets(file); /* get number of datasets in timestep 0 */
 
   MPI_Barrier(comm);
diff --git a/test/H5Part/H5PartTest.cc b/test/H5Part/H5PartTest.cc
index 6bd6f6b..3b4e96e 100644
--- a/test/H5Part/H5PartTest.cc
+++ b/test/H5Part/H5PartTest.cc
@@ -28,7 +28,7 @@ int main(int argc,char *argv[]){
   x=(double*)malloc(sz*nprocs*sizeof(double));
   y=(double*)malloc(sz*nprocs*sizeof(double));
   z=(double*)malloc(sz*nprocs*sizeof(double));
-  id=(h5part_int64_t*)malloc(sz*nprocs*sizeof(h5part_int64_t));
+  id=(h5_int64_t*)malloc(sz*nprocs*sizeof(h5_int64_t));
   /* parallel file creation */
   file=H5PartOpenFileParallel("parttest.h5",H5PART_WRITE,comm);
   if(!file) {