typo and renaming