refactoring wrap's name