Merge "Rename property 'schema' to 'type'"