Renames and typo's