refactoring some names