refactoring, changing names