name refactoring 2