More renaming and changes