Before revision: Khoekhoe subdivisions today are the Nama people of Namibia, Botswana and South Africa (with numerous clans), the ǂNūkhoeǃhaos of Namibia, the !Orana clans of South Africa (such as ǀHõakhoena or AmaNgqosini ), the Xirikua or Griekwa nation of South Africa , and the AmaGqunukhwebe or !Gona clans which fall under the Xhosa-speaking polities .
After revision: Khoekhoe subdivisions today are the Nama people of Namibia, Botswana and South Africa (with numerous clans), the ǂNūkhoeǃhaos of Namibia, the !Orana clans of South Africa (such as ǀHõakhoena ), the Xirikua or Griekwa nation of South Africa .