Rename the stream2 package back to stream; I won't need a different name for the migration after all