Get the filenames right