Refactors names