Fixed filenames, made simpler as per Dan's suggestion