Rename some methods to simplify API.
Improve file stream agin.