More renaming fun.