Naming refactoring