replace PropertyValue* names with their name Constrain* equivalents