Tidy up legacy naming