change field names to match new druid config
Merge branch 'aitfive-39' into qa