Revert "remove prefix names for stream"

This reverts commit 6c05f59fe76fdbbd1a055379a631c754d805bbab.