MP-434 #comment Rename fields to match shape file