change field names to match