-# define TRACK_NCTX(name, string) track__context name = { 0, string }
-# define TRACK_NPUSH(name) track_pushContext(name)
-# define TRACK_NPOP(name) track_popContext(name)
-# define TRACK_CTX(string) TRACK_NCTX(track__localContext, string)
-# define TRACK_PUSH TRACK_NPUSH(track__localContext)
-# define TRACK_POP TRACK_NPOP(track__localContext)
+# define TRACK_NCTX(name, string) track_ctx name = { 0, string }
+# define TRACK_NPUSH(name) track_push(name)
+# define TRACK_NPOP(name) track_pop(name)
+# define TRACK_CTX(string) TRACK_NCTX(__track_ctx, string)
+# define TRACK_PUSH TRACK_NPUSH(__track_ctx)
+# define TRACK_POP TRACK_NPOP(__track_ctx)