Try to fix up the filenames a bit more