Fix typo
Remove unneeded formatting change
Don't mix 'name' and 'key' terminology for streams