Change naming for Constraint slightly.