Update wording to refactoring