rename some methods, new stream, new unwind options