Fixing file name problems