I actually disagree Indigenous is an acknowledgement of their position in the history of the land it says those are the lands first people.
George Carlin has a great bit about calling things what they are and the ridiculousness of euphemisms.
If you want to work to changing the words used for these groups then perhaps a better focus would be to call them by the name they use for themselves when I call my self Anglo that names connects me to my culture and history.
In my work I meet a lot of Australian Indigenous and when is suitable I will ask if they are Noongar (Usually "who is your mob?") so that I can know if they connect and identify as belonging to the local tribe asking them to relinquish their name at least in Australias case is literally asking the worlds oldest culture to abandon 50,000 years.