Correct names for uniqueness constraints, followup to #22