Updated regex for file name to be more flexible