Change name of tracker helper classes