refactoring the name