Merge "Rename type() to streamType()"