renames and typos