Refactoring name.