Each of these terms is correct and wrong, and it is likely that whatever term you use will at some point be corrected by somebody else to a term they think is more appropriate. The best thing to do is thank them for the correction and move on, recognizing that language is complicated. These terms were rarely what we called ourselves and represent colonial ways of thinking about us. And so they will all be wrong in some way.