diff --git a/src/mpi/f77/comm_get_name_f.c b/src/mpi/f77/comm_get_name_f.c
index 9180bdbcce..8402203828 100644
--- a/src/mpi/f77/comm_get_name_f.c
+++ b/src/mpi/f77/comm_get_name_f.c
@@ -20,12 +20,12 @@
 #pragma weak pmpi_comm_get_name__ = mpi_comm_get_name_f
 #elif OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_GET_NAME,
-                           pmpi_comm_get_name,
-                           pmpi_comm_get_name_,
-                           pmpi_comm_get_name__,
-                           pmpi_comm_get_name_f,
-                           (MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr),
-                           (comm, comm_name, resultlen, ierr) )
+                            pmpi_comm_get_name,
+                            pmpi_comm_get_name_,
+                            pmpi_comm_get_name__,
+                            pmpi_comm_get_name_f,
+                            (MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len),
+                            (comm, comm_name, resultlen, ierr, name_len) )
 #endif
 
 #if OMPI_HAVE_WEAK_SYMBOLS
@@ -37,12 +37,12 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_GET_NAME,
 
 #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (MPI_COMM_GET_NAME,
-                           mpi_comm_get_name,
-                           mpi_comm_get_name_,
-                           mpi_comm_get_name__,
-                           mpi_comm_get_name_f,
-                           (MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr),
-                           (comm, comm_name, resultlen, ierr) )
+                            mpi_comm_get_name,
+                            mpi_comm_get_name_,
+                            mpi_comm_get_name__,
+                            mpi_comm_get_name_f,
+                            (MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len),
+                            (comm, comm_name, resultlen, ierr, name_len) )
 #endif
 
 
diff --git a/src/mpi/f77/comm_set_name_f.c b/src/mpi/f77/comm_set_name_f.c
index a0ff5de177..c2c4987ece 100644
--- a/src/mpi/f77/comm_set_name_f.c
+++ b/src/mpi/f77/comm_set_name_f.c
@@ -20,12 +20,12 @@
 #pragma weak pmpi_comm_set_name__ = mpi_comm_set_name_f
 #elif OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_SET_NAME,
-                           pmpi_comm_set_name,
-                           pmpi_comm_set_name_,
-                           pmpi_comm_set_name__,
-                           pmpi_comm_set_name_f,
-                           (MPI_Fint *comm, char *comm_name, MPI_Fint *ierr),
-                           (comm, comm_name, ierr) )
+                            pmpi_comm_set_name,
+                            pmpi_comm_set_name_,
+                            pmpi_comm_set_name__,
+                            pmpi_comm_set_name_f,
+                            (MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len),
+                            (comm, comm_name, ierr, name_len) )
 #endif
 
 #if OMPI_HAVE_WEAK_SYMBOLS
@@ -37,12 +37,12 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_SET_NAME,
 
 #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SET_NAME,
-                           mpi_comm_set_name,
-                           mpi_comm_set_name_,
-                           mpi_comm_set_name__,
-                           mpi_comm_set_name_f,
-                           (MPI_Fint *comm, char *comm_name, MPI_Fint *ierr),
-                           (comm, comm_name, ierr) )
+                            mpi_comm_set_name,
+                            mpi_comm_set_name_,
+                            mpi_comm_set_name__,
+                            mpi_comm_set_name_f,
+                            (MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len),
+                            (comm, comm_name, ierr, name_len) )
 #endif
 
 
diff --git a/src/mpi/f77/comm_spawn_f.c b/src/mpi/f77/comm_spawn_f.c
index bbbb7956e0..6ab9ab926d 100644
--- a/src/mpi/f77/comm_spawn_f.c
+++ b/src/mpi/f77/comm_spawn_f.c
@@ -19,12 +19,12 @@
 #pragma weak pmpi_comm_spawn__ = mpi_comm_spawn_f
 #elif OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_SPAWN,
