Constraint naming updated, testing