Change primary key to use proper naming.
Fix country_iso_code f. key definition.
Update proper f. key and belongs_to for State.