Further name refactoring