diff --git a/src/include/mpi.h b/src/include/mpi.h
index b37e3432cc..c75db317aa 100644
--- a/src/include/mpi.h
+++ b/src/include/mpi.h
@@ -439,7 +439,7 @@ extern "C" {
   int MPI_Comm_accept(char *port_name, MPI_Info info, int root, 
                       MPI_Comm comm, MPI_Comm *newcomm);
   MPI_Fint MPI_Comm_c2f(MPI_Comm comm);
-  int MPI_Comm_call_error_handler(MPI_Comm comm, int errorcode);
+  int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode);
   int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result);
   int MPI_Comm_connect(char *port_name, MPI_Info info, int root, 
                        MPI_Comm comm, MPI_Comm *newcomm);
@@ -950,7 +950,7 @@ extern "C" {
   int PMPI_Comm_accept(char *port_name, MPI_Info info, int root, 
                       MPI_Comm comm, MPI_Comm *newcomm);
   MPI_Fint PMPI_Comm_c2f(MPI_Comm comm);
-  int PMPI_Comm_call_error_handler(MPI_Comm comm, int errorcode);
+  int PMPI_Comm_call_errhandler(MPI_Comm comm, int errorcode);
   int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result);
   int PMPI_Comm_connect(char *port_name, MPI_Info info, int root, 
                        MPI_Comm comm, MPI_Comm *newcomm);
diff --git a/src/mpi/interface/c/comm_call_errhandler.c b/src/mpi/interface/c/comm_call_errhandler.c
index c3d1b4757d..7c8739daf7 100644
--- a/src/mpi/interface/c/comm_call_errhandler.c
+++ b/src/mpi/interface/c/comm_call_errhandler.c
@@ -12,6 +12,6 @@
 #endif
     
 
-int MPI_Comm_call_error_handler(MPI_Comm comm, int errorcode) {
+int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) {
     return MPI_SUCCESS;
 }