modify file name and fix rwstream bug