Change single-valued associations to use a singular attribute name and hold a single value, not a set.