#define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
#undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
-#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_template_provider, _template_name, _provider, _name, _args)
#undef LTTNG_UST_TRACEPOINT_ENUM
#define LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values)
#undef lttng_ust__field_unused
#define lttng_ust__field_unused(_src)
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)
/* "write" */
#undef lttng_ust_field_integer
#undef lttng_ust_field_unused
#define lttng_ust_field_unused(_src)
-#undef ctf_enum
-#define ctf_enum(_provider, _name, _type, _item, _src)
+#undef lttng_ust_field_enum
+#define lttng_ust_field_enum(_provider, _name, _type, _item, _src)
/* "nowrite" */
#undef lttng_ust_field_integer_nowrite
#undef lttng_ust_field_unused_nowrite
#define lttng_ust_field_unused_nowrite(_src)
-#undef ctf_enum_nowrite
-#define ctf_enum_nowrite(_provider, _name, _type, _item, _src)
+#undef lttng_ust_field_enum_nowrite
+#define lttng_ust_field_enum_nowrite(_provider, _name, _type, _item, _src)