Use underscore rather than dashes for field names

We should use underscore as a field-name separator rather than dashes to be consistent with other tools like kibana or Elasticsearch core itself.