Change field from "id" to "country_id" in Country entity