Renamed GenericProducer/Broker and Consumer per 0.4-plan. Closes #22