Name refactoring.