Refactor some names.