refactor the names