[svn-r25176] - use dxpls instead of access property lists in prefetch and evict calls.

- remove two routines: H5Pset_read_replica and H5Pset_evict_replica.
- add new routine: H5Pset_dxpl_replica
- update implementation and examples

15 files changed, 144 insertions, 256 deletions

diff --git a/examples/h5ff_client_M7.2-pep_demo.c b/examples/h5ff_client_M7.2-pep_demo.c
index 0e3a06b..bcd52a0 100644
--- a/examples/h5ff_client_M7.2-pep_demo.c
+++ b/examples/h5ff_client_M7.2-pep_demo.c
@@ -450,19 +450,17 @@ int main( int argc, char **argv ) {
    hid_t space_l_id, space_p_id, space_s_id;

    hrpl_t dset_p_replica;

    hid_t dxpl_p_id;

-   hid_t dapl_p_id;

    int data_l[4], data_p[4], data_s[4];              

 

    hid_t map_l_id, map_p_id, map_s_id;

    hrpl_t map_p_replica;

    hid_t mxpl_p_id;

-   hid_t mapl_p_id;

    int map_entries;                       /* know same number in all maps */

    int *value_l, *value_p, *value_s;              

 

    hid_t type_l_id, type_p_id, type_s_id;

    hrpl_t type_p_replica;

-   hid_t tapl_p_id;

+   hid_t txpl_p_id;

 

    /* Event stack */

    hid_t         d_es_id;        /* for prefetch of Dataset */

@@ -546,10 +544,8 @@ int main( int argc, char **argv ) {
          fprintf( stderr, "APP-r%d: asynchronous prefetch of D completed with status %d\n", my_rank, status );

       }

       MPI_Bcast( &dset_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-      dxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                              /* Used in Read */

-      ret = H5Pset_read_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

-      dapl_p_id = H5Pcreate( H5P_DATASET_ACCESS );                            /* Used in Evict */

-      ret = H5Pset_evict_replica( dapl_p_id, dset_p_replica ); ASSERT_RET;

+      dxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                              /* Used in Read & Evict*/

+      ret = H5Pset_dxpl_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

 

       /* After both map and datatype prefetches complete, bcast the replica IDs and set up properties */

       if ( my_rank == 0 ) {

@@ -557,22 +553,18 @@ int main( int argc, char **argv ) {
          fprintf( stderr, "APP-r%d: asynchronous prefetch of M and T completed with status %d\n", my_rank, status );

       }

       MPI_Bcast( &map_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-      mxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                              /* Used in Get */

-      ret = H5Pset_read_replica( mxpl_p_id, map_p_replica );  ASSERT_RET;

-      mapl_p_id = H5Pcreate( H5P_MAP_ACCESS );                                /* Used in Evict */

-      ret = H5Pset_evict_replica( mapl_p_id, map_p_replica ); ASSERT_RET;

+      mxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                              /* Used in Get & Evict*/

+      ret = H5Pset_dxpl_replica( mxpl_p_id, map_p_replica );  ASSERT_RET;

 

       MPI_Bcast( &type_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-      tapl_p_id = H5Pcreate( H5P_DATATYPE_ACCESS );                           /* Used in Evict */

-      ret = H5Pset_evict_replica( tapl_p_id, type_p_replica ); ASSERT_RET;

+      txpl_p_id = H5Pcreate( H5P_DATASET_XFER );                           /* Used in Evict */

+      ret = H5Pset_dxpl_replica( txpl_p_id, type_p_replica ); ASSERT_RET;

 

    } else {

       /* Without daos-lustre, we don't do prefetch, so default properties */

       dxpl_p_id = H5P_DEFAULT;

-      dapl_p_id = H5P_DEFAULT;

       mxpl_p_id = H5P_DEFAULT;

-      mapl_p_id = H5P_DEFAULT;

-      tapl_p_id = H5P_DEFAULT;

+      txpl_p_id = H5P_DEFAULT;

    }

 

    /* Optionally, pause to show change in BB space using out-of-band check. All ranks paused. */

@@ -733,13 +725,13 @@ int main( int argc, char **argv ) {
    if ( my_rank == 0 ) {

       if ( use_daos_lustre ) {

          fprintf( stderr, "APP-r%d: Evict replica of /G-prefetched/D\n", my_rank );

-         ret = H5Devict_ff( dset_p_id, version, dapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  /* Note: CV redundant for replica */

+         ret = H5Devict_ff( dset_p_id, version, dxpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  /* Note: CV redundant for replica */

 

          fprintf( stderr, "APP-r%d: Evict replica of /G-prefetched/M (Q7 note: currently a no-op in IOD)\n", my_rank );

-         ret = H5Mevict_ff( map_p_id, version, mapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;   /* Note: CV redundant for replica */

+         ret = H5Mevict_ff( map_p_id, version, mxpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;   /* Note: CV redundant for replica */

 

          fprintf( stderr, "APP-r%d: Evict replica of /G-prefetched/T\n", my_rank );

-         ret = H5Tevict_ff( type_p_id, version, tapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  /* Note: CV redundant for replica */

+         ret = H5Tevict_ff( type_p_id, version, txpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  /* Note: CV redundant for replica */

       } else {

          fprintf( stderr, "APP-r%d DAOS-POSIX - No replicas to evict\n", my_rank );

       }

@@ -759,10 +751,9 @@ int main( int argc, char **argv ) {
    /* Close Objects*/

 

    if ( use_daos_lustre ) {

-      ret = H5Pclose( mapl_p_id ); ASSERT_RET;

       ret = H5Pclose( mxpl_p_id ); ASSERT_RET;

-      ret = H5Pclose( dapl_p_id ); ASSERT_RET;

       ret = H5Pclose( dxpl_p_id ); ASSERT_RET;

+      ret = H5Pclose( txpl_p_id ); ASSERT_RET;

    }

 

    ret = H5Dclose_ff( dset_l_id, H5_EVENT_STACK_NULL ); ASSERT_RET;

diff --git a/examples/h5ff_client_prefetch.c b/examples/h5ff_client_prefetch.c
index aca2605..ad50559 100644
--- a/examples/h5ff_client_prefetch.c
+++ b/examples/h5ff_client_prefetch.c
@@ -269,20 +269,19 @@ int main(int argc, char **argv) {
         /* Read from prefetched Replicas */

 	/* set dxpl to read from replica in BB */

 	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

-	ret = H5Pset_read_replica(dxpl_id, dset_replica);

+	ret = H5Pset_dxpl_replica(dxpl_id, dset_replica);

 	assert(0 == ret);

-

 	ret = H5Dread_ff(did, dtid, H5S_ALL, H5S_ALL, dxpl_id, rdata1, rid2, H5_EVENT_STACK_NULL);

 	assert(ret == 0);

 	printf("Read Data1: ");

 	for(i=0;i<nelem;++i)

 	  printf("%d ",rdata1[i]);

 	printf("\n");

+	H5Pclose(dxpl_id);

 

 	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

-	ret = H5Pset_read_replica(dxpl_id, map_replica);

+	ret = H5Pset_dxpl_replica(dxpl_id, map_replica);

 	assert(0 == ret);

-

         key = 1;

         value = -1;

         ret = H5Mget_ff(map, H5T_STD_I32LE, &key, H5T_STD_I32LE, &value,

@@ -290,37 +289,36 @@ int main(int argc, char **argv) {
         assert(0 == ret);

         printf("Value recieved = %d\n", value);

         assert(1000 == value);

-

 	H5Pclose(dxpl_id);

 

         /* evict Replicas */

-        tapl_id = H5Pcreate (H5P_DATATYPE_ACCESS);

-        ret = H5Pset_evict_replica(tapl_id, dt_replica);

-        assert(0 == ret);

-        ret = H5Tevict_ff(dtid, 3, tapl_id, H5_EVENT_STACK_NULL);

+	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

+	ret = H5Pset_dxpl_replica(dxpl_id, dset_replica);

+	assert(0 == ret);

+        ret = H5Tevict_ff(dtid, 3, dxpl_id, H5_EVENT_STACK_NULL);

         assert(0 == ret);

-        H5Pclose(tapl_id);

+        H5Pclose(dxpl_id);

 

-        dapl_id = H5Pcreate (H5P_DATASET_ACCESS);

-        ret = H5Pset_evict_replica(dapl_id, dset_replica);

+	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

+        ret = H5Pset_dxpl_replica(dxpl_id, dset_replica);

         assert(0 == ret);

-        ret = H5Devict_ff(did, 3, dapl_id, H5_EVENT_STACK_NULL);

+        ret = H5Devict_ff(did, 3, dxpl_id, H5_EVENT_STACK_NULL);

         assert(0 == ret);

-        H5Pclose(dapl_id);

+        H5Pclose(dxpl_id);

 

-        mapl_id = H5Pcreate (H5P_MAP_ACCESS);

-        ret = H5Pset_evict_replica(mapl_id, map_replica);

+	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

+        ret = H5Pset_dxpl_replica(dxpl_id, map_replica);

         assert(0 == ret);

-        ret = H5Mevict_ff(map, 3, mapl_id, H5_EVENT_STACK_NULL);

+        ret = H5Mevict_ff(map, 3, dxpl_id, H5_EVENT_STACK_NULL);

         assert(0 == ret);

-        H5Pclose(mapl_id);

+        H5Pclose(dxpl_id);

 

-        gapl_id = H5Pcreate (H5P_GROUP_ACCESS);

-        ret = H5Pset_evict_replica(gapl_id, grp_replica);

+	dxpl_id = H5Pcreate (H5P_DATASET_XFER);

+        ret = H5Pset_dxpl_replica(dxpl_id, grp_replica);

         assert(0 == ret);

-        ret = H5Gevict_ff(gid, 3, gapl_id, H5_EVENT_STACK_NULL);

+        ret = H5Gevict_ff(gid, 3, dxpl_id, H5_EVENT_STACK_NULL);

         assert(0 == ret);

-        H5Pclose(gapl_id);

+        H5Pclose(dxpl_id);

     }

 

     MPI_Barrier(MPI_COMM_WORLD);

diff --git a/examples/h5ff_client_time_datasets.c b/examples/h5ff_client_time_datasets.c
index b576c95..e709f96 100644
--- a/examples/h5ff_client_time_datasets.c
+++ b/examples/h5ff_client_time_datasets.c
@@ -78,9 +78,8 @@ int main( int argc, char **argv ) {
    hid_t    dxpl_p_id;

    hid_t    dxpl_s_id;

 

-   /* Replicas and related properties */

+   /* Replicas */

    hrpl_t   dset_p_replica;

-   hid_t    dapl_p_id;

 

    /* Container Version & Read Contexts */

    uint64_t version, versionH;

@@ -328,7 +327,6 @@ int main( int argc, char **argv ) {
       } else {

          ret = H5Pset_rawdata_integrity_scope( dxpl_p_id, H5_CHECKSUM_NONE ); ASSERT_RET;

       }

-      dapl_p_id = H5Pcreate( H5P_DATASET_ACCESS );

    }

 

    if ( stored_dset ) {

@@ -476,8 +474,7 @@ int main( int argc, char **argv ) {
 

       if ( prefetched_dset ) { 

          MPI_Bcast( &dset_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-         ret = H5Pset_read_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

-         ret = H5Pset_evict_replica( dapl_p_id, dset_p_replica ); ASSERT_RET;

+         ret = H5Pset_dxpl_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

       } 

 

       MPI_Barrier( MPI_COMM_WORLD );      /* Make sure all are here before continuing, (esp in case of no prefetch Bcast) */

@@ -607,7 +604,7 @@ int main( int argc, char **argv ) {
       if ( my_rank == 0 ) {

          if ( prefetched_dset ) {

             START_TIME;

-            ret = H5Devict_ff( dset_p_id, version, dapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

+            ret = H5Devict_ff( dset_p_id, version, dxpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

             END_TIME;

             fprintf( stderr, "APP-r%d: iter %05d step 17: Time to Evict Replica of /DP (%lu bytes): %lu usec\n", 

                      my_rank, iteration, bytesPerDataset, ELAPSED_TIME );

@@ -628,7 +625,6 @@ int main( int argc, char **argv ) {
    /* Close the dataset property lists */

    if ( prefetched_dset ) {

       ret = H5Pclose( dxpl_p_id ); ASSERT_RET;

-      ret = H5Pclose( dapl_p_id ); ASSERT_RET;

    }

 

    /* Close the memory dataspace for the rank */

diff --git a/examples/h5ff_client_timings.c b/examples/h5ff_client_timings.c
index 771683e..2cf7e1a 100644
--- a/examples/h5ff_client_timings.c
+++ b/examples/h5ff_client_timings.c
@@ -96,10 +96,8 @@ int main( int argc, char **argv ) {
    /* Replicas and related properties */

    hrpl_t   dset_p_replica;

    hid_t    dxpl_p_id;

-   hid_t    dapl_p_id;

    hrpl_t   map_p_replica;

    hid_t    mxpl_p_id;

-   hid_t    mapl_p_id;

 

    /* Container Version & Read Contexts */

    uint64_t version, versionH;

@@ -324,9 +322,7 @@ int main( int argc, char **argv ) {
 

    /* Create property lists that will be used */

    dxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                              

-   mxpl_p_id = H5Pcreate( H5P_DATASET_XFER );                             

-   dapl_p_id = H5Pcreate( H5P_DATASET_ACCESS );

-   mapl_p_id = H5Pcreate( H5P_MAP_ACCESS );

+   mxpl_p_id = H5Pcreate( H5P_DATASET_XFER );

 

    for ( iteration = 0; iteration < num_iterations; iteration++ ) {

 

@@ -495,12 +491,10 @@ int main( int argc, char **argv ) {
 

       /* This Bcast will make sure no nodes go ahead to use the RC before rank 0 has acquired it */

       MPI_Bcast( &dset_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-      ret = H5Pset_read_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

-      ret = H5Pset_evict_replica( dapl_p_id, dset_p_replica ); ASSERT_RET;

+      ret = H5Pset_dxpl_replica( dxpl_p_id, dset_p_replica ); ASSERT_RET;

 

       MPI_Bcast( &map_p_replica, 1, MPI_UINT64_T, 0, MPI_COMM_WORLD );

-      ret = H5Pset_read_replica( mxpl_p_id, map_p_replica );  ASSERT_RET;

-      ret = H5Pset_evict_replica( mapl_p_id, map_p_replica ); ASSERT_RET;

+      ret = H5Pset_dxpl_replica( mxpl_p_id, map_p_replica );  ASSERT_RET;

 

       MPI_Barrier( MPI_COMM_WORLD );         /* Make sure all are here before continuing */

 

@@ -740,13 +734,13 @@ int main( int argc, char **argv ) {
       MPI_Barrier( MPI_COMM_WORLD );            /* Make sure all ranks done reading replicas before evict */

       if ( my_rank == 0 ) {

          START_TIME;

-         ret = H5Devict_ff( dset_p_id, version, dapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

+         ret = H5Devict_ff( dset_p_id, version, dxpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

          END_TIME;

          fprintf( stderr, "APP-r%d: iter %d - Time to Evict Replica of /G-prefetched/D: %lu usec\n", 

                   my_rank, iteration, ELAPSED_TIME );

 

          START_TIME;

-         ret = H5Mevict_ff( map_p_id, version, mapl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

+         ret = H5Mevict_ff( map_p_id, version, mxpl_p_id, H5_EVENT_STACK_NULL ); ASSERT_RET;  

          END_TIME;

          fprintf( stderr, "APP-r%d: iter %d - Time to Evict Replica of /G-prefetched/M (currently no-op for IOD): %lu usec\n", 

                   my_rank, iteration, ELAPSED_TIME );

@@ -766,8 +760,6 @@ int main( int argc, char **argv ) {
    /* Close the dataset and map property lists */

    ret = H5Pclose( dxpl_p_id ); ASSERT_RET;

    ret = H5Pclose( mxpl_p_id ); ASSERT_RET;

-   ret = H5Pclose( dapl_p_id ); ASSERT_RET;

-   ret = H5Pclose( mapl_p_id ); ASSERT_RET;

 

    /* Close the memory dataspace for the rank */

    ret = H5Sclose( rank_space_id ); ASSERT_RET;         

diff --git a/src/H5FF.c b/src/H5FF.c
index 2a76ce3..a81b994 100644
--- a/src/H5FF.c
+++ b/src/H5FF.c
@@ -2171,10 +2171,10 @@ H5Lmove_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
            const char *dst_name, hid_t lcpl_id, hid_t lapl_id, hid_t trans_id, hid_t estack_id)
 {
     void    *obj1 = NULL;        /* object token of src_id */
-    H5VL_t  *vol_plugin1;        /* VOL plugin information */
+    H5VL_t  *vol_plugin1 = NULL;        /* VOL plugin information */
     H5VL_loc_params_t loc_params1;
     void    *obj2 = NULL;        /* object token of dst_id */
-    H5VL_t  *vol_plugin2;        /* VOL plugin information */
+    H5VL_t  *vol_plugin2 = NULL;        /* VOL plugin information */
     H5VL_loc_params_t loc_params2;
     hid_t dxpl_id = H5P_DATASET_XFER_DEFAULT; /* transfer property list to pass to the VOL plugin */
     H5P_genplist_t *plist ;     /* Property list pointer */
@@ -2270,10 +2270,10 @@ H5Lcopy_ff(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
            const char *dst_name, hid_t lcpl_id, hid_t lapl_id, hid_t trans_id, hid_t estack_id)
 {
     void    *obj1 = NULL;        /* object token of src_id */
-    H5VL_t  *vol_plugin1;        /* VOL plugin information */
+    H5VL_t  *vol_plugin1 = NULL;        /* VOL plugin information */
     H5VL_loc_params_t loc_params1;
     void    *obj2 = NULL;        /* object token of dst_id */
-    H5VL_t  *vol_plugin2;        /* VOL plugin information */
+    H5VL_t  *vol_plugin2 = NULL;        /* VOL plugin information */
     H5VL_loc_params_t loc_params2;
     hid_t dxpl_id = H5P_DATASET_XFER_DEFAULT; /* transfer property list to pass to the VOL plugin */
     H5P_genplist_t *plist ;     /* Property list pointer */
@@ -4269,7 +4269,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5_DLL herr_t H5Aprefetch_ff(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t aapl_id, hid_t estack_id)
+                             hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4286,8 +4286,12 @@ H5_DLL herr_t H5Aprefetch_ff(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(attr_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
-    if(H5P_DEFAULT != aapl_id)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "attribute access property list must be H5P_DEFAULT")
+    /* Get correct property list */
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
+    else
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -4301,7 +4305,7 @@ H5_DLL herr_t H5Aprefetch_ff(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_prefetch(attr, rcxt_id, replica_id, aapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_prefetch(attr, rcxt_id, replica_id, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch attribute")
 
     if(request && *req) {
@@ -4326,7 +4330,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_t estack_id)
+H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -4343,8 +4347,12 @@ H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(attr_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
-    if(H5P_DEFAULT != aapl_id)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "attribute access property list must be H5P_DEFAULT")
+    /* Get correct property list */
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
+    else
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -4358,7 +4366,7 @@ H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_evict(attr, c_version, aapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_evict(attr, c_version, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't evict attribute")
 
     if(request && *req) {
@@ -4384,7 +4392,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t dapl_id, hid_t estack_id)
+                          hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4402,10 +4410,10 @@ H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dapl_id)
-        dapl_id = H5P_DATASET_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
@@ -4420,7 +4428,7 @@ H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_prefetch(dset, rcxt_id, replica_id, dapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_prefetch(dset, rcxt_id, replica_id, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch dataset")
 
     if(request && *req) {
@@ -4445,7 +4453,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id)
+H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -4463,10 +4471,10 @@ H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == dapl_id)
-        dapl_id = H5P_DATASET_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(dapl_id, H5P_DATASET_ACCESS))
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
@@ -4481,7 +4489,7 @@ H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_evict(dset, c_version, dapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_evict(dset, c_version, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't evict dataset")
 
     if(request && *req) {
@@ -4507,7 +4515,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t gapl_id, hid_t estack_id)
+                          hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4525,11 +4533,11 @@ H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == gapl_id)
-        gapl_id = H5P_GROUP_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -4543,7 +4551,7 @@ H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_prefetch(grp, rcxt_id, replica_id, gapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_prefetch(grp, rcxt_id, replica_id, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch group")
 
     if(request && *req) {
@@ -4568,7 +4576,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id)
+H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -4586,11 +4594,11 @@ H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == gapl_id)
-        gapl_id = H5P_GROUP_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -4604,7 +4612,7 @@ H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_evict(grp, c_version, gapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_evict(grp, c_version, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't evict group")
 
     if(request && *req) {
@@ -4630,7 +4638,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5_DLL herr_t H5Tprefetch_ff(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t tapl_id, hid_t estack_id)
+                          hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;  /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4654,11 +4662,11 @@ H5_DLL herr_t H5Tprefetch_ff(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tapl_id)
-        tapl_id = H5P_DATATYPE_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(dtype_id)))
@@ -4679,7 +4687,7 @@ H5_DLL herr_t H5Tprefetch_ff(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_prefetch(dtype, rcxt_id, replica_id, tapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_prefetch(dtype, rcxt_id, replica_id, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch datatype")
 
     if(request && *req) {
@@ -4704,7 +4712,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Tevict_ff(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id)
+H5_DLL herr_t H5Tevict_ff(hid_t dtype_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;  /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4728,11 +4736,11 @@ H5_DLL herr_t H5Tevict_ff(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid
     }
 
     /* Get correct property list */
-    if(H5P_DEFAULT == tapl_id)
-        tapl_id = H5P_DATATYPE_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(tapl_id, H5P_DATATYPE_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(dtype_id)))
@@ -4753,7 +4761,7 @@ H5_DLL herr_t H5Tevict_ff(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_evict(dtype, c_version, tapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_evict(dtype, c_version, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't evict datatype")
 
     if(request && *req) {
diff --git a/src/H5FFpublic.h b/src/H5FFpublic.h
index c190640..3a2801a 100644
--- a/src/H5FFpublic.h
+++ b/src/H5FFpublic.h
@@ -180,21 +180,21 @@ H5_DLL herr_t H5Oget_info_by_name_ff(hid_t loc_id, const char *object_name,
 H5_DLL herr_t H5Oclose_ff(hid_t object_id, hid_t estack_id);
 
 H5_DLL herr_t H5Aprefetch_ff(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t aapl_id, hid_t estack_id);
+                             hid_t dxpl_id, hid_t estack_id);
 H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t gapl_id, hid_t estack_id);
+                             hid_t dxpl_id, hid_t estack_id);
 H5_DLL herr_t H5Tprefetch_ff(hid_t type_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t tapl_id, hid_t estack_id);
+                             hid_t dxpl_id, hid_t estack_id);
 H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t dapl_id, hid_t estack_id);
+                             hid_t dxpl_id, hid_t estack_id);
 H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
-                             hid_t mapl_id, hid_t estack_id);
+                             hid_t dxpl_id, hid_t estack_id);
 
-H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_t estack_id);
-H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id);
-H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id);
-H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id);
-H5_DLL herr_t H5Tevict_ff(hid_t type_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id);
+H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id);
+H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id);
+H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id);
+H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id);
+H5_DLL herr_t H5Tevict_ff(hid_t type_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id);
 
 /* New Routines for Dynamic Data Structures Use Case (ACG) */
 H5_DLL herr_t H5DOappend(hid_t dataset_id, hid_t dxpl_id, unsigned axis, size_t extension, 
diff --git a/src/H5M.c b/src/H5M.c
index 76a05e3..031bbb1 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -963,7 +963,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t mapl_id, hid_t estack_id)
+                          hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -981,11 +981,11 @@ H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == mapl_id)
-        mapl_id = H5P_MAP_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(mapl_id, H5P_MAP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not map access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -999,7 +999,7 @@ H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_prefetch(map, rcxt_id, replica_id, mapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_prefetch(map, rcxt_id, replica_id, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't prefetch map")
 
     if(request && *req) {
@@ -1024,7 +1024,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id)
+H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t dxpl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -1042,11 +1042,11 @@ H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* Get correct property list */
-    if(H5P_DEFAULT == mapl_id)
-        mapl_id = H5P_MAP_ACCESS_DEFAULT;
+    if(H5P_DEFAULT == dxpl_id)
+        dxpl_id = H5P_DATASET_XFER_DEFAULT;
     else
-        if(TRUE != H5P_isa_class(mapl_id, H5P_MAP_ACCESS))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not map access property list")
+        if(TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     if(estack_id != H5_EVENT_STACK_NULL) {
         /* create the private request */
@@ -1060,7 +1060,7 @@ H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t
     }
 
     /* Get the data through the IOD VOL */
-    if((ret_value = H5VL_iod_evict(map, c_version, mapl_id, req)) < 0)
+    if((ret_value = H5VL_iod_evict(map, c_version, dxpl_id, req)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't evict map")
 
     if(request && *req) {
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 459189a..e78005e 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -51,10 +51,10 @@
 #ifdef H5_HAVE_EFF
 
 /* replica ID to use when accessing an object at IOD */
-#define H5O_ACS_REPLICA_ID_SIZE    sizeof(hrpl_t)
-#define H5O_ACS_REPLICA_ID_DEF     0
-#define H5O_ACS_REPLICA_ID_ENC     H5P__encode_uint64_t
-#define H5O_ACS_REPLICA_ID_DEC     H5P__decode_uint64_t
+#define H5O_XFER_REPLICA_ID_SIZE    sizeof(hrpl_t)
+#define H5O_XFER_REPLICA_ID_DEF     0
+#define H5O_XFER_REPLICA_ID_ENC     H5P__encode_uint64_t
+#define H5O_XFER_REPLICA_ID_DEC     H5P__decode_uint64_t
 
 #define H5D_XFER_INJECT_CORRUPTION_SIZE		sizeof(hbool_t)
 #define H5D_XFER_INJECT_CORRUPTION_DEF  	FALSE
@@ -272,7 +272,7 @@ static const hbool_t H5D_def_inject_corruption_g = H5D_XFER_INJECT_CORRUPTION_DE
 static const uint64_t H5D_def_checksum_g = H5D_XFER_CHECKSUM_DEF;
 static const uint64_t *H5D_def_checksum_ptr_g = H5D_XFER_CHECKSUM_PTR_DEF;
 static const uint32_t H5D_def_checksum_scope_g = H5D_XFER_CHECKSUM_SCOPE_DEF;
-static const hrpl_t H5O_replica_id_g = H5O_ACS_REPLICA_ID_DEF; /* Default replica ID */
+static const hrpl_t H5O_replica_id_g = H5O_XFER_REPLICA_ID_DEF; /* Default replica ID */
 #endif /* H5_HAVE_EFF */
 
 /* Property value defaults */
@@ -331,9 +331,9 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass)
 
 #ifdef H5_HAVE_EFF
 
-    if(H5P_register_real(pclass, H5O_ACS_REPLICA_ID_NAME, H5O_ACS_REPLICA_ID_SIZE, 
+    if(H5P_register_real(pclass, H5O_XFER_REPLICA_ID_NAME, H5O_XFER_REPLICA_ID_SIZE, 
                          &H5O_replica_id_g,
-                         NULL, NULL, NULL, H5O_ACS_REPLICA_ID_ENC, H5O_ACS_REPLICA_ID_DEC, 
+                         NULL, NULL, NULL, H5O_XFER_REPLICA_ID_ENC, H5O_XFER_REPLICA_ID_DEC, 
                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 618cfc9..0d617e2 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -38,28 +38,18 @@
 #include "H5Lprivate.h"		/* Links		  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Ppkg.h"		/* Property lists		  	*/
-#include "H5VLiod.h"		/* IOD plugin    		  	*/
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* ========  Link access properties ======== */
-#ifdef H5_HAVE_EFF
-/* replica ID to use when accessing an object at IOD */
-#define H5O_ACS_REPLICA_ID_SIZE    sizeof(hrpl_t)
-#define H5O_ACS_REPLICA_ID_DEF     0
-#define H5O_ACS_REPLICA_ID_ENC     H5P__encode_uint64_t
-#define H5O_ACS_REPLICA_ID_DEC     H5P__decode_uint64_t
-#endif
-
 /* Definitions for number of soft links to traverse */
 #define H5L_ACS_NLINKS_SIZE        sizeof(size_t)
 #define H5L_ACS_NLINKS_DEF         H5L_NUM_LINKS /*max symlinks to follow per lookup  */
 #define H5L_ACS_NLINKS_ENC         H5P__encode_size_t
 #define H5L_ACS_NLINKS_DEC         H5P__decode_size_t
 
-
 /* Definitions for external link prefix */
 #define H5L_ACS_ELINK_PREFIX_SIZE        sizeof(char *)
 #define H5L_ACS_ELINK_PREFIX_DEF         NULL /*default is no prefix */
@@ -159,9 +149,6 @@ static const char *H5L_def_elink_prefix_g = H5L_ACS_ELINK_PREFIX_DEF; /* Default
 static const hid_t H5L_def_fapl_id_g = H5L_ACS_ELINK_FAPL_DEF;    /* Default fapl for external link access */
 static const unsigned H5L_def_elink_flags_g = H5L_ACS_ELINK_FLAGS_DEF; /* Default file access flags for external link traversal */
 static const H5L_elink_cb_t H5L_def_elink_cb_g = H5L_ACS_ELINK_CB_DEF; /* Default external link traversal callback */
-#ifdef H5_HAVE_EFF
-static const hrpl_t H5O_replica_id_g = H5O_ACS_REPLICA_ID_DEF; /* Default replica ID */
-#endif
 
 
 /*-------------------------------------------------------------------------
@@ -187,14 +174,6 @@ H5P_lacc_reg_prop(H5P_genclass_t *pclass)
 
     FUNC_ENTER_NOAPI_NOINIT
 
-#ifdef H5_HAVE_EFF
-    if(H5P_register_real(pclass, H5O_ACS_REPLICA_ID_NAME, H5O_ACS_REPLICA_ID_SIZE, 
-                         &H5O_replica_id_g,
-                         NULL, NULL, NULL, H5O_ACS_REPLICA_ID_ENC, H5O_ACS_REPLICA_ID_DEC, 
-                         NULL, NULL, NULL, NULL) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-#endif
-
     /* Register property for number of links traversed */
     if(H5P_register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &H5L_def_nlinks_g, 
             NULL, NULL, NULL, H5L_ACS_NLINKS_ENC, H5L_ACS_NLINKS_DEC,
diff --git a/src/H5VLiod.c b/src/H5VLiod.c
index 41fe2bc..e350e86 100644
--- a/src/H5VLiod.c
+++ b/src/H5VLiod.c
@@ -1025,79 +1025,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_evict_replica
- *
- * Purpose:     Set the replica ID to be used when accessing an object 
- *              using this access plist.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:  Mohamad Chaarawi
- *              February, 2014
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_evict_replica(hid_t lapl_id, hrpl_t replica_id)
-{
-    H5P_genplist_t *plist = NULL;    /* Property list pointer */
-    herr_t ret_value = SUCCEED;      /* Return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "iRp", lapl_id, replica_id);
-
-    if(lapl_id == H5P_DEFAULT)
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-
-    /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a lapl")
-
-    /* Set the transfer mode */
-    if(H5P_set(plist, H5O_ACS_REPLICA_ID_NAME, &replica_id) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_evict_replica() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_evict_replica
- *
- * Purpose:     Retrieve the replica ID from this access plist.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:  Mohamad Chaarawi
- *              February, 2014
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_evict_replica(hid_t lapl_id, hrpl_t *replica_id/*out*/)
-{
-    H5P_genplist_t *plist = NULL;       /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "ix", lapl_id, replica_id);
-
-    if(NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a lapl")
-
-    /* Get the transfer mode */
-    if(replica_id)
-        if(H5P_get(plist, H5O_ACS_REPLICA_ID_NAME, replica_id) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_evict_replica() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_read_replica
+ * Function:	H5Pset_dxpl_replica
  *
  * Purpose:     Set the replica ID to be used when accessing an object 
  *              using this transfer plist.
@@ -1110,7 +1038,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_read_replica(hid_t dxpl_id, hrpl_t replica_id)
+H5Pset_dxpl_replica(hid_t dxpl_id, hrpl_t replica_id)
 {
     H5P_genplist_t *plist = NULL;    /* Property list pointer */
     herr_t ret_value = SUCCEED;      /* Return value */
@@ -1126,16 +1054,16 @@ H5Pset_read_replica(hid_t dxpl_id, hrpl_t replica_id)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5O_ACS_REPLICA_ID_NAME, &replica_id) < 0)
+    if(H5P_set(plist, H5O_XFER_REPLICA_ID_NAME, &replica_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_read_replica() */
+} /* end H5Pset_dxpl_replica() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_read_replica
+ * Function:	H5Pget_dxpl_replica
  *
  * Purpose:     Retrieve the replica ID from this access plist.
  *
@@ -1147,7 +1075,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_read_replica(hid_t dxpl_id, hrpl_t *replica_id/*out*/)
+H5Pget_dxpl_replica(hid_t dxpl_id, hrpl_t *replica_id/*out*/)
 {
     H5P_genplist_t *plist = NULL;       /* Property list pointer */
     herr_t      ret_value = SUCCEED;    /* Return value */
@@ -1160,12 +1088,12 @@ H5Pget_read_replica(hid_t dxpl_id, hrpl_t *replica_id/*out*/)
 
     /* Get the transfer mode */
     if(replica_id)
-        if(H5P_get(plist, H5O_ACS_REPLICA_ID_NAME, replica_id) < 0)
+        if(H5P_get(plist, H5O_XFER_REPLICA_ID_NAME, replica_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_read_replica() */
+} /* end H5Pget_dxpl_replica() */
 
 
 /*-------------------------------------------------------------------------
@@ -9550,7 +9478,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t 
-H5VL_iod_prefetch(void *_obj, hid_t rcxt_id, hrpl_t *replica_id, hid_t apl_id, void **req)
+H5VL_iod_prefetch(void *_obj, hid_t rcxt_id, hrpl_t *replica_id, hid_t dxpl_id, void **req)
 {
     H5VL_iod_object_t *obj = (H5VL_iod_object_t *)_obj;
     prefetch_in_t input;
@@ -9578,7 +9506,7 @@ H5VL_iod_prefetch(void *_obj, hid_t rcxt_id, hrpl_t *replica_id, hid_t apl_id, v
     input.coh = obj->file->remote_file.coh;
     input.rcxt_num  = rc->c_version;
     input.cs_scope = obj->file->md_integrity_scope;
-    input.apl_id = apl_id;
+    input.dxpl_id = dxpl_id;
     input.obj_type = obj->obj_type;
 
     switch(obj->obj_type) {
@@ -9668,7 +9596,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t 
-H5VL_iod_evict(void *_obj, uint64_t c_version, hid_t apl_id, void **req)
+H5VL_iod_evict(void *_obj, uint64_t c_version, hid_t dxpl_id, void **req)
 {
     H5VL_iod_object_t *obj = (H5VL_iod_object_t *)_obj;
     evict_in_t input;
@@ -9690,15 +9618,15 @@ H5VL_iod_evict(void *_obj, uint64_t c_version, hid_t apl_id, void **req)
             HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to wait for request")
     }
 
-    if(NULL == (plist = H5P_object_verify(apl_id, H5P_LINK_ACCESS)))
+    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not an access plist");
-    if(H5P_get(plist, H5O_ACS_REPLICA_ID_NAME, &input.replica_id) < 0)
+    if(H5P_get(plist, H5O_XFER_REPLICA_ID_NAME, &input.replica_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value");
 
     input.coh = obj->file->remote_file.coh;
     input.rcxt_num = c_version;
     input.cs_scope = obj->file->md_integrity_scope;
-    //input.apl_id = apl_id;
+    //input.dxpl_id = dxpl_id;
 
     switch(obj->obj_type) {
     case H5I_DATASET:
diff --git a/src/H5VLiod.h b/src/H5VLiod.h
index 6c16dd9..268d320 100644
--- a/src/H5VLiod.h
+++ b/src/H5VLiod.h
@@ -52,7 +52,7 @@ extern "C" {
 #define H5D_XFER_CHECKSUM_PTR_NAME "checksum_ptr"
 #define H5D_CRT_APPEND_ONLY_NAME "append_only"
 #define H5O_CRT_ENABLE_CHECKSUM_NAME "enable_obj_checksum"
-#define H5O_ACS_REPLICA_ID_NAME "replica_id"
+#define H5O_XFER_REPLICA_ID_NAME "replica_id"
 
 H5_DLL H5VL_class_t *H5VL_iod_init(void);
 H5_DLL herr_t H5Pset_fapl_iod(hid_t fapl_id, MPI_Comm comm, MPI_Info info);
@@ -60,10 +60,8 @@ H5_DLL herr_t EFF_start_server(MPI_Comm comm, MPI_Info info);
 H5_DLL herr_t EFF_init(MPI_Comm comm, MPI_Info info);
 H5_DLL herr_t EFF_finalize(void);
 
-H5_DLL herr_t H5Pset_read_replica(hid_t dxpl_id, hrpl_t replica_id);
-H5_DLL herr_t H5Pget_read_replica(hid_t dxpl_id, hrpl_t *replica_id);
-H5_DLL herr_t H5Pset_evict_replica(hid_t lapl_id, hrpl_t replica_id);
-H5_DLL herr_t H5Pget_evict_replica(hid_t lapl_id, hrpl_t *replica_id);
+H5_DLL herr_t H5Pset_dxpl_replica(hid_t dxpl_id, hrpl_t replica_id);
+H5_DLL herr_t H5Pget_dxpl_replica(hid_t dxpl_id, hrpl_t *replica_id);
 H5_DLL herr_t H5Pset_ocpl_enable_checksum(hid_t ocpl_id, hbool_t flag);
 H5_DLL herr_t H5Pget_ocpl_enable_checksum(hid_t ocpl_id, hbool_t *flag);
 H5_DLL herr_t H5Pset_dxpl_checksum(hid_t dxpl_id, uint64_t value);
diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h
index 91b0f8d..235510d 100644
--- a/src/H5VLiod_common.h
+++ b/src/H5VLiod_common.h
@@ -879,7 +879,7 @@ MERCURY_GEN_PROC(prefetch_in_t,
                  ((iod_handle_t)(coh))
                  ((uint32_t)(cs_scope))  
                  ((uint64_t)(rcxt_num))
-                 ((hid_t)(apl_id))
+                 ((hid_t)(dxpl_id))
                  ((int32_t)(obj_type))
                  ((iod_handles_t)(iod_oh))
                  ((iod_obj_id_t)(iod_id)))
@@ -889,7 +889,7 @@ MERCURY_GEN_PROC(evict_in_t,
                  ((uint32_t)(cs_scope))  
                  ((uint64_t)(rcxt_num))
                  ((hrpl_t)(replica_id))
-                 //((hid_t)(apl_id))
+                 //((hid_t)(dxpl_id))
                  ((int32_t)(obj_type))
                  ((iod_handles_t)(iod_oh))
                  ((iod_obj_id_t)(iod_id))
diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c
index f6084b3..0780bd1 100644
--- a/src/H5VLiod_dset.c
+++ b/src/H5VLiod_dset.c
@@ -664,7 +664,7 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine,
         iod_trans_id_t read_tid;
 
         /* get replica ID from dxpl */
-        if(H5Pget_read_replica(dxpl_id, &read_tid) < 0)
+        if(H5Pget_dxpl_replica(dxpl_id, &read_tid) < 0)
             HGOTO_ERROR_FF(FAIL, "can't get replica ID from dxpl");
 
         if(read_tid) {
diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c
index d957f06..04b9ec0 100644
--- a/src/H5VLiod_map.c
+++ b/src/H5VLiod_map.c
@@ -708,7 +708,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
         iod_trans_id_t read_tid;
 
         /* get replica ID from dxpl */
-        if(H5Pget_read_replica(dxpl_id, &read_tid) < 0)
+        if(H5Pget_dxpl_replica(dxpl_id, &read_tid) < 0)
             HGOTO_ERROR_FF(FAIL, "can't get replica ID from dxpl");
 
         if(read_tid) {
diff --git a/src/H5VLiod_trans.c b/src/H5VLiod_trans.c
index c79c60f..dd7d28e 100644
--- a/src/H5VLiod_trans.c
+++ b/src/H5VLiod_trans.c
@@ -745,7 +745,6 @@ H5VL_iod_server_prefetch_cb(AXE_engine_t UNUSED axe_engine,
     iod_handles_t iod_oh = input->iod_oh; /* object handle */
     iod_obj_id_t iod_id = input->iod_id; /* OID */
     //H5I_type_t obj_type = input->obj_type;
-    //hid_t apl_id = input->apl_id;
     iod_trans_id_t replica_id;
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
@@ -806,7 +805,6 @@ H5VL_iod_server_evict_cb(AXE_engine_t UNUSED axe_engine,
     iod_obj_id_t mdkv_id = input->mdkv_id; /* OID */
     iod_obj_id_t attrkv_id = input->attrkv_id; /* OID */
     //H5I_type_t obj_type = input->obj_type;
-    //hid_t apl_id = input->apl_id;
     iod_trans_id_t replica_id = input->replica_id;
     iod_handle_t mdkv_oh, attrkv_oh;
     iod_ret_t ret;