diff --git a/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c b/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
index 83fe227f07..4f89125edd 100644
--- a/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
+++ b/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
@@ -610,8 +610,8 @@ static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
 		    if (req_off < real_off + real_size) {
 			count[i]++;
       ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)read_buf)+req_off-real_off) == (ADIO_Offset)(MPIR_Upint)(read_buf+req_off-real_off));
-			MPI_Address(read_buf+req_off-real_off,
-                               &(others_req[i].mem_ptrs[j]));
+			MPI_Get_address(read_buf+req_off-real_off,
+                                   &(others_req[i].mem_ptrs[j]));
       ADIOI_Assert((real_off + real_size - req_off) == (int)(real_off + real_size - req_off));
 			send_size[i] += (int)(ADIOI_MIN(real_off + real_size - req_off,
                                       (ADIO_Offset)(unsigned)req_len));
diff --git a/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c b/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
index e83b643bb8..37d69437e8 100644
--- a/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
+++ b/ompi/mca/io/romio314/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
@@ -706,8 +706,8 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
 		    if (req_off < off + size) {
 			count[i]++;
       ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)write_buf)+req_off-off) == (ADIO_Offset)(MPIR_Upint)(write_buf+req_off-off));
-			MPI_Address(write_buf+req_off-off,
-                               &(others_req[i].mem_ptrs[j]));
+			MPI_Get_address(write_buf+req_off-off,
+                                   &(others_req[i].mem_ptrs[j]));
       ADIOI_Assert((off + size - req_off) == (int)(off + size - req_off));
 			recv_size[i] += (int)(ADIOI_MIN(off + size - req_off,
                                       (unsigned)req_len));
diff --git a/ompi/mca/io/romio314/romio/adio/ad_lustre/ad_lustre_wrcoll.c b/ompi/mca/io/romio314/romio/adio/ad_lustre/ad_lustre_wrcoll.c
index 51476dc27f..ff1eae95cd 100644
--- a/ompi/mca/io/romio314/romio/adio/ad_lustre/ad_lustre_wrcoll.c
+++ b/ompi/mca/io/romio314/romio/adio/ad_lustre/ad_lustre_wrcoll.c
@@ -501,8 +501,8 @@ static void ADIOI_LUSTRE_Exch_and_write(ADIO_File fd, const void *buf,
 		    if (req_off < iter_st_off + max_size) {
 			recv_count[i]++;
                         ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)write_buf)+req_off-off) == (ADIO_Offset)(MPIR_Upint)(write_buf+req_off-off));
-			MPI_Address(write_buf + req_off - off,
-				    &(others_req[i].mem_ptrs[j]));
+			MPI_Get_address(write_buf + req_off - off,
+				        &(others_req[i].mem_ptrs[j]));
                         recv_size[i] += req_len;
 		    } else {
 			break;
diff --git a/ompi/mca/io/romio314/romio/adio/ad_pvfs2/ad_pvfs2_open.c b/ompi/mca/io/romio314/romio/adio/ad_pvfs2/ad_pvfs2_open.c
index e14c40c9ac..54dba29a0e 100644
--- a/ompi/mca/io/romio314/romio/adio/ad_pvfs2/ad_pvfs2_open.c
+++ b/ompi/mca/io/romio314/romio/adio/ad_pvfs2/ad_pvfs2_open.c
@@ -208,8 +208,8 @@ void ADIOI_PVFS2_Open(ADIO_File fd, int *error_code)
 #endif
 
     /* broadcast status and (possibly valid) object reference */
-    MPI_Address(&o_status.error, &offsets[0]);
-    MPI_Address(&o_status.object_ref, &offsets[1]);
+    MPI_Get_address(&o_status.error, &offsets[0]);
+    MPI_Get_address(&o_status.object_ref, &offsets[1]);
 
     MPI_Type_struct(2, lens, offsets, types, &open_status_type);
     MPI_Type_commit(&open_status_type);
diff --git a/ompi/mca/io/romio314/romio/adio/ad_zoidfs/ad_zoidfs_open.c b/ompi/mca/io/romio314/romio/adio/ad_zoidfs/ad_zoidfs_open.c
index 2d4abff0e9..e130ff3f4a 100644
--- a/ompi/mca/io/romio314/romio/adio/ad_zoidfs/ad_zoidfs_open.c
+++ b/ompi/mca/io/romio314/romio/adio/ad_zoidfs/ad_zoidfs_open.c
@@ -115,8 +115,8 @@ void ADIOI_ZOIDFS_Open(ADIO_File fd, int *error_code)
 #endif
 
     /* broadcast status and (possibly valid) object reference */
-    MPI_Address(&o_status.error, &offsets[0]);
-    MPI_Address(&o_status.handle, &offsets[1]);
+    MPI_Get_address(&o_status.error, &offsets[0]);
+    MPI_Get_address(&o_status.handle, &offsets[1]);
 
     MPI_Type_struct(2, lens, offsets, types, &open_status_type);
     MPI_Type_commit(&open_status_type);