Small name refactoring.