diff --git a/ompi/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c
index 71596a0158..ebee11c514 100644
--- a/ompi/mpi/c/comm_spawn.c
+++ b/ompi/mpi/c/comm_spawn.c
@@ -93,7 +93,7 @@ int MPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
        ompi_open_port (port_name);
        if (OMPI_SUCCESS != (rc = ompi_comm_start_processes (1, &command, &argv, &maxprocs, 
                                                             &info, port_name))) {
-           goto ERROR;
+           goto error;
        }
        tmp_port = ompi_parse_port (port_name, &tag);
        free(tmp_port);
@@ -102,7 +102,7 @@ int MPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
    
    rc = ompi_comm_connect_accept (comm, root, NULL, send_first, &newcomp, tag);
 
-ERROR:
+error:
     /* close the port again. Nothing has to be done for that at the moment.*/
 
    /* set error codes */
diff --git a/ompi/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c
index ed6d7c6e1e..87247a518e 100644
--- a/ompi/mpi/c/comm_spawn_multiple.c
+++ b/ompi/mpi/c/comm_spawn_multiple.c
@@ -110,7 +110,7 @@ int MPI_Comm_spawn_multiple(int count, char **array_of_commands, char ***array_o
         if (OMPI_SUCCESS != (rc = ompi_comm_start_processes(count, array_of_commands,
                                                             array_of_argv, array_of_maxprocs,
                                                             array_of_info, port_name))) {
-            goto ERROR;
+            goto error;
         }
         tmp_port = ompi_parse_port (port_name, &tag);
         free(tmp_port);
@@ -118,7 +118,7 @@ int MPI_Comm_spawn_multiple(int count, char **array_of_commands, char ***array_o
 
     rc = ompi_comm_connect_accept (comm, root, NULL, send_first, &newcomp, tag);
 
-ERROR:
+error:
     /* close the port again. Nothing has to be done for that at the moment.*/
 
     /* set array of errorcodes */