diff --git a/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
index 3efc2e29237..8f1befe0d8c 100644
--- a/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/comm_create_from_group_f08.F90
@@ -21,7 +21,7 @@ subroutine MPI_Comm_create_from_group_f08(group, stringtag, info, errhandler, ne
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_create_comm_from_group_f(group%MPI_VAL, stringtag, info%MPI_VAL, errhandler%MPI_VAL, &
+   call ompi_comm_create_from_group_f(group%MPI_VAL, stringtag, info%MPI_VAL, errhandler%MPI_VAL, &
                                       newcomm%MPI_VAL, c_ierror, len(stringtag))
    if (present(ierror)) ierror = c_ierror
 
diff --git a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
index 499c8038a94..9b92a9db9ab 100644
--- a/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/intercomm_create_from_groups_f08.F90
@@ -24,7 +24,7 @@ subroutine MPI_Intercomm_create_from_groups_f08(local_group, local_leader, remot
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_create_intercomm_from_groups_f(local_group%MPI_VAL, local_leader, &
+   call ompi_intercomm_create_from_groups_f(local_group%MPI_VAL, local_leader, &
                                             remote_group%MPI_VAL,  &
                                             remote_leader, stringtag, info%MPI_VAL, &
                                             errhandler%MPI_VAL, &
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_from_group_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_from_group_f08.F90
index 5043336118f..84098a44dc2 100644
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_from_group_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/profile/pcomm_create_from_group_f08.F90
@@ -21,7 +21,7 @@ subroutine PMPI_Comm_create_from_group_f08(group, stringtag, info, errhandler, n
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_create_comm_from_group_f(group%MPI_VAL, stringtag, info%MPI_VAL, errhandler%MPI_VAL, &
+   call ompi_comm_create_from_group_f(group%MPI_VAL, stringtag, info%MPI_VAL, errhandler%MPI_VAL, &
                                       newcomm%MPI_VAL, c_ierror, len(stringtag))
    if (present(ierror)) ierror = c_ierror
 
diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_from_groups_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_from_groups_f08.F90
index 9b5a0a05f0a..668188d1adb 100644
--- a/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_from_groups_f08.F90
+++ b/ompi/mpi/fortran/use-mpi-f08/profile/pintercomm_create_from_groups_f08.F90
@@ -24,7 +24,7 @@ subroutine PMPI_Intercomm_create_from_groups_f08(local_group, local_leader, remo
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
    integer :: c_ierror
 
-   call ompi_create_intercomm_from_groups_f(local_group%MPI_VAL, local_leader, &
+   call ompi_intercomm_create_from_groups_f(local_group%MPI_VAL, local_leader, &
                                             remote_group%MPI_VAL,  &
                                             remote_leader, stringtag, info%MPI_VAL, &
                                             errhandler%MPI_VAL, &