Migration round 6: Renamed all references to producer/consumer