Rename google_location_id to just location_id