patching Countries to short name
  NAME PATCHING MUST BE DONE OFF-LINE

  Done.