Improve naming of file