fix names for stream and Batch interface