The master vs main is a good shibboleth as it identifies those who are only interested in making irrelevant performative changes to make themselves feel better
Aside from that, if we must change the terminology, can we at least all change it to the same new terminology. The last thing we need is 20 new euphemisms.