Fix the track naming