more name refactoring