Refactoring some names