-static struct object_data metadata_stream_data[NR_SESSIONS];
-static struct object_data metadata_data[NR_SESSIONS];
-static struct object_data channel_data[NR_SESSIONS][NR_CHANNELS];
-static struct object_data stream_data[NR_SESSIONS][NR_CHANNELS][MAX_NR_STREAMS];
+static struct lttng_ust_object_data metadata_stream_data[NR_SESSIONS];
+static struct lttng_ust_object_data metadata_data[NR_SESSIONS];
+static struct lttng_ust_object_data channel_data[NR_SESSIONS][NR_CHANNELS];
+static struct lttng_ust_object_data stream_data[NR_SESSIONS][NR_CHANNELS][MAX_NR_STREAMS];