Added generation of the stream filenames