-#include <babeltrace/component/component-port.h>
-#include <babeltrace/component/component-graph.h>
-#include <babeltrace/component/component-connection.h>
+#include <babeltrace/component/port.h>
+#include <babeltrace/component/graph.h>
+#include <babeltrace/component/connection.h>