Remove unused line
Typo
Refactor common name generation