wondering here: should "El Salvador" be considered a two word country? since you're ignoring the connective "the", i think maybe "el" shouldn't be counted. The country's name translates from spanish as "the saviour".
I thought about that as well, but my final conclusion was that El Salvador is a two word country. Differently from Cote D'Ivoire, for example, whose english translation is Ivory Coast, or Timor-Leste, whose name is East Timor, the english name for El Salvador remains being El Salvador. "The Saviour" is just a literal translation of the country's name. Besides, nobody refers to the country that way. Hope I cleared it up for you :)