Merge recent rename changes to mesh