Renaming civilizations for consistency

I've always been bothered by the fact that some civilizations are named using historical terms, (Franks, Britons, Teutons), whereas others are named with more modern names (Italians, Vietnamese, Ethiopians). Further, some are named on closer to ethnic lines (Japanese, Lithuanians, Slavs) and others are named after kingdoms/empires (Aztecs, Byzantines). So I have been trying to rename all of the AOEII civilizations using modern terms for consistency and broadness (as well as architecture realignment), let me know if there are mistakes/what should be changed.

Western European:

English

Celts

French

Central European:

Germans

Hungarians

Goths (Still not sure what to do with them)

Eastern European:

Norse

Slavs

Lithuanians

Bulgarians

Southern European:

Greeks

Italians

Spanish

Portuguese

East Asian:

Chinese

Japanese

Koreans

Vietnamese

Mongols

South Asian:

Indians

Burmese

Southeast Asian:

Malays/Indonesian?

Khmer

Middle East:

Arabs

Turks

Berbers

Central Asian:

Huns

Tatars

Cumans

Iranians

American:

Mayans

Quechua

Mexica/Nahuas

African:

Malians

Ethiopians