refactoring for new name