Fix name field for suffixed ISO 639-1 codes (fixes #1628)