Renamed InfoKind, StreamKind to InfoType, StreamType