-                           pmpi_comm_spawn,
-                           pmpi_comm_spawn_,
-                           pmpi_comm_spawn__,
-                           pmpi_comm_spawn_f,
-                           (char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr),
-                           (command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr) )
+                            pmpi_comm_spawn,
+                            pmpi_comm_spawn_,
+                            pmpi_comm_spawn__,
+                            pmpi_comm_spawn_f,
+                            (char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len),
+                            (command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr, cmd_len, argv_len) )
 #endif
 
 #if OMPI_HAVE_WEAK_SYMBOLS
@@ -36,12 +36,12 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_COMM_SPAWN,
 
 #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
 OMPI_GENERATE_F77_BINDINGS (MPI_COMM_SPAWN,
-                           mpi_comm_spawn,
-                           mpi_comm_spawn_,
-                           mpi_comm_spawn__,
-                           mpi_comm_spawn_f,
-                           (char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr),
-                           (command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr) )
+                            mpi_comm_spawn,
+                            mpi_comm_spawn_,
+                            mpi_comm_spawn__,
+                            mpi_comm_spawn_f,
+                            (char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len),
+                            (command, argv, maxprocs, info, root, comm, intercomm, array_of_errcodes, ierr, cmd_len, argv_len) )
 #endif
 
 
diff --git a/src/mpi/f77/profile/prototypes_pmpi.h b/src/mpi/f77/profile/prototypes_pmpi.h
index def5dacf46..c4e395b053 100644
--- a/src/mpi/f77/profile/prototypes_pmpi.h
+++ b/src/mpi/f77/profile/prototypes_pmpi.h
@@ -63,7 +63,8 @@ void pmpi_comm_free_keyval_f(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void pmpi_comm_free_f(MPI_Fint *comm, MPI_Fint *ierr);
 void pmpi_comm_get_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_comm_get_errhandler_f(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void pmpi_comm_get_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void pmpi_comm_get_name_f(MPI_Fint *comm, char *comm_name, 
+                          MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void pmpi_comm_get_parent_f(MPI_Fint *parent, MPI_Fint *ierr);
 void pmpi_comm_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_join_f(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -72,9 +73,13 @@ void pmpi_comm_remote_group_f(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_remote_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void pmpi_comm_set_attr_f(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void pmpi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void pmpi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void pmpi_comm_set_name_f(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr,
+                          int name_len);
 void pmpi_comm_size_f(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void pmpi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void pmpi_comm_spawn_f(char *command, char *argv, MPI_Fint *maxprocs,
+                       MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm,
+                       MPI_Fint *intercomm, MPI_Fint *array_of_errcodes,
+                       MPI_Fint *ierr, int cmd_len, int argv_len);
 void pmpi_comm_spawn_multiple_f(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void pmpi_comm_split_f(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void pmpi_comm_test_inter_f(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -350,7 +355,7 @@ void pmpi_comm_free_keyval(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void pmpi_comm_free(MPI_Fint *comm, MPI_Fint *ierr);
 void pmpi_comm_get_attr(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_comm_get_errhandler(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void pmpi_comm_get_name(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void pmpi_comm_get_name(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void pmpi_comm_get_parent(MPI_Fint *parent, MPI_Fint *ierr);
 void pmpi_comm_group(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_join(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -359,9 +364,9 @@ void pmpi_comm_remote_group(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_remote_size(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void pmpi_comm_set_attr(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void pmpi_comm_set_errhandler(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void pmpi_comm_set_name(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void pmpi_comm_set_name(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void pmpi_comm_size(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void pmpi_comm_spawn(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void pmpi_comm_spawn(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void pmpi_comm_spawn_multiple(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void pmpi_comm_split(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void pmpi_comm_test_inter(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -637,7 +642,7 @@ void pmpi_comm_free_keyval_(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void pmpi_comm_free_(MPI_Fint *comm, MPI_Fint *ierr);
 void pmpi_comm_get_attr_(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_comm_get_errhandler_(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void pmpi_comm_get_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void pmpi_comm_get_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void pmpi_comm_get_parent_(MPI_Fint *parent, MPI_Fint *ierr);
 void pmpi_comm_group_(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_join_(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -646,9 +651,9 @@ void pmpi_comm_remote_group_(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_remote_size_(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void pmpi_comm_set_attr_(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void pmpi_comm_set_errhandler_(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void pmpi_comm_set_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void pmpi_comm_set_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void pmpi_comm_size_(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void pmpi_comm_spawn_(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void pmpi_comm_spawn_(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void pmpi_comm_spawn_multiple_(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void pmpi_comm_split_(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void pmpi_comm_test_inter_(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -924,7 +929,7 @@ void pmpi_comm_free_keyval__(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void pmpi_comm_free__(MPI_Fint *comm, MPI_Fint *ierr);
 void pmpi_comm_get_attr__(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void pmpi_comm_get_errhandler__(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void pmpi_comm_get_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void pmpi_comm_get_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void pmpi_comm_get_parent__(MPI_Fint *parent, MPI_Fint *ierr);
 void pmpi_comm_group__(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_join__(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -933,9 +938,9 @@ void pmpi_comm_remote_group__(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void pmpi_comm_remote_size__(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void pmpi_comm_set_attr__(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void pmpi_comm_set_errhandler__(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void pmpi_comm_set_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void pmpi_comm_set_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void pmpi_comm_size__(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void pmpi_comm_spawn__(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void pmpi_comm_spawn__(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void pmpi_comm_spawn_multiple__(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void pmpi_comm_split__(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void pmpi_comm_test_inter__(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -1211,7 +1216,7 @@ void PMPI_COMM_FREE_KEYVAL(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void PMPI_COMM_FREE(MPI_Fint *comm, MPI_Fint *ierr);
 void PMPI_COMM_GET_ATTR(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void PMPI_COMM_GET_ERRHANDLER(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void PMPI_COMM_GET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void PMPI_COMM_GET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void PMPI_COMM_GET_PARENT(MPI_Fint *parent, MPI_Fint *ierr);
 void PMPI_COMM_GROUP(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void PMPI_COMM_JOIN(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -1220,9 +1225,9 @@ void PMPI_COMM_REMOTE_GROUP(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void PMPI_COMM_REMOTE_SIZE(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void PMPI_COMM_SET_ATTR(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void PMPI_COMM_SET_ERRHANDLER(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void PMPI_COMM_SET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void PMPI_COMM_SET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void PMPI_COMM_SIZE(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void PMPI_COMM_SPAWN(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void PMPI_COMM_SPAWN(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void PMPI_COMM_SPAWN_MULTIPLE(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void PMPI_COMM_SPLIT(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void PMPI_COMM_TEST_INTER(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
diff --git a/src/mpi/f77/prototypes_mpi.h b/src/mpi/f77/prototypes_mpi.h
index 3956e802fc..38bddef1a9 100644
--- a/src/mpi/f77/prototypes_mpi.h
+++ b/src/mpi/f77/prototypes_mpi.h
@@ -375,7 +375,7 @@ void mpi_comm_free_keyval(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void mpi_comm_free(MPI_Fint *comm, MPI_Fint *ierr);
 void mpi_comm_get_attr(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_comm_get_errhandler(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void mpi_comm_get_name(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void mpi_comm_get_name(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void mpi_comm_get_parent(MPI_Fint *parent, MPI_Fint *ierr);
 void mpi_comm_group(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void mpi_comm_join(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -386,7 +386,7 @@ void mpi_comm_set_attr(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_va
 void mpi_comm_set_errhandler(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
 void mpi_comm_set_name(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
 void mpi_comm_size(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void mpi_comm_spawn(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void mpi_comm_spawn(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void mpi_comm_spawn_multiple(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void mpi_comm_split(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void mpi_comm_test_inter(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -676,7 +676,7 @@ void mpi_comm_free_keyval_(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void mpi_comm_free_(MPI_Fint *comm, MPI_Fint *ierr);
 void mpi_comm_get_attr_(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_comm_get_errhandler_(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void mpi_comm_get_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void mpi_comm_get_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void mpi_comm_get_parent_(MPI_Fint *parent, MPI_Fint *ierr);
 void mpi_comm_group_(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void mpi_comm_join_(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -685,9 +685,9 @@ void mpi_comm_remote_group_(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void mpi_comm_remote_size_(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void mpi_comm_set_attr_(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void mpi_comm_set_errhandler_(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void mpi_comm_set_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void mpi_comm_set_name_(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void mpi_comm_size_(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void mpi_comm_spawn_(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void mpi_comm_spawn_(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void mpi_comm_spawn_multiple_(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void mpi_comm_split_(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void mpi_comm_test_inter_(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -977,7 +977,7 @@ void mpi_comm_free_keyval__(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void mpi_comm_free__(MPI_Fint *comm, MPI_Fint *ierr);
 void mpi_comm_get_attr__(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void mpi_comm_get_errhandler__(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void mpi_comm_get_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void mpi_comm_get_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void mpi_comm_get_parent__(MPI_Fint *parent, MPI_Fint *ierr);
 void mpi_comm_group__(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void mpi_comm_join__(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -986,9 +986,9 @@ void mpi_comm_remote_group__(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void mpi_comm_remote_size__(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void mpi_comm_set_attr__(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void mpi_comm_set_errhandler__(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void mpi_comm_set_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void mpi_comm_set_name__(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void mpi_comm_size__(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void mpi_comm_spawn__(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void mpi_comm_spawn__(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void mpi_comm_spawn_multiple__(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void mpi_comm_split__(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void mpi_comm_test_inter__(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);
@@ -1278,7 +1278,7 @@ void MPI_COMM_FREE_KEYVAL(MPI_Fint *comm_keyval, MPI_Fint *ierr);
 void MPI_COMM_FREE(MPI_Fint *comm, MPI_Fint *ierr);
 void MPI_COMM_GET_ATTR(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *flag, MPI_Fint *ierr);
 void MPI_COMM_GET_ERRHANDLER(MPI_Fint *comm, MPI_Fint *erhandler, MPI_Fint *ierr);
-void MPI_COMM_GET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr);
+void MPI_COMM_GET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *resultlen, MPI_Fint *ierr, int name_len);
 void MPI_COMM_GET_PARENT(MPI_Fint *parent, MPI_Fint *ierr);
 void MPI_COMM_GROUP(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void MPI_COMM_JOIN(MPI_Fint *fd, MPI_Fint *intercomm, MPI_Fint *ierr);
@@ -1287,9 +1287,9 @@ void MPI_COMM_REMOTE_GROUP(MPI_Fint *comm, MPI_Fint *group, MPI_Fint *ierr);
 void MPI_COMM_REMOTE_SIZE(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
 void MPI_COMM_SET_ATTR(MPI_Fint *comm, MPI_Fint *comm_keyval, char *attribute_val, MPI_Fint *ierr);
 void MPI_COMM_SET_ERRHANDLER(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr);
-void MPI_COMM_SET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr);
+void MPI_COMM_SET_NAME(MPI_Fint *comm, char *comm_name, MPI_Fint *ierr, int name_len);
 void MPI_COMM_SIZE(MPI_Fint *comm, MPI_Fint *size, MPI_Fint *ierr);
-void MPI_COMM_SPAWN(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
+void MPI_COMM_SPAWN(char *command, char *argv, MPI_Fint *maxprocs, MPI_Fint *info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr, int cmd_len, int argv_len);
 void MPI_COMM_SPAWN_MULTIPLE(MPI_Fint *count, char *array_of_commands, char *array_of_argv, MPI_Fint *array_of_maxprocs, MPI_Fint *array_of_info, MPI_Fint *root, MPI_Fint *comm, MPI_Fint *intercomm, MPI_Fint *array_of_errcodes, MPI_Fint *ierr);
 void MPI_COMM_SPLIT(MPI_Fint *comm, MPI_Fint *color, MPI_Fint *key, MPI_Fint *newcomm, MPI_Fint *ierr);
 void MPI_COMM_TEST_INTER(MPI_Fint *comm, MPI_Fint *flag, MPI_Fint *ierr);