Allow underscores in file set names

Let's allow underscores in the names of the file sets.