Fixing default arguments to work with updated filenames