Rename more variables from queue to stream.