Names refactoring.