Handle renames from #3310