Fixed logic for getting filenames from new pattern.
Next version.