This is a temporary hack until the different stream naming schemes
become obsolete due to further improvements like acknowledgements.