Refactor nomes