Merge "Change name of the intent fields" into oc-dev