XD-1804: Remove 'substream' support
Remove unused classes
XD-1772: Force use of disambiguating label

Add a test with only one label

label falls back to name if not explicit