Use the same field naming convention in mapping creator