Moving terms to data properties from object properties