-#define _TP_EXVAR0()
-#define _TP_EXVAR1(a)
-#define _TP_EXVAR2(a,b) b
-#define _TP_EXVAR4(a,b,c,d) b,d
-#define _TP_EXVAR6(a,b,c,d,e,f) b,d,f
-#define _TP_EXVAR8(a,b,c,d,e,f,g,h) b,d,f,h
-#define _TP_EXVAR10(a,b,c,d,e,f,g,h,i,j) b,d,f,h,j
-#define _TP_EXVAR12(a,b,c,d,e,f,g,h,i,j,k,l) b,d,f,h,j,l
-#define _TP_EXVAR14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) b,d,f,h,j,l,n
-#define _TP_EXVAR16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) b,d,f,h,j,l,n,p
-#define _TP_EXVAR18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) b,d,f,h,j,l,n,p,r
-#define _TP_EXVAR20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) b,d,f,h,j,l,n,p,r,t
+#define LTTNG_UST__TP_EXVAR0()
+#define LTTNG_UST__TP_EXVAR1(a)
+#define LTTNG_UST__TP_EXVAR2(a,b) b
+#define LTTNG_UST__TP_EXVAR4(a,b,c,d) b,d
+#define LTTNG_UST__TP_EXVAR6(a,b,c,d,e,f) b,d,f
+#define LTTNG_UST__TP_EXVAR8(a,b,c,d,e,f,g,h) b,d,f,h
+#define LTTNG_UST__TP_EXVAR10(a,b,c,d,e,f,g,h,i,j) b,d,f,h,j
+#define LTTNG_UST__TP_EXVAR12(a,b,c,d,e,f,g,h,i,j,k,l) b,d,f,h,j,l
+#define LTTNG_UST__TP_EXVAR14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) b,d,f,h,j,l,n
+#define LTTNG_UST__TP_EXVAR16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) b,d,f,h,j,l,n,p
+#define LTTNG_UST__TP_EXVAR18(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r) b,d,f,h,j,l,n,p,r
+#define LTTNG_UST__TP_EXVAR20(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t) b,d,f,h,j,l,n,p,r,t