make constraint names clearer and change references from old name to new name