More renaming that was missed