Fixes in file names