rename track events to follow convention