Fixes to filenames