diff --git a/ompi/mpi/man/man3/MPI_Type_get_envelope.3in b/ompi/mpi/man/man3/MPI_Type_get_envelope.3in
index e624a291c0..5832e9094e 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_envelope.3in
+++ b/ompi/mpi/man/man3/MPI_Type_get_envelope.3in
@@ -84,11 +84,20 @@ MPI_COMBINER_NAMED              a named predefined data type
 MPI_COMBINER_DUP                MPI_Type_dup
 MPI_COMBINER_CONTIGUOUS         MPI_Type_contiguous
 MPI_COMBINER_VECTOR             MPI_Type_vector
-MPI_COMBINER_HVECTOR            MPI_Type_hvector
+MPI_COMBINER_HVECTOR_INTEGER    MPI_Type_hvector from Fortran
+MPI_COMBINER_HVECTOR            MPI_Type_hvector from C or C++
+                                  and MPI_Type_create for
+                                  all languages
 MPI_COMBINER_INDEXED            MPI_Type_indexed
-MPI_COMBINER_HINDEXED           MPI_Type_hindexed
+MPI_COMBINER_HINDEXED_INTEGER   MPI_Type_hindexed from Fortran
+MPI_COMBINER_HINDEXED           MPI_Type_hindexed from C or C++
+                                  and MPI_Type_create_hindexed
+                                  for all languages
 MPI_COMBINER_INDEXED_BLOCK      MPI_Type_create_indexed_block
-MPI_COMBINER_STRUCT             MPI_Type_struct
+MPI_COMBINER_STRUCT_INTEGER     MPI_Type_struct from Fortran
+MPI_COMBINER_STRUCT             MPI_Type_struct from C or C++
+                                  and MPI_Type_create_struct
+                                  for all languages
 MPI_COMBINER_SUBARRAY           MPI_Type_create_subarray
 MPI_COMBINER_DARRAY             MPI_Type_create_darray
 MPI_COMBINER_F90_REAL           MPI_Type_create_f90_real