Refactor name columns