diff --git a/src/H5Block.c b/src/H5Block.c
index 1f43a8f..38c9d63 100644
--- a/src/H5Block.c
+++ b/src/H5Block.c
@@ -121,7 +121,7 @@ _normalize_partition (
 #ifdef PARALLEL_IO
 static h5part_int64_t
 _allgather (
-	const H5PartFile *f		/*!< IN: file handle */
+	const h5_file *f		/*!< IN: file handle */
 	) {
 	struct H5BlockPartition *partition = &f->block->user_layout[f->myproc];
 	struct H5BlockPartition *layout = f->block->user_layout;
@@ -140,7 +140,7 @@ _allgather (
 #else
 static h5part_int64_t
 _allgather (
-	const H5PartFile *f		/*!< IN: file handle */
+	const h5_file *f		/*!< IN: file handle */
 	) {
 
 	return H5PART_SUCCESS;
@@ -157,10 +157,10 @@ _allgather (
 */
 static void
 _get_dimension_sizes (
-	H5PartFile *f			/*!< IN: file handle */
+	h5_file *f			/*!< IN: file handle */
 	) {
 	int proc;
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 	struct H5BlockPartition *partition = b->user_layout;
 
 	b->i_max = 0;
@@ -422,10 +422,10 @@ _dissolve_ghostzone (
 */
 static h5part_int64_t
 _dissolve_ghostzones (
-	H5PartFile *f	/*!< IN: file handle */
+	h5_file *f	/*!< IN: file handle */
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 	struct H5BlockPartition *p;
 	struct H5BlockPartition *q;
 	int proc_p, proc_q;
@@ -534,7 +534,7 @@ _dissolve_ghostzones (
 */
 h5part_int64_t
 _release_hyperslab (
-	H5PartFile *f			/*!< IN: file handle */
+	h5_file *f			/*!< IN: file handle */
 	) {
 	herr_t herr;
 
@@ -568,7 +568,7 @@ _release_hyperslab (
 */
 h5part_int64_t
 H5BlockDefine3DFieldLayout(
-	H5PartFile *f,			/*!< IN: File handle		*/
+	h5_file *f,			/*!< IN: File handle		*/
 	const h5part_int64_t i_start,	/*!< OUT: start index of \c i	*/ 
 	const h5part_int64_t i_end,	/*!< OUT: end index of \c i	*/  
 	const h5part_int64_t j_start,	/*!< OUT: start index of \c j	*/ 
@@ -579,7 +579,7 @@ H5BlockDefine3DFieldLayout(
 
 	SET_FNAME ( "H5BlockDefine3DFieldLayout" );
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 	struct H5BlockPartition *p = &b->user_layout[f->myproc];
 	p->i_start = i_start;
 	p->i_end =   i_end;
@@ -617,7 +617,7 @@ H5BlockDefine3DFieldLayout(
 */
 h5part_int64_t
 H5Block3dGetPartitionOfProc (
-	H5PartFile *f,			/*!< IN: File handle */
+	h5_file *f,			/*!< IN: File handle */
 	const h5part_int64_t proc,	/*!< IN: Processor to get partition from */
 	h5part_int64_t *i_start,	/*!< OUT: start index of \c i	*/ 
 	h5part_int64_t *i_end,		/*!< OUT: end index of \c i	*/  
@@ -656,7 +656,7 @@ H5Block3dGetPartitionOfProc (
 */
 h5part_int64_t
 H5Block3dGetReducedPartitionOfProc (
-	H5PartFile *f,			/*!< IN: File handle */
+	h5_file *f,			/*!< IN: File handle */
 	h5part_int64_t proc,		/*!< IN: Processor to get partition from */
 	h5part_int64_t *i_start,	/*!< OUT: start index of \c i */ 
 	h5part_int64_t *i_end,		/*!< OUT: end index of \c i */  
@@ -695,7 +695,7 @@ H5Block3dGetReducedPartitionOfProc (
 */
 h5part_int64_t
 H5Block3dGetProcOf (
-	H5PartFile *f,			/*!< IN: File handle */
+	h5_file *f,			/*!< IN: File handle */
 	h5part_int64_t i,		/*!< IN: \c i coordinate */
 	h5part_int64_t j,		/*!< IN: \c j coordinate */
 	h5part_int64_t k		/*!< IN: \c k coordinate */
@@ -728,10 +728,10 @@ H5Block3dGetProcOf (
 */
 static h5part_int64_t
 _open_block_group (
-	const H5PartFile *f		/*!< IN: file handle */
+	const h5_file *f		/*!< IN: file handle */
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	if ( (f->timestep != b->timestep) && (b->blockgroup > 0) ) {
 		herr_t herr = H5Gclose ( b->blockgroup );
@@ -774,11 +774,11 @@ _have_object (
 */
 static h5part_int64_t
 _open_field_group (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	h5part_int64_t h5err = _open_block_group ( f );
 	if ( h5err < 0 ) return h5err;
@@ -803,7 +803,7 @@ _open_field_group (
 */
 h5part_int64_t
 _close_field_group (
-	H5PartFile *f			/*!< IN: file handle */
+	h5_file *f			/*!< IN: file handle */
 	) {
 
 	herr_t herr = H5Gclose ( f->block->field_group_id );
@@ -821,11 +821,11 @@ _close_field_group (
 */
 static h5part_int64_t
 _select_hyperslab_for_reading (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	hid_t dataset
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 	struct H5BlockPartition *p = &b->user_layout[f->myproc];
 	int rank;
 	hsize_t field_dims[3];
@@ -909,12 +909,12 @@ _select_hyperslab_for_reading (
 */
 h5part_int64_t
 _read_data (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to read */
 	h5part_float64_t *data		/*!< OUT: ptr to read buffer */
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	hid_t dataset_id = H5Dopen ( b->field_group_id, name );
 	if ( dataset_id < 0 ) return HANDLE_H5D_OPEN_ERR ( name );
@@ -950,7 +950,7 @@ _read_data (
 */
 h5part_int64_t
 H5Block3dReadScalarField (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to read */
 	h5part_float64_t *data		/*!< OUT: ptr to read buffer */
 	) {
@@ -985,7 +985,7 @@ H5Block3dReadScalarField (
 */
 h5part_int64_t
 H5Block3dRead3dVectorField (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to read */
 	h5part_float64_t *x_data,	/*!< OUT: ptr to read buffer X axis */
 	h5part_float64_t *y_data,	/*!< OUT: ptr to read buffer Y axis */
@@ -1023,7 +1023,7 @@ H5Block3dRead3dVectorField (
 */
 static h5part_int64_t
 _select_hyperslab_for_writing (
-	H5PartFile *f		/*!< IN: file handle */
+	h5_file *f		/*!< IN: file handle */
 	) {
 
 	/*
@@ -1032,7 +1032,7 @@ _select_hyperslab_for_writing (
 	if ( f->block->shape >= 0 ) return H5PART_SUCCESS;
 
 	herr_t herr;
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 	struct H5BlockPartition *p = &b->write_layout[f->myproc];
 	struct H5BlockPartition *q = &b->user_layout[f->myproc];
 
@@ -1139,11 +1139,11 @@ _select_hyperslab_for_writing (
 */
 static h5part_int64_t
 _create_block_group (
-	const H5PartFile *f		/*!< IN: file handle */
+	const h5_file *f		/*!< IN: file handle */
 	) {
 
 	herr_t herr;
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	if ( b->blockgroup > 0 ) {
 		herr = H5Gclose ( b->blockgroup );
@@ -1167,12 +1167,12 @@ _create_block_group (
 */
 static h5part_int64_t
 _create_field_group (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name		/*!< IN: name of field group to create */
 	) {
 
 	h5part_int64_t h5err;
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 
 	if ( ! _have_object ( f->timegroup, H5BLOCK_GROUPNAME_BLOCK ) ) {
@@ -1204,12 +1204,12 @@ _create_field_group (
 */
 static h5part_int64_t
 _write_field_data (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to write */
 	const h5part_float64_t *data	/*!< IN: data to write */
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	return H5_write_data (
 		f,
@@ -1235,7 +1235,7 @@ _write_field_data (
 */
 h5part_int64_t
 H5Block3dWriteScalarField (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to write */
 	const h5part_float64_t *data	/*!< IN: scalar data to write */
 	) {
@@ -1274,7 +1274,7 @@ H5Block3dWriteScalarField (
 */
 h5part_int64_t
 H5Block3dWrite3dVectorField (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *name,		/*!< IN: name of dataset to write */
 	const h5part_float64_t *x_data,	/*!< IN: X axis data */
 	const h5part_float64_t *y_data,	/*!< IN: Y axis data */
@@ -1313,7 +1313,7 @@ H5Block3dWrite3dVectorField (
 */
 h5part_int64_t
 H5BlockGetNumFields (
-	H5PartFile *f			/*!< IN: file handle */
+	h5_file *f			/*!< IN: file handle */
 	) {
 
 	SET_FNAME ( "H5BlockGetNumFields" );
@@ -1334,7 +1334,7 @@ H5BlockGetNumFields (
 */
 static h5part_int64_t
 _get_field_info (
-	H5PartFile *f,			/*!< IN: file handle */
+	h5_file *f,			/*!< IN: file handle */
 	const char *field_name,		/*!< IN: field name to get info about */
 	h5part_int64_t *grid_rank,	/*!< OUT: rank of grid */
 	h5part_int64_t *grid_dims,	/*!< OUT: dimensions of grid */
@@ -1395,7 +1395,7 @@ _get_field_info (
 */
 h5part_int64_t
 H5BlockGetFieldInfo (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const h5part_int64_t idx,		/*!< IN: index of field */
 	char *field_name,			/*!< OUT: field name */
 	const h5part_int64_t len_field_name,	/*!< IN: buffer size */
@@ -1429,7 +1429,7 @@ H5BlockGetFieldInfo (
 */
 h5part_int64_t
 H5BlockGetFieldInfoByName (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	h5part_int64_t *grid_rank,		/*!< OUT: grid rank */
 	h5part_int64_t *grid_dims,		/*!< OUT: grid dimensions */
@@ -1454,7 +1454,7 @@ H5BlockGetFieldInfoByName (
 */
 static h5part_int64_t
 _write_field_attrib (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const char *attrib_name,		/*!< IN: attribute name */
 	const hid_t attrib_type,		/*!< IN: attribute type */
@@ -1489,7 +1489,7 @@ _write_field_attrib (
 */
 h5part_int64_t
 H5BlockWriteFieldAttrib (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const char *attrib_name,		/*!< IN: attribute name */
 	const h5part_int64_t attrib_type,	/*!< IN: attribute type */
@@ -1518,7 +1518,7 @@ H5BlockWriteFieldAttrib (
 */
 h5part_int64_t
 H5BlockWriteFieldAttribString (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const char *attrib_name,		/*!< IN: attribute name */
 	const char *attrib_value		/*!< IN: attribute value */
@@ -1544,7 +1544,7 @@ H5BlockWriteFieldAttribString (
 */
 h5part_int64_t
 H5BlockGetNumFieldAttribs (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name			/*<! IN: field name */
 	) {
 
@@ -1576,7 +1576,7 @@ H5BlockGetNumFieldAttribs (
 */
 h5part_int64_t
 H5BlockGetFieldAttribInfo (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const h5part_int64_t attrib_idx,	/*!< IN: attribute index */
 	char *attrib_name,			/*!< OUT: attribute name */
@@ -1617,13 +1617,13 @@ H5BlockGetFieldAttribInfo (
 */
 static h5part_int64_t
 _read_field_attrib (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const char *attrib_name,		/*!< IN: attribute name */
 	void *attrib_value			/*!< OUT: value */
 	) {
 
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	h5part_int64_t herr = _open_field_group ( f, field_name );
 	if ( herr < 0 ) return herr;
@@ -1649,7 +1649,7 @@ _read_field_attrib (
 */
 h5part_int64_t
 H5BlockReadFieldAttrib (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const char *attrib_name,		/*!< IN: attribute name */
 	void *attrib_value			/*!< OUT: value */
@@ -1675,7 +1675,7 @@ H5BlockReadFieldAttrib (
 */
 h5part_int64_t
 H5Block3dGetFieldOrigin (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	h5part_float64_t *x_origin,		/*!< OUT: X origin */
 	h5part_float64_t *y_origin,		/*!< OUT: Y origin */
@@ -1708,7 +1708,7 @@ H5Block3dGetFieldOrigin (
 */
 h5part_int64_t
 H5Block3dSetFieldOrigin (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const h5part_float64_t x_origin,	/*!< IN: X origin */
 	const h5part_float64_t y_origin,	/*!< IN: Y origin */
@@ -1739,7 +1739,7 @@ H5Block3dSetFieldOrigin (
 */
 h5part_int64_t
 H5Block3dGetFieldSpacing (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	h5part_float64_t *x_spacing,		/*!< OUT: X spacing */
 	h5part_float64_t *y_spacing,		/*!< OUT: Y spacing */
@@ -1772,7 +1772,7 @@ H5Block3dGetFieldSpacing (
 */
 h5part_int64_t
 H5Block3dSetFieldSpacing (
-	H5PartFile *f,				/*!< IN: file handle */
+	h5_file *f,				/*!< IN: file handle */
 	const char *field_name,			/*!< IN: field name */
 	const h5part_float64_t x_spacing,	/*!< IN: X spacing */
 	const h5part_float64_t y_spacing,	/*!< IN: Y spacing */
@@ -1805,7 +1805,7 @@ H5Block3dSetFieldSpacing (
 */
 h5part_int64_t
 H5BlockHasFieldData (
-	H5PartFile *f		/*!< IN: file handle */
+	h5_file *f		/*!< IN: file handle */
 	) {
 
 	SET_FNAME ( "H5BlockHasFieldData" );
diff --git a/src/H5Block.h b/src/H5Block.h
index dd540ed..7682902 100644
--- a/src/H5Block.h
+++ b/src/H5Block.h
@@ -12,7 +12,7 @@ extern "C" {
 
 h5part_int64_t
 H5BlockDefine3DFieldLayout (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t i_start,
 	const h5part_int64_t i_end,
 	const h5part_int64_t j_start,
@@ -23,7 +23,7 @@ H5BlockDefine3DFieldLayout (
 
 h5part_int64_t
 H5Block3dGetPartitionOfProc (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t proc,
 	h5part_int64_t *i_start,
 	h5part_int64_t *i_end,
@@ -35,7 +35,7 @@ H5Block3dGetPartitionOfProc (
 
 h5part_int64_t
 H5Block3dGetReducedPartitionOfProc (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t proc,
 	h5part_int64_t *i_start, 
 	h5part_int64_t *i_end,
@@ -47,7 +47,7 @@ H5Block3dGetReducedPartitionOfProc (
 
 h5part_int64_t
 H5Block3dGetProcOf (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t i,
 	h5part_int64_t j,
 	h5part_int64_t k
@@ -55,26 +55,26 @@ H5Block3dGetProcOf (
 
 h5part_int64_t
 H5Block3dWriteScalarField (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_float64_t *data
 	);
 
 h5part_int64_t
 H5Block3dReadScalarField (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	h5part_float64_t *data
 	);
 
 h5part_int64_t
 H5BlockGetNumFields (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5BlockGetFieldInfo (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t idx,
 	char *name,
 	const h5part_int64_t len_name,
@@ -85,7 +85,7 @@ H5BlockGetFieldInfo (
 
 h5part_int64_t
 H5BlockGetFieldInfoByName (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	h5part_int64_t *grid_rank,
 	h5part_int64_t *grid_dims,
@@ -94,7 +94,7 @@ H5BlockGetFieldInfoByName (
 
 h5part_int64_t
 H5Block3dGetFieldOrigin (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	h5part_float64_t *x_origin,
 	h5part_float64_t *y_origin,
@@ -103,7 +103,7 @@ H5Block3dGetFieldOrigin (
 
 h5part_int64_t
 H5Block3dSetFieldOrigin (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const h5part_float64_t x_origin,
 	const h5part_float64_t y_origin,
@@ -112,7 +112,7 @@ H5Block3dSetFieldOrigin (
 
 h5part_int64_t
 H5Block3dGetFieldSpacing (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	h5part_float64_t *x_spacing,
 	h5part_float64_t *y_spacing,
@@ -121,7 +121,7 @@ H5Block3dGetFieldSpacing (
 
 h5part_int64_t
 H5Block3dSetFieldSpacing (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const h5part_float64_t x_spacing,
 	const h5part_float64_t y_spacing,
@@ -132,7 +132,7 @@ H5Block3dSetFieldSpacing (
 
 h5part_int64_t
 H5Block3dWrite3dVectorField (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_float64_t *xval,
 	const h5part_float64_t *yval,
@@ -141,7 +141,7 @@ H5Block3dWrite3dVectorField (
 
 h5part_int64_t
 H5Block3dRead3dVectorField (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	h5part_float64_t *xval,
 	h5part_float64_t *yval,
@@ -150,7 +150,7 @@ H5Block3dRead3dVectorField (
 
 h5part_int64_t
 H5BlockWriteFieldAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const char *attrib_name,
 	const h5part_int64_t attrib_type,
@@ -160,7 +160,7 @@ H5BlockWriteFieldAttrib (
 
 h5part_int64_t
 H5BlockWriteFieldAttribString (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const char *attrib_name,
 	const char *attrib_value
@@ -168,13 +168,13 @@ H5BlockWriteFieldAttribString (
 
 h5part_int64_t
 H5BlockGetNumFieldAttribs (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name
 	);
 
 h5part_int64_t
 H5BlockGetFieldAttribInfo (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const h5part_int64_t attrib_idx,
 	char *attrib_name,
@@ -185,7 +185,7 @@ H5BlockGetFieldAttribInfo (
 
 h5part_int64_t
 H5BlockReadFieldAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *field_name,
 	const char *attrib_name,
 	void *attrib_value
@@ -193,7 +193,7 @@ H5BlockReadFieldAttrib (
 
 h5part_int64_t
 H5BlockHasFieldData (
-	H5PartFile *f
+	h5_file *f
 	);
 
 
diff --git a/src/H5BlockTypes.h b/src/H5BlockTypes.h
index e12742d..db96723 100644
--- a/src/H5BlockTypes.h
+++ b/src/H5BlockTypes.h
@@ -10,7 +10,7 @@ struct H5BlockPartition {
 	h5part_int64_t	k_end;
 };
 
-struct H5BlockStruct {
+struct h5b_fdata {
 	h5part_int64_t timestep;
 	h5part_int64_t i_max;
 	h5part_int64_t j_max;
diff --git a/src/H5Fed.h b/src/H5Fed.h
index f16a8eb..f857bf5 100644
--- a/src/H5Fed.h
+++ b/src/H5Fed.h
@@ -142,7 +142,7 @@ h5_int_t H5FedHasBoundaryMesh(
   \return number of vertices
   \return \c -1	on error.
 */
-h5_size_t H5FedGetNumVerticesInMesh (
+h5_size_t H5FedGetNumVertices (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -156,7 +156,7 @@ h5_size_t H5FedGetNumVerticesInMesh (
   \return number of vertices
   \return \c -1	on error.
 */
-h5_size_t H5FedGetNumVerticesInMeshTotal(
+h5_size_t H5FedGetNumVerticesTotal(
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -170,7 +170,7 @@ h5_size_t H5FedGetNumVerticesInMeshTotal(
   \return number of vertices
   \return \c -1	on error.
 */
-h5_size_t H5FedGetNumVerticesInMeshOnNode (
+h5_size_t H5FedGetNumVerticesCnode (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
 	const h5_id_t cnode		/*!< compute node		*/
@@ -225,7 +225,7 @@ h5_size_t H5FedGetNumEdgesInTetrahedralMeshTotal (
   \return number of edges
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumEdgeInTetrahedralMeshOfNode (
+h5_size_t H5FedGetNumEdgeInTetrahedralMeshCnode (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
 	const h5_id_t cnode		/*!< compute node		*/
@@ -275,7 +275,7 @@ h5_size_t H5FedGetNumTrianglesInTetrahedralMeshTotal (
   \return Number of triangles
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumTrianglesInTetrahedralMeshOnNode (
+h5_size_t H5FedGetNumTrianglesInTetrahedralMeshCnode (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
 	const h5_id_t cnode		/*!< compute node		*/
@@ -297,7 +297,7 @@ h5_size_t H5FedGetNumTrianglesInTetrahedralMeshOnNode (
   to collect the number from the other cnodes and store them into an
   array.  The inquired number will be provided from this array.
 */
-h5_size_t H5FedGetNumTetrahedraInMesh(
+h5_size_t H5FedGetNumTetrahedra (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -311,7 +311,7 @@ h5_size_t H5FedGetNumTetrahedraInMesh(
   \return number of tetrahedra
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumTetrahedraInMeshTotal(
+h5_size_t H5FedGetNumTetrahedraTotal(
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -325,7 +325,7 @@ h5_size_t H5FedGetNumTetrahedraInMeshTotal(
   \return number of tetrahedra
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumTetrahedraInMeshOnNode (
+h5_size_t H5FedGetNumTetrahedraCnode (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
 	const h5_id_t cnode		/*!< compute node		*/
@@ -354,7 +354,7 @@ h5_size_t H5FedGetNumTetrahedraInMeshOnNode (
   to collect the number from the other cnodes and store them into an
   array.  The inquired number will be provided from this array.
 */
-h5_size_t H5FedGetNumBoundaryTrianglesInMesh (
+h5_size_t H5FedGetNumBoundaryTriangles (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -368,7 +368,7 @@ h5_size_t H5FedGetNumBoundaryTrianglesInMesh (
   \return number of tetrahedras
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumBoundaryTrianglesInMeshTotal (
+h5_size_t H5FedGetNumBoundaryTrianglesTotal (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level		/*!< mesh level to query	*/
 	);
@@ -382,7 +382,7 @@ h5_size_t H5FedGetNumBoundaryTrianglesInMeshTotal (
   \return number of tetrahedras
   \return \c -1 on error.
 */
-h5_size_t H5FedGetNumBoundaryTrianglesInMeshOnNode (
+h5_size_t H5FedGetNumBoundaryTrianglesCnode (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
 	const h5_id_t cnode		/*!< compute node		*/
@@ -390,6 +390,21 @@ h5_size_t H5FedGetNumBoundaryTrianglesInMeshOnNode (
 
 /******	RETRIEVAL routines **************************************************/
 
+h5_int_t H5FedSetNumVertices (
+	h5_file * fh,			/*!< file handle		*/
+	const h5_id_t level,		/*!< mesh level			*/
+	const h5_size_t num_vertices	/*!< number of verices at level
+					  \c level			*/
+	);
+
+h5_int_t H5FedSetNumTetrahedra (
+	h5_file * fh,			/*!< file handle		*/
+	const h5_id_t level,		/*!< mesh level			*/
+	const h5_size_t num_tet		/*!< number of tetrahedra at
+					  level \c level		*/
+	);
+
+
 /*!
   \ingroup h5fed_c_api
 
@@ -472,7 +487,7 @@ h5_triangle * H5FedGetTriangle (
 h5_tetrahedron * H5FedGetTetrahedron (
 	h5_file * fh,			/*!< file handle		*/
 	const h5_id_t level,		/*!< mesh level to query	*/
-	const h5_id_t tetra_id		/*!< global tetrahedron id	*/
+	const h5_id_t tet_id,		/*!< global tetrahedron id	*/
 	h5_id_t * parent_id		/*!< OUT: parent id if level
 					     \c >0 else \c -1		*/
 	);
diff --git a/src/H5Part.c b/src/H5Part.c
index be8c82f..4a03fc3 100644
--- a/src/H5Part.c
+++ b/src/H5Part.c
@@ -122,14 +122,14 @@ extern unsigned			_debug;
 
   The typical extension for these files is \c .h5.
   
-  H5PartFile should be treated as an essentially opaque
+  h5_file should be treated as an essentially opaque
   datastructure.  It acts as the file handle, but internally
   it maintains several key state variables associated with 
   the file.
 
   \return	File handle or \c NULL
  */
-H5PartFile*
+h5_file*
 H5PartOpenFileParallel (
 	const char *filename,	/*!< [in] The name of the data file to open. */
 	unsigned flags,		/*!< [in] The access mode for the file. */
@@ -153,7 +153,7 @@ H5PartOpenFileParallel (
 
   The typical extension for these files is \c .h5.
   
-  H5PartFile should be treated as an essentially opaque
+  h5_file should be treated as an essentially opaque
   datastructure.  It acts as the file handle, but internally
   it maintains several key state variables associated with 
   the file.
@@ -161,7 +161,7 @@ H5PartOpenFileParallel (
   \return	File handle or \c NULL
  */
 
-H5PartFile*
+h5_file*
 H5PartOpenFile (
 	const char *filename,	/*!< [in] The name of the data file to open. */
 	unsigned flags		/*!< [in] The access mode for the file. */
@@ -184,7 +184,7 @@ H5PartOpenFile (
 */
 h5part_int64_t
 H5PartCloseFile (
-	H5PartFile *f		/*!< [in] filehandle of the file to close */
+	h5_file *f		/*!< [in] filehandle of the file to close */
 	) {
 
 	SET_FNAME ( "H5PartCloseFile" );
@@ -196,7 +196,7 @@ H5PartCloseFile (
 
 h5part_int64_t
 H5PartDefineStepName (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_int64_t width
 	) {
@@ -221,7 +221,7 @@ H5PartDefineStepName (
  */
 h5part_int64_t
 H5PartSetNumParticles (
-	H5PartFile *f,			/*!< [in] Handle to open file */
+	h5_file *f,			/*!< [in] Handle to open file */
 	h5part_int64_t nparticles	/*!< [in] Number of particles */
 	) {
 
@@ -258,7 +258,7 @@ H5PartSetNumParticles (
  */
 h5part_int64_t
 H5PartWriteDataFloat64 (
-	H5PartFile *f,			/*!< [in] Handle to open file */
+	h5_file *f,			/*!< [in] Handle to open file */
 	const char *name,		/*!< [in] Name to associate array with */
 	const h5part_float64_t *array	/*!< [in] Array to commit to disk */
 	) {
@@ -296,7 +296,7 @@ H5PartWriteDataFloat64 (
  */
 h5part_int64_t
 H5PartWriteDataInt64 (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *name,	/*!< [in] Name to associate array with */
 	const h5part_int64_t *array	/*!< [in] Array to commit to disk */
 	) {
@@ -334,7 +334,7 @@ H5PartWriteDataInt64 (
 */
 h5part_int64_t
 H5PartWriteFileAttribString (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *attrib_name,/*!< [in] Name of attribute to create */
 	const char *attrib_value/*!< [in] Value of attribute */ 
 	) {
@@ -369,7 +369,7 @@ H5PartWriteFileAttribString (
 
 h5part_int64_t
 H5PartWriteStepAttribString (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *attrib_name,/*!< [in] Name of attribute to create */
 	const char *attrib_value/*!< [in] Value of attribute */ 
 	) {
@@ -408,7 +408,7 @@ H5PartWriteStepAttribString (
 
 h5part_int64_t
 H5PartWriteStepAttrib (
-	H5PartFile *f,			/*!< [in] Handle to open file */
+	h5_file *f,			/*!< [in] Handle to open file */
 	const char *attrib_name,	/*!< [in] Name of attribute */
 	const h5part_int64_t attrib_type,/*!< [in] Type of value. */
 	const void *attrib_value,	/*!< [in] Value of attribute */ 
@@ -449,7 +449,7 @@ H5PartWriteStepAttrib (
 
 h5part_int64_t
 H5PartWriteFileAttrib (
-	H5PartFile *f,			/*!< [in] Handle to open file */
+	h5_file *f,			/*!< [in] Handle to open file */
 	const char *attrib_name,	/*!< [in] Name of attribute */
 	const h5part_int64_t attrib_type,/*!< [in] Type of value. */
 	const void *attrib_value,	/*!< [in] Value of attribute */ 
@@ -478,7 +478,7 @@ H5PartWriteFileAttrib (
 */
 h5part_int64_t
 H5PartGetNumStepAttribs (
-	H5PartFile *f			/*!< [in] Handle to open file */
+	h5_file *f			/*!< [in] Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartGetNumStepAttribs" );
@@ -498,7 +498,7 @@ H5PartGetNumStepAttribs (
 */
 h5part_int64_t
 H5PartGetNumFileAttribs (
-	H5PartFile *f			/*!< [in] Handle to open file */
+	h5_file *f			/*!< [in] Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartGetNumFileAttribs" );
@@ -525,7 +525,7 @@ H5PartGetNumFileAttribs (
 */
 h5part_int64_t
 H5PartGetStepAttribInfo (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t attrib_idx,/*!< [in]  Index of attribute to
 					           get infos about */
 	char *attrib_name,		/*!< [out] Name of attribute */
@@ -565,7 +565,7 @@ H5PartGetStepAttribInfo (
 
 h5part_int64_t
 H5PartGetFileAttribInfo (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t attrib_idx,/*!< [in]  Index of attribute to get
 					           infos about */
 	char *attrib_name,		/*!< [out] Name of attribute */
@@ -598,7 +598,7 @@ H5PartGetFileAttribInfo (
 */
 h5part_int64_t
 H5PartReadStepAttrib (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const char *attrib_name,	/*!< [in] Name of attribute to read */
 	void *attrib_value		/*!< [out] Value of attribute */
 	) {
@@ -620,7 +620,7 @@ H5PartReadStepAttrib (
 */
 h5part_int64_t
 H5PartReadFileAttrib ( 
-	H5PartFile *f,
+	h5_file *f,
 	const char *attrib_name,
 	void *attrib_value
 	) {
@@ -664,7 +664,7 @@ H5PartReadFileAttrib (
 */
 h5part_int64_t
 H5PartSetStep (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t step	/*!< [in]  Time-step to set. */
 	) {
 
@@ -691,7 +691,7 @@ H5PartSetStep (
 */
 h5part_int64_t
 H5PartHasStep (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	h5part_int64_t step	/*!< [in]  Step number to query */
 	) {
   
@@ -716,7 +716,7 @@ H5PartHasStep (
 */
 h5part_int64_t
 H5PartGetNumSteps (
-	H5PartFile *f			/*!< [in]  Handle to open file */
+	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartGetNumSteps" );
@@ -741,7 +741,7 @@ H5PartGetNumSteps (
 
 h5part_int64_t
 H5PartGetNumDatasets (
-	H5PartFile *f			/*!< [in]  Handle to open file */
+	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartGetNumDatasets" );
@@ -764,7 +764,7 @@ H5PartGetNumDatasets (
 */
 h5part_int64_t
 H5PartGetDatasetName (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t idx,	/*!< [in]  Index of the dataset */
 	char *name,			/*!< [out] Name of dataset */
 	const h5part_int64_t len_of_name/*!< [in]  Size of buffer \c name */
@@ -796,7 +796,7 @@ H5PartGetDatasetName (
 */
 h5part_int64_t
 H5PartGetDatasetInfo (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	const h5part_int64_t idx,/*!< [in]  Index of the dataset */
 	char *dataset_name,	/*!< [out] Name of dataset */
 	const h5part_int64_t len_dataset_name,
@@ -826,7 +826,7 @@ H5PartGetDatasetInfo (
  */
 h5part_int64_t
 H5PartGetNumParticles (
-	H5PartFile *f			/*!< [in]  Handle to open file */
+	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartGetNumParticles" );
@@ -847,7 +847,7 @@ H5PartGetNumParticles (
 */
 h5part_int64_t
 H5PartResetView (
- 	H5PartFile *f			/*!< [in]  Handle to open file */
+ 	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 	SET_FNAME ( "H5PartResetView" );
 
@@ -864,7 +864,7 @@ H5PartResetView (
 */
 h5part_int64_t
 H5PartHasView (
- 	H5PartFile *f			/*!< [in]  Handle to open file */
+ 	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 	SET_FNAME ( "H5PartResetView" );
 
@@ -896,7 +896,7 @@ H5PartHasView (
 */
 h5part_int64_t
 H5PartSetView (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t start,	/*!< [in]  Start particle */
 	const h5part_int64_t end	/*!< [in]  End particle */
 	) {
@@ -926,7 +926,7 @@ H5PartSetView (
 */
 h5part_int64_t
 H5PartGetView (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	h5part_int64_t *start,		/*!< [out]  Start particle */
 	h5part_int64_t *end		/*!< [out]  End particle */
 	) {
@@ -961,7 +961,7 @@ H5PartGetView (
 
 h5part_int64_t
 H5PartSetCanonicalView (
-	H5PartFile *f			/*!< [in]  Handle to open file */
+	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 
 	SET_FNAME ( "H5PartSetCanonicalView" );
@@ -993,7 +993,7 @@ H5PartSetCanonicalView (
 */
 h5part_int64_t
 H5PartReadDataFloat64 (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *name,	/*!< [in] Name to associate dataset with */
 	h5part_float64_t *array	/*!< [out] Array of data */
 	) {
@@ -1019,7 +1019,7 @@ H5PartReadDataFloat64 (
 */
 h5part_int64_t
 H5PartReadDataInt64 (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *name,	/*!< [in] Name to associate dataset with */
 	h5part_int64_t *array	/*!< [out] Array of data */
 	) {
@@ -1047,7 +1047,7 @@ H5PartReadDataInt64 (
 */
 h5part_int64_t
 H5PartReadParticleStep (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	h5part_int64_t step,	/*!< [in]  Step to read */
 	h5part_float64_t *x,	/*!< [out] Buffer for dataset named "x" */
 	h5part_float64_t *y,	/*!< [out] Buffer for dataset named "y" */
diff --git a/src/H5Part.h b/src/H5Part.h
index de79fcc..8e31e9a 100644
--- a/src/H5Part.h
+++ b/src/H5Part.h
@@ -37,7 +37,7 @@ extern "C" {
 #define H5PART_CHAR		((h5part_int64_t)H5T_NATIVE_CHAR)
 
 /*========== File Opening/Closing ===============*/
-H5PartFile*
+h5_file*
 H5PartOpenFile(
 	const char *filename,
 	const unsigned flags
@@ -46,7 +46,7 @@ H5PartOpenFile(
 #define H5PartOpenFileSerial(x,y) H5PartOpenFile(x,y)
 
 #ifdef PARALLEL_IO
-H5PartFile*
+h5_file*
 H5PartOpenFileParallel (
 	const char *filename,
 	const unsigned flags,
@@ -57,34 +57,34 @@ H5PartOpenFileParallel (
 
 h5part_int64_t
 H5PartCloseFile (
-	H5PartFile *f
+	h5_file *f
 	);
 
 
 /*============== File Writing Functions ==================== */
 h5part_int64_t
 H5PartDefineStepName (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_int64_t width
 	);
 
 h5part_int64_t
 H5PartSetNumParticles ( 
-	H5PartFile *f, 
+	h5_file *f, 
 	const h5part_int64_t nparticles
 	);
 
 h5part_int64_t
 H5PartWriteDataFloat64 (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_float64_t *array
 	);
 
 h5part_int64_t
 H5PartWriteDataInt64 (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_int64_t *array
 	);
@@ -92,29 +92,29 @@ H5PartWriteDataInt64 (
 /*================== File Reading Routines =================*/
 h5part_int64_t
 H5PartSetStep (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t step
 	);
 
 h5part_int64_t
 H5PartHasStep (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t step
 	);
 
 h5part_int64_t
 H5PartGetNumSteps (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartGetNumDatasets (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartGetDatasetName (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t idx,
 	char *name,
 	const h5part_int64_t maxlen
@@ -122,7 +122,7 @@ H5PartGetDatasetName (
 
 h5part_int64_t
 H5PartGetDatasetInfo (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t idx,
 	char *name,
 	const h5part_int64_t maxlen,
@@ -132,12 +132,12 @@ H5PartGetDatasetInfo (
 
 h5part_int64_t
 H5PartGetNumParticles (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartSetView (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t start,
 	const h5part_int64_t end
 	);
@@ -145,43 +145,43 @@ H5PartSetView (
 
 h5part_int64_t
 H5PartGetView (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t *start,
 	h5part_int64_t *end
 	);
 
 h5part_int64_t
 H5PartHasView (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartResetView (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartSetCanonicalView (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartReadDataFloat64(
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	h5part_float64_t *array
 	);
 
 h5part_int64_t
 H5PartReadDataInt64 (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	h5part_int64_t *array
 	);
 
 h5part_int64_t
 H5PartReadParticleStep (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t step,
 	h5part_float64_t *x, /* particle positions */
 	h5part_float64_t *y,
@@ -202,7 +202,7 @@ H5PartReadParticleStep (
 */
 h5part_int64_t
 H5PartWriteStepAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *attrib_name,
 	const h5part_int64_t attrib_type,
 	const void *attrib_value,
@@ -211,7 +211,7 @@ H5PartWriteStepAttrib (
 
 h5part_int64_t
 H5PartWriteFileAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *attrib_name,
 	const h5part_int64_t attrib_type,
 	const void *attrib_value,
@@ -220,31 +220,31 @@ H5PartWriteFileAttrib (
 
 h5part_int64_t
 H5PartWriteFileAttribString (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const char *attrib
 	);
 
 h5part_int64_t
 H5PartWriteStepAttribString ( 
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const char *attrib
 	);
 
 h5part_int64_t
 H5PartGetNumStepAttribs ( /* for current filestep */
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartGetNumFileAttribs (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5PartGetStepAttribInfo (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t attrib_idx,
 	char *attrib_name,
 	const h5part_int64_t len_of_attrib_name,
@@ -254,7 +254,7 @@ H5PartGetStepAttribInfo (
 
 h5part_int64_t
 H5PartGetFileAttribInfo (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t idx,
 	char *name,
 	const h5part_int64_t maxnamelen,
@@ -264,14 +264,14 @@ H5PartGetFileAttribInfo (
 
 h5part_int64_t
 H5PartReadStepAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	void *data
 	);
 
 h5part_int64_t
 H5PartReadFileAttrib (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	void *data
 	);
diff --git a/src/H5PartPrivate.h b/src/H5PartPrivate.h
index 6c73688..970b9f1 100644
--- a/src/H5PartPrivate.h
+++ b/src/H5PartPrivate.h
@@ -23,13 +23,13 @@ struct _iter_op_data {
 
 h5part_int64_t
 H5_set_step (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t step
 	);
 
 h5part_int64_t
 H5_get_num_particles (
-	H5PartFile *f
+	h5_file *f
 	);
 
 herr_t
diff --git a/src/H5PartTypes.h b/src/H5PartTypes.h
index 35c6981..5c0736d 100644
--- a/src/H5PartTypes.h
+++ b/src/H5PartTypes.h
@@ -6,53 +6,22 @@
 #ifndef _H5PARTTYPES_H_
 #define _H5PARTTYPES_H_
 
-#ifdef   WIN32
-typedef __int64			int64_t;
-#endif /* WIN32 */
+#include "h5/h5_types.h"
 
-typedef int64_t			h5part_int64_t;
-typedef double			h5part_float64_t;
-typedef h5part_int64_t (*h5part_error_handler)( const char*, const h5part_int64_t, const char*,...)
-#ifdef __GNUC__
-__attribute__ ((format (printf, 3, 4)))
-#endif
- ;
-
-#ifndef PARALLEL_IO
-typedef unsigned long		MPI_Comm;
-#endif
-
-struct H5BlockFile;
+struct h5b_fdata;
+struct h5t_fdata;
 
 /**
-   \struct H5PartFile
+   \struct h5_file
 
    This is an essentially opaque datastructure that
    acts as the filehandle for all practical purposes.
    It is created by H5PartOpenFile<xx>() and destroyed by
    H5PartCloseFile().  
 */
-struct H5PartFile {
-	hid_t	file;
-	hid_t	root_id;		/* id of group "/" */
-	char	*groupname_step;
-	int	stepno_width;
-	int	empty;
-
-	char	index_name[128];
-       
-	h5part_int64_t timestep;
+struct h5_file {
 	hsize_t nparticles;
 	
-	hid_t timegroup;
-	hid_t shape;
-	unsigned mode;
-	hid_t xfer_prop;
-	hid_t create_prop;
-	hid_t access_prop;
-	hid_t diskshape;
-	hid_t memshape;	     /* for parallel I/O (this is on-disk) H5S_ALL 
-				if serial I/O */
 	h5part_int64_t viewstart; /* -1 if no view is available: A "view" looks */
 	h5part_int64_t viewend;   /* at a subset of the data. */
   
@@ -66,6 +35,30 @@ struct H5PartFile {
 	*/
 	h5part_int64_t *pnparticles;
 
+	hid_t shape;
+	hid_t diskshape;
+	hid_t memshape;
+
+	/*
+	 */
+
+	hid_t	file;
+	unsigned mode;
+	hid_t xfer_prop;
+	hid_t create_prop;
+	hid_t access_prop;
+
+	hid_t	root_id;		/* id of group "/" */
+	char	*groupname_step;
+	int	stepno_width;
+	int	empty;
+
+	char	index_name[128];
+       
+	h5_int64_t timestep;
+	hid_t timegroup;
+
+
 	/**
 	   Number of processors
 	*/
@@ -81,16 +74,18 @@ struct H5PartFile {
 	*/
 	MPI_Comm comm;
 
-	struct H5BlockStruct *block;
-	h5part_int64_t (*close_block)(struct H5PartFile *f);
+	struct h5b_fdata *block;
+	h5_int64_t (*close_block)(struct h5_file *f);
+
+	struct h5t_fdata *topo;
+	h5_int64_t (*close_topo)(struct h5_file *f);
 };
 
-typedef struct H5PartFile H5PartFile;
+typedef struct h5_file H5PartFile;
+typedef struct h5_file h5_file;
 
 #ifdef IPL_XT3
 # define SEEK_END 2 
 #endif
 
-
-
 #endif
diff --git a/src/bindings/Fortran/H5BlockF.c b/src/bindings/Fortran/H5BlockF.c
index b7c319c..7b239fd 100755
--- a/src/bindings/Fortran/H5BlockF.c
+++ b/src/bindings/Fortran/H5BlockF.c
@@ -96,7 +96,7 @@ h5bl_define3dlayout (
 	const h5part_int64_t *k_end	/*!< end index of k */
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5BlockDefine3DFieldLayout (
 		filehandle,
@@ -117,7 +117,7 @@ h5bl_get_partition_of_proc (
 	h5part_int64_t *k_end		/*!< end index of k */
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	h5part_int64_t herr = H5Block3dGetPartitionOfProc (
 		filehandle,
@@ -147,7 +147,7 @@ h5bl_get_reduced_partition_of_proc (
 	h5part_int64_t *k_end
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	h5part_int64_t herr = H5Block3dGetReducedPartitionOfProc (
 		filehandle,
@@ -173,7 +173,7 @@ h5bl_get_proc_of (
 	const h5part_int64_t *k
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5Block3dGetProcOf ( filehandle, (*i)-1, (*j)-1, (*k)-1 );
 }
@@ -186,7 +186,7 @@ h5bl_3d_read_scalar_field (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name,  l_field_name );
 
@@ -205,7 +205,7 @@ h5bl_3d_write_scalar_field (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name,  l_field_name );
 
@@ -226,7 +226,7 @@ h5bl_3d_read_3dvector_field (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name,  l_field_name );
 
@@ -247,7 +247,7 @@ h5bl_3d_write_3dvector_field (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name,  l_field_name );
 
@@ -263,7 +263,7 @@ h5bl_getnumfields (
 	h5part_int64_t *f			/*!< file handle */
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5BlockGetNumFields ( filehandle );
 }
@@ -279,7 +279,7 @@ h5bl_getfieldinfo (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	h5part_int64_t herr = H5BlockGetFieldInfo (
 		filehandle, *idx, field_name, l_field_name,
@@ -299,7 +299,7 @@ h5bl_writefieldattrib_r8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 = _H5Part_strdupfor2c ( field_name,  l_field_name );
 	char *attrib_name2 =_H5Part_strdupfor2c ( attrib_name, l_attrib_name );
@@ -325,7 +325,7 @@ h5bl_writefieldattrib_i8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 = _H5Part_strdupfor2c ( field_name,  l_field_name );
 	char *attrib_name2 =_H5Part_strdupfor2c ( attrib_name, l_attrib_name );
@@ -350,7 +350,7 @@ h5bl_writefieldattrib_string (
 	const int l_attrib_value
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =_H5Part_strdupfor2c ( field_name,  l_field_name );
 	char *attrib_name2=_H5Part_strdupfor2c ( attrib_name, l_attrib_name );
@@ -373,7 +373,7 @@ h5bl_getnfieldattribs (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 = _H5Part_strdupfor2c ( field_name,   l_field_name );
 
@@ -395,7 +395,7 @@ h5bl_getfieldattribinfo (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	h5part_int64_t	attrib_type;
 
@@ -424,7 +424,7 @@ h5bl_readfieldattrib_i8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =_H5Part_strdupfor2c ( field_name,   l_field_name );
 	char *attrib_name2=_H5Part_strdupfor2c ( attrib_name,  l_attrib_name );
@@ -447,7 +447,7 @@ h5bl_readfieldattrib_r8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =_H5Part_strdupfor2c ( field_name,   l_field_name );
 	char *attrib_name2=_H5Part_strdupfor2c ( attrib_name,  l_attrib_name );
@@ -471,7 +471,7 @@ h5bl_readfieldattrib_string (
 	const int l_attrib_value
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =_H5Part_strdupfor2c ( field_name,   l_field_name );
 	char *attrib_name2=_H5Part_strdupfor2c ( attrib_name,  l_attrib_name );
@@ -491,7 +491,7 @@ h5bl_has_fielddata (
 	h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5BlockHasFieldData ( filehandle );
 }
@@ -506,7 +506,7 @@ h5b_3d_get_field_spacing (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name, l_field_name );
 
@@ -527,7 +527,7 @@ h5b_3d_set_field_spacing (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name, l_field_name );
 
@@ -548,7 +548,7 @@ h5b_3d_get_field_origin (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name, l_field_name );
 
@@ -569,7 +569,7 @@ h5b_3d_set_field_origin (
 	const int l_field_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *field_name2 =  _H5Part_strdupfor2c ( field_name, l_field_name );
 
diff --git a/src/bindings/Fortran/H5PartF.c b/src/bindings/Fortran/H5PartF.c
index 17f1681..507201b 100755
--- a/src/bindings/Fortran/H5PartF.c
+++ b/src/bindings/Fortran/H5PartF.c
@@ -193,7 +193,7 @@ h5pt_openr (
 
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
 
-	H5PartFile* f = H5PartOpenFile ( file_name2, H5PART_READ );
+	h5_file* f = H5PartOpenFile ( file_name2, H5PART_READ );
 
 	free ( file_name2 );
 	return (h5part_int64_t)(size_t)f; 
@@ -207,7 +207,7 @@ h5pt_openw (
 
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
 
-	H5PartFile* f = H5PartOpenFile ( file_name2, H5PART_WRITE );
+	h5_file* f = H5PartOpenFile ( file_name2, H5PART_WRITE );
 
 	free ( file_name2 );
 	return (h5part_int64_t)(size_t)f; 
@@ -221,7 +221,7 @@ h5pt_opena (
 	
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
 
-	H5PartFile* f = H5PartOpenFile ( file_name2, H5PART_APPEND );
+	h5_file* f = H5PartOpenFile ( file_name2, H5PART_APPEND );
 
 	free ( file_name2 );
 	return (h5part_int64_t)(size_t)f;
@@ -237,7 +237,7 @@ h5pt_openr_par (
 
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
 
-	H5PartFile* f = H5PartOpenFileParallel (
+	h5_file* f = H5PartOpenFileParallel (
 		file_name2, H5PART_READ, *comm );
 
 	free ( file_name2 );
@@ -253,7 +253,7 @@ h5pt_openw_par (
 
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
 
-	H5PartFile* f = H5PartOpenFileParallel (
+	h5_file* f = H5PartOpenFileParallel (
 		file_name2, H5PART_WRITE, *comm );
 
 	free ( file_name2 );
@@ -269,7 +269,7 @@ h5pt_opena_par (
 	
 	char *file_name2 = _H5Part_strdupfor2c ( file_name, l_file_name );
        
-       H5PartFile* f = H5PartOpenFileParallel (
+       h5_file* f = H5PartOpenFileParallel (
                file_name2, H5PART_APPEND, *comm );
        
        free ( file_name2 );
@@ -281,7 +281,7 @@ h5part_int64_t
 h5pt_close (
 	const h5part_int64_t *f
 	) {
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartCloseFile ( filehandle );
 }
@@ -301,7 +301,7 @@ h5pt_readstep (
 	h5part_int64_t *id
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartReadParticleStep (
 		filehandle,(*step)-1,x,y,z,px,py,pz,id);
@@ -314,7 +314,7 @@ h5pt_setnpoints (
 	h5part_int64_t *np
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartSetNumParticles ( filehandle, *np );
 }
@@ -324,7 +324,7 @@ h5pt_setstep (
 	const h5part_int64_t *f,
 	h5part_int64_t *step ) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartSetStep ( filehandle, (*step)-1 );
 }
@@ -336,7 +336,7 @@ h5pt_writedata_r8 (
 	const h5part_float64_t *data,
 	const int l_name ) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *name2 = _H5Part_strdupfor2c ( name, l_name );
 
@@ -355,7 +355,7 @@ h5pt_writedata_i8 (
 	const h5part_int64_t *data,
 	const int l_name ) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *name2 = _H5Part_strdupfor2c ( name, l_name );
 
@@ -374,7 +374,7 @@ h5pt_getnsteps (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumSteps ( filehandle );
 }
@@ -384,7 +384,7 @@ h5pt_getndatasets (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumDatasets ( filehandle );
 }
@@ -394,7 +394,7 @@ h5pt_getnpoints (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumParticles ( filehandle );
 }
@@ -407,7 +407,7 @@ h5pt_getdatasetname (
 	const int l_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	h5part_int64_t herr =  H5PartGetDatasetName (
 		filehandle, *index, name, l_name );
@@ -421,7 +421,7 @@ h5pt_getnumpoints (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumParticles( filehandle );
 }
@@ -435,7 +435,7 @@ h5pt_setview (
 	const h5part_int64_t *end
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartSetView ( filehandle, *start, *end );
 }
@@ -445,7 +445,7 @@ h5pt_resetview (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartResetView ( filehandle );
 }
@@ -455,7 +455,7 @@ h5pt_hasview (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartHasView ( filehandle );
 }
@@ -467,7 +467,7 @@ h5pt_getview (
 	h5part_int64_t *end
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetView ( filehandle, start, end);
 }
@@ -480,7 +480,7 @@ h5pt_readdata_r8 (
 	const int l_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *name2 = _H5Part_strdupfor2c ( name, l_name );
 
@@ -499,7 +499,7 @@ h5pt_readdata_i8 (
 	const int l_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *name2 = _H5Part_strdupfor2c ( name, l_name );
 
@@ -522,7 +522,7 @@ h5pt_writefileattrib_r8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 	
@@ -543,7 +543,7 @@ h5pt_writefileattrib_i8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 	
@@ -564,7 +564,7 @@ h5pt_writefileattrib_string (
 	const int l_attrib_value
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 	char *attrib_value2= _H5Part_strdupfor2c (attrib_value,l_attrib_value);
@@ -586,7 +586,7 @@ h5pt_writestepattrib_r8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c ( attrib_name, l_attrib_name );
 	
@@ -607,7 +607,7 @@ h5pt_writestepattrib_i8 (
 	const int l_attrib_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c ( attrib_name, l_attrib_name );
 
@@ -628,7 +628,7 @@ h5pt_writestepattrib_string (
 	const int l_attrib_value
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	char *attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 	char *attrib_value2= _H5Part_strdupfor2c (attrib_value,l_attrib_value);
@@ -648,7 +648,7 @@ h5pt_getnstepattribs (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumStepAttribs ( filehandle );
 }
@@ -658,7 +658,7 @@ h5pt_getnfileattribs (
 	const h5part_int64_t *f
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 
 	return H5PartGetNumFileAttribs ( filehandle );
 }
@@ -672,7 +672,7 @@ h5pt_getstepattribinfo (
 	const int l_name
 	) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 	h5part_int64_t type;
 
 	h5part_int64_t herr = H5PartGetStepAttribInfo ( 
@@ -690,7 +690,7 @@ h5pt_getfileattribinfo (
 	h5part_int64_t *nelem,
 	const int l_name ) {
 
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 	h5part_int64_t type;
 
 	h5part_int64_t herr = H5PartGetFileAttribInfo ( 
@@ -708,7 +708,7 @@ h5pt_readstepattrib (
 	const int l_attrib_name
 	) {
 	
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 	
 	char * attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 
@@ -768,7 +768,7 @@ h5pt_readfileattrib (
 	const int l_attrib_name
 	) {
 	
-	H5PartFile *filehandle = (H5PartFile*)(size_t)*f;
+	h5_file *filehandle = (h5_file*)(size_t)*f;
 	
 	char * attrib_name2 = _H5Part_strdupfor2c (attrib_name,l_attrib_name);
 
diff --git a/src/h5/H5.h b/src/h5/H5.h
index d4420e7..3a29c2b 100644
--- a/src/h5/H5.h
+++ b/src/h5/H5.h
@@ -1,6 +1,8 @@
 #ifndef __H5_H
 #define __H5_H
 
+#include "h5_types.h"
+
 #include "attribs.h"
 #include "errorhandling.h"
 #include "openclose.h"
diff --git a/src/h5/attribs.c b/src/h5/attribs.c
index bc7cf4c..34005ca 100644
--- a/src/h5/attribs.c
+++ b/src/h5/attribs.c
@@ -150,7 +150,7 @@ H5_get_attrib_info (
 
 h5part_int64_t
 H5_get_num_attribs (
-	H5PartFile *f,
+	h5_file *f,
 	hid_t id
 	) {
 
diff --git a/src/h5/attribs.h b/src/h5/attribs.h
index e1bc789..b4ae77a 100644
--- a/src/h5/attribs.h
+++ b/src/h5/attribs.h
@@ -29,7 +29,7 @@ H5_get_attrib_info (
 
 h5part_int64_t
 H5_get_num_attribs (
-	H5PartFile *f,
+	h5_file *f,
 	hid_t id
 	);
 
diff --git a/src/h5/openclose.c b/src/h5/openclose.c
index d5ce372..1d906b5 100644
--- a/src/h5/openclose.c
+++ b/src/h5/openclose.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <stdarg.h>	/* va_arg - System dependent ?! */
 #include <string.h>
 #include <errno.h>
@@ -22,7 +23,7 @@ extern unsigned			_debug;
 
 static h5part_int64_t
 _close_block (
-	H5PartFile *f
+	h5_file *f
 	);
 
 /*!
@@ -36,7 +37,7 @@ _close_block (
 */
 h5part_int64_t
 H5_check_filehandle (
-	const H5PartFile *f	/*!< filehandle  to check validity of */
+	const h5_file *f	/*!< filehandle  to check validity of */
 	) {
 
 	if ( f == NULL )
@@ -85,17 +86,17 @@ _init ( void ) {
 */
 static h5part_int64_t
 _init_block (
-	H5PartFile *f			/*!< IN: file handle */
+	h5_file *f			/*!< IN: file handle */
 	) {
 	h5part_int64_t herr;
-	struct H5BlockStruct *b; 
+	struct h5b_fdata *b; 
 
 	herr = H5_check_filehandle ( f );
 	if ( herr == H5PART_SUCCESS ) return H5PART_SUCCESS;
 
 	if ( (f == 0) || (f->file == 0) ) return HANDLE_H5PART_BADFD_ERR;
 
-	f->block = (struct H5BlockStruct*) malloc( sizeof (*f->block) );
+	f->block = (struct h5b_fdata*) malloc( sizeof (*f->block) );
 	if ( f->block == NULL ) {
 		return HANDLE_H5PART_NOMEM_ERR;
 	}
@@ -136,11 +137,11 @@ _init_block (
 */
 static h5part_int64_t
 _close_block (
-	H5PartFile *f		/*!< IN: file handle */
+	h5_file *f		/*!< IN: file handle */
 	) {
 
 	herr_t herr;
-	struct H5BlockStruct *b = f->block;
+	struct h5b_fdata *b = f->block;
 
 	if ( b->blockgroup >= 0 ) {
 		herr = H5Gclose ( b->blockgroup );
@@ -170,7 +171,7 @@ _close_block (
 }
 
 
-H5PartFile*
+h5_file*
 H5_open_file (
 	const char *filename,	/*!< [in] The name of the data file to open. */
 	unsigned flags,		/*!< [in] The access mode for the file. */
@@ -185,14 +186,14 @@ H5_open_file (
 		return NULL;
 	}
 	_h5part_errno = H5PART_SUCCESS;
-	H5PartFile *f = NULL;
+	h5_file *f = NULL;
 
-	f = (H5PartFile*) malloc( sizeof (H5PartFile) );
+	f = (h5_file*) malloc( sizeof (h5_file) );
 	if( f == NULL ) {
 		HANDLE_H5PART_NOMEM_ERR;
 		goto error_cleanup;
 	}
-	memset (f, 0, sizeof (H5PartFile));
+	memset (f, 0, sizeof (h5_file));
 
 	f->groupname_step = strdup ( H5PART_GROUPNAME_STEP );
 	if( f->groupname_step == NULL ) {
@@ -356,7 +357,7 @@ H5_open_file (
 
 h5part_int64_t
 H5_close_file (
-	H5PartFile *f
+	h5_file *f
 	) {
 	herr_t r = 0;
 	_h5part_errno = H5PART_SUCCESS;
@@ -422,7 +423,7 @@ H5_close_file (
 
 h5part_int64_t
 H5_define_stepname (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_int64_t width
 	) {
diff --git a/src/h5/openclose.h b/src/h5/openclose.h
index 4259d00..7c09cf7 100644
--- a/src/h5/openclose.h
+++ b/src/h5/openclose.h
@@ -1,7 +1,7 @@
 #ifndef __OPENCLOSE_H
 #define __OPENCLOSE_H
 
-H5PartFile*
+h5_file*
 H5_open_file (
 	const char *filename,
 	unsigned flags,
@@ -11,10 +11,10 @@ H5_open_file (
 
 h5part_int64_t
 H5_check_filehandle (
-	const H5PartFile *f
+	const h5_file *f
 	);
 
-H5PartFile*
+h5_file*
 H5_open_file (
 	const char *filename,
 	unsigned flags,
@@ -24,12 +24,12 @@ H5_open_file (
 
 h5part_int64_t
 H5_close_file (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5_define_stepname (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const h5part_int64_t width
 	);
diff --git a/src/h5/readwrite.c b/src/h5/readwrite.c
index bf8c201..8f574cb 100644
--- a/src/h5/readwrite.c
+++ b/src/h5/readwrite.c
@@ -19,7 +19,7 @@
 
 h5part_int64_t
 H5_write_data (
-	H5PartFile *f,		/*!< IN: Handle to open file */
+	h5_file *f,		/*!< IN: Handle to open file */
 	const char *name,	/*!< IN: Name to associate array with */
 	const void *array,	/*!< IN: Array to commit to disk */
 	const hid_t type,	/*!< IN: Type of data */
@@ -189,7 +189,7 @@ H5_get_object_name (
 
 h5part_int64_t
 H5_set_step (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t step	/*!< [in]  Time-step to set. */
 	) {
 
@@ -288,7 +288,7 @@ H5_get_dataset_type(
 
 h5part_int64_t
 H5_has_index (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	h5part_int64_t step	/*!< [in]  Step number to query */
 	) {
 	char name[128];
diff --git a/src/h5/readwrite.h b/src/h5/readwrite.h
index d0ce157..670eadb 100644
--- a/src/h5/readwrite.h
+++ b/src/h5/readwrite.h
@@ -3,7 +3,7 @@
 
 h5part_int64_t
 H5_write_data (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const void *array,
 	const hid_t type,
@@ -40,7 +40,7 @@ H5_get_object_name (
 
 h5part_int64_t
 H5_set_step (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	const h5part_int64_t step	/*!< [in]  Time-step to set. */
 	);
 
@@ -57,7 +57,7 @@ H5_get_dataset_type(
 
 h5part_int64_t
 H5_has_index (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	h5part_int64_t step	/*!< [in]  Step number to query */
 	);
 
diff --git a/src/h5/u_readwrite.c b/src/h5/u_readwrite.c
index 3d5e23a..2317328 100644
--- a/src/h5/u_readwrite.c
+++ b/src/h5/u_readwrite.c
@@ -18,7 +18,7 @@ extern unsigned			_debug;
 
 static hid_t
 _get_diskshape_for_reading (
-	H5PartFile *f,
+	h5_file *f,
 	hid_t dataset
 	) {
 
@@ -65,7 +65,7 @@ _get_diskshape_for_reading (
 
 static hid_t
 _get_memshape_for_reading (
-	H5PartFile *f,
+	h5_file *f,
 	hid_t dataset
 	) {
 
@@ -83,7 +83,7 @@ _get_memshape_for_reading (
 
 h5part_int64_t
 H5U_get_num_elems (
-	H5PartFile *f			/*!< [in]  Handle to open file */
+	h5_file *f			/*!< [in]  Handle to open file */
 	) {
 
 	h5part_int64_t herr;
@@ -135,7 +135,7 @@ H5U_get_num_elems (
 
 h5part_int64_t
 H5U_read_elems (
-	H5PartFile *f,		/*!< [in] Handle to open file */
+	h5_file *f,		/*!< [in] Handle to open file */
 	const char *name,	/*!< [in] Name to associate dataset with */
 	void *array,		/*!< [out] Array of data */
 	const hid_t type
@@ -200,7 +200,7 @@ H5U_read_elems (
 
 h5part_int64_t
 H5U_set_num_elements (
-	H5PartFile *f,			/*!< [in] Handle to open file */
+	h5_file *f,			/*!< [in] Handle to open file */
 	h5part_int64_t nparticles	/*!< [in] Number of particles */
 	) {
 
@@ -326,7 +326,7 @@ H5U_set_num_elements (
 
 h5part_int64_t
 H5U_write_data (
-	H5PartFile *f,		/*!< IN: Handle to open file */
+	h5_file *f,		/*!< IN: Handle to open file */
 	const char *name,	/*!< IN: Name to associate array with */
 	const void *array,	/*!< IN: Array to commit to disk */
 	const hid_t type	/*!< IN: Type of data */
@@ -349,7 +349,7 @@ H5U_write_data (
 
 h5part_int64_t
 H5U_reset_view (
-	H5PartFile *f
+	h5_file *f
 	) {	     
 
 	herr_t herr = 0;
@@ -377,7 +377,7 @@ H5U_reset_view (
 
 h5part_int64_t
 H5U_set_view (
-	H5PartFile *f,			/*!< [in]  Handle to open file */
+	h5_file *f,			/*!< [in]  Handle to open file */
 	h5part_int64_t start,		/*!< [in]  Start particle */
 	h5part_int64_t end		/*!< [in]  End particle */
 	) {
@@ -454,7 +454,7 @@ H5U_set_view (
 
 h5part_int64_t 
 H5U_get_view (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t *start,
 	h5part_int64_t *end
 	) {
@@ -482,7 +482,7 @@ H5U_get_view (
 
 h5part_int64_t
 H5U_set_canonical_view (
-	H5PartFile *f
+	h5_file *f
 	) {
 	h5part_int64_t herr = H5U_reset_view ( f );
 	if ( herr < 0 ) return HANDLE_H5PART_SET_VIEW_ERR( herr, -1, -1 );
@@ -531,7 +531,7 @@ H5U_set_canonical_view (
  */
 h5part_int64_t
 H5U_get_dataset_info (
-	H5PartFile *f,		/*!< [in]  Handle to open file */
+	h5_file *f,		/*!< [in]  Handle to open file */
 	const h5part_int64_t idx,/*!< [in]  Index of the dataset */
 	char *dataset_name,	/*!< [out] Name of dataset */
 	const h5part_int64_t len_dataset_name,
diff --git a/src/h5/u_readwrite.h b/src/h5/u_readwrite.h
index dfb3142..da199ec 100644
--- a/src/h5/u_readwrite.h
+++ b/src/h5/u_readwrite.h
@@ -3,12 +3,12 @@
 
 h5part_int64_t
 H5U_get_num_elems (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5U_read_elems (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	void *array,
 	const hid_t type
@@ -16,13 +16,13 @@ H5U_read_elems (
 
 h5part_int64_t
 H5U_set_num_elements (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t nparticles
 	);
 
 h5part_int64_t
 H5U_write_data (
-	H5PartFile *f,
+	h5_file *f,
 	const char *name,
 	const void *array,
 	const hid_t type
@@ -30,31 +30,31 @@ H5U_write_data (
 
 h5part_int64_t
 H5U_reset_view (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5U_set_view (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t start,
 	h5part_int64_t end
 	);
 
 h5part_int64_t 
 H5U_get_view (
-	H5PartFile *f,
+	h5_file *f,
 	h5part_int64_t *start,
 	h5part_int64_t *end
 	);
 
 h5part_int64_t
 H5U_set_canonical_view (
-	H5PartFile *f
+	h5_file *f
 	);
 
 h5part_int64_t
 H5U_get_dataset_info (
-	H5PartFile *f,
+	h5_file *f,
 	const h5part_int64_t idx,
 	char *dataset_name,
 	const h5part_int64_t len_dataset_name,