Refactor collect names