Refactors some names.