refactor: re-order and re-name
specs
refactor: better var name
DeliverFun wasn't deliverying anything. It was just getting hold of a
message *to* deliver. -> FetchFun