Refactor nomes classes