ISO 639 calls the language "Azerbaijani". There are claims that there is a different but related minor langauge called "Azeri". Better follow 639 in "draft-phillips-langtags-02" and call it "Azerbaijani" in the text. roozbeh