Refactoring naming