-#include <babeltrace/graph/notification-const.h>
-#include <babeltrace/graph/notification-event-const.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity-const.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-packet-const.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream-const.h>
-#include <babeltrace/graph/notification-stream.h>
+#include <babeltrace/graph/message-const.h>
+#include <babeltrace/graph/message-event-const.h>
+#include <babeltrace/graph/message-event.h>
+#include <babeltrace/graph/message-inactivity-const.h>
+#include <babeltrace/graph/message-inactivity.h>
+#include <babeltrace/graph/message-packet-const.h>
+#include <babeltrace/graph/message-packet.h>
+#include <babeltrace/graph/message-stream-const.h>
+#include <babeltrace/graph/message-stream.h>