s/client/consumer where appropriate
improve use of 'producer'