CMS-2707 Data serialization format - use name as element-name, not kind.