diff --git a/AUTHORS b/AUTHORS
index 6d01a170ab..0617d023cf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -117,6 +117,7 @@ wbland@icl.utk.edu              Wesley Bland                UTK
 yaeld@mellanox.com              Yael Dalen                  Mellanox
 yosefe@mellanox.com             Yossi Etigin                Mellanox
 yuw@lanl.gov                    Weikuan Yu                  LANL, OSU
+wangzm@cn.ibm.com               Zhiming Wang                IBM
 ------------------------------- --------------------------- -------------------
 
 Affiliation abbreviations:
diff --git a/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c b/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c
index d2bbe2f4d8..3ae627cc41 100644
--- a/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c
+++ b/ompi/mpi/fortran/use-mpi-f08/buffer_detach.c
@@ -32,6 +32,9 @@
 OMPI_DECLSPEC void ompi_buffer_detach_f08(char *buffer, MPI_Fint *size,
                                           MPI_Fint *ierr);
 
+OMPI_DECLSPEC void pompi_buffer_detach_f08(char *buffer, MPI_Fint *size,
+                                          MPI_Fint *ierr);
+
 /* (this comment is repeated in ompi/mpi/fortran/mpif-h/buffer_detach_f.c)
  *
  * MPI-3.1 section 3.6, page 45, states that the mpif.h and mpi module
@@ -65,3 +68,8 @@ void ompi_buffer_detach_f08(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
         *(void **)buffer = dummy;
     }
 }
+
+void pompi_buffer_detach_f08(char *buffer, MPI_Fint *size, MPI_Fint *ierr)
+{
+    ompi_buffer_detach_f08(buffer, size, ierr);
+}
diff --git a/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h b/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h
index 0090fad334..6d862b3dbc 100644
--- a/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h
+++ b/ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h
@@ -1366,7 +1366,7 @@ subroutine ompi_comm_set_attr_f(comm,comm_keyval,attribute_val,ierror) &
 end subroutine ompi_comm_set_attr_f
 
 subroutine ompi_comm_set_info_f(comm,info,ierror) &
-   BIND(C, name="ompi_comm_get_info_f")
+   BIND(C, name="ompi_comm_set_info_f")
    implicit none
    INTEGER, INTENT(IN) :: comm
    INTEGER, INTENT(IN) :: info
diff --git a/ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h b/ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h
index e87d8fcfb8..7d67b03f93 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h
+++ b/ompi/mpi/fortran/use-mpi-f08/pmpi-f-interfaces-bind.h
@@ -98,7 +98,7 @@ end subroutine pompi_buffer_attach_f
 ! us; they can just both be bound to the same back-end
 ! ompi_buffer_detach_f08 C function.
 subroutine pompi_buffer_detach_f(buffer_addr,size,ierror) &
-   BIND(C, name="ompi_buffer_detach_f08")
+   BIND(C, name="pompi_buffer_detach_f08")
    implicit none
    OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer_addr
    INTEGER, INTENT(OUT) :: size
@@ -1416,7 +1416,7 @@ subroutine pompi_type_set_name_f(type,type_name,ierror,type_name_len) &
 end subroutine pompi_type_set_name_f
 
 subroutine pompi_win_allocate_f(size, disp_unit, info, comm, &
-      baseptr, win, ierror) BIND(C, name="ompi_win_allocate_f")
+      baseptr, win, ierror) BIND(C, name="pompi_win_allocate_f")
   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
   INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) ::  size
@@ -1429,7 +1429,7 @@ subroutine pompi_win_allocate_f(size, disp_unit, info, comm, &
 end subroutine pompi_win_allocate_f
 
 subroutine pompi_win_allocate_shared_f(size, disp_unit, info, comm, &
-      baseptr, win, ierror) BIND(C, name="ompi_win_allocate_shared_f")
+      baseptr, win, ierror) BIND(C, name="pompi_win_allocate_shared_f")
   USE, INTRINSIC ::  ISO_C_BINDING, ONLY : C_PTR
   use :: mpi_f08_types, only : MPI_ADDRESS_KIND
   INTEGER(KIND=MPI_ADDRESS_KIND), INTENT(IN) ::  size
diff --git a/ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90 b/ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90
index 9ba20c5264..5c01ce4038 100644
--- a/ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/pmpi-f08-interfaces.F90
@@ -2413,7 +2413,7 @@ end subroutine PMPI_Topo_test_f08
 ! MPI_Wtick is not a wrapper function
 !
 interface PMPI_Wtick
-function  PMPI_Wtick_f08( ) BIND(C,name="MPI_Wtick")
+function  PMPI_Wtick_f08( ) BIND(C,name="PMPI_Wtick")
    use, intrinsic :: ISO_C_BINDING
    implicit none
    DOUBLE PRECISION :: PMPI_Wtick_f08
@@ -2423,7 +2423,7 @@ end function  PMPI_Wtick_f08
 ! MPI_Wtime is not a wrapper function
 !
 interface PMPI_Wtime
-function  PMPI_Wtime_f08( ) BIND(C,name="MPI_Wtime")
+function  PMPI_Wtime_f08( ) BIND(C,name="PMPI_Wtime")
    use, intrinsic :: ISO_C_BINDING
    implicit none
    DOUBLE PRECISION :: PMPI_Wtime_f08