Some more name refactoring