Improve metadata and event metadata field names