More renaming for consistency