Revert "Revert "remove prefix names for stream""

This reverts commit f101d470904ec5c866aaf71916d191a05c0168d5.