rename track events to follow convention
Merge branch 'master' into staging