Move to using names for the tracks for extra data