Refactoring: naming convention