s/(Value|Schema)Definition/\1Property/g
Guess what. I refactored constraints again.