Do this even if the browser provides a non '-' string for streamId since we rely on this to generate the source name.