Name and typo fixes