Refactor some names