A bit of name refactoring