Updating regex to work with some less-than-standard file names