More name refactoring.