Rename UserStream class to Stream. Fixes #532.