-#include <lttng/event-rule/kprobe.h>
-#include <lttng/event-rule/syscall.h>
-#include <lttng/event-rule/uprobe.h>
+#include <lttng/event-rule/kernel-probe.h>
+#include <lttng/event-rule/kernel-syscall.h>
+#include <lttng/event-rule/tracepoint.h>
+#include <lttng/event-rule/userspace-probe.h>