More name refactoring