Will rename to match the fields in geo.