Making sure we use standard filenames