Refactoring: naming