renaming && typo fix