More renaming updates