More renaming stuff for consistency