Changed names to GeoKey