no, peacock, hap and mbuna are common terms for cichlids of Lake Malawi,
Maylandia, Aulanocara,Copadichromis, Cyrtocara, Placidochromis, Protomelas, Otopharynx, Nyassachromis, and Sciaenochromis are genus names.
(strangely enough although some called "Hap's" there are no true Haplochromis species in Malawi due to taxonomic revisions.)
oh and you Pemba's are Tanganyikan, the Brown haps are from Victoria.
heres a couple of good reads.
http://www.cichlid-forum.com/articles/peacocks.php
http://www.aquaticcommunity.com/cichlid/haplochromis.php