fix A field names
change field names B