Rename constraint SingularInstanceConstraint in SingletonConstraint,
UniqueConstraint in UniqueValueConstraint.