better naming / cleaner handling of set patterns

these are mostly superficial changes.  next step is probably to start moving out individual set pattern classes.

I think the emerging nomenclature is a bit clearer.