Naming refactoring.