Consitently changed to using 'locations' rather than 'location' for names.