I rather like the term 'Afro-American' to refer to us descendants of slaves brought to the US from Africa. I would use 'African-American' same as any other X-American hyphenation. And yes, 'black' same as 'white'--a racial label.