Refactoring continues:
Renamed some variables in Constraint_of and Constraint_generators modules.