Adjust filenames
Slightly more robust (but still clunky) error handling