Exchanged file support for stream support
Renames