Fix legacy naming