Fixed trailing comma.
Renamed based on new version.
Streams.