Renames and typos