Fixed using old names in dependat datatypes.
Added State based 2P sets.