Refactor name formatting.