Rename primary/secondary to mandatory/optional

Rather include the intention in the name for self-describing code