typo-fixing and name-changes