5 files changed, 6 insertions, 6 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index a475ab4cc..bec89ad64 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1503,7 +1503,7 @@ extern "C"
 /**
  * Message for operation events
  */
-#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT 474
+#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT 474
 
 /**
  * Message to signal successful peer creation
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 3a4cd0375..3438d6794 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -856,7 +856,7 @@ send_operation_fail_msg (struct GNUNET_SERVER_Client *client,
   msize += emsg_len;
   msg = GNUNET_malloc (msize);
   msg->header.size = htons (msize);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT);
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT);
   msg->event_type = htonl (GNUNET_TESTBED_ET_OPERATION_FINISHED);
   msg->operation_id = GNUNET_htonll (operation_id);
   if (0 != emsg_len)
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 9ec1f71c2..9c2103f3f 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -477,7 +477,7 @@ struct GNUNET_TESTBED_OperationFailureEventMessage
 {
 
   /**
-   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT
    */
   struct GNUNET_MessageHeader header;
 
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index d83793ac5..9171ce947 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -612,7 +612,7 @@ handle_peer_config (struct GNUNET_TESTBED_Controller *c,
 
 
 /**
- * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT message from
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT message from
  * controller (testbed service)
  *
  * @param c the controller handler
@@ -757,7 +757,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
                               (const struct
                                GNUNET_TESTBED_ConnectionEventMessage *) msg);
     break;
-  case GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT:
+  case GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT:
     GNUNET_assert (msize >=
                    sizeof (struct GNUNET_TESTBED_OperationFailureEventMessage));
     status =
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 861b35917..c3375a9c7 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -142,7 +142,7 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
   uint16_t mtype;
 
   mtype = ntohs (msg->type);
-  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT == mtype)
+  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT == mtype)
   {
     GNUNET_assert (0);          /* FIXME: Add notification for failure */
   }