The only way forward is to use a term that confuses and irritates in some other way, yet remains somehow aligned with the ideals of the agitators. So, try something like...

  master -> becomes: vegan

  slave  -> becomes: enabled

It needs to be treated this way, so that with every decision made going forward, someone is forced to remember the cognitive burden of considering the potential transgressions of cultural misinterpretation and insensitivity.

Now, when someone needs to debug production issues, their minds will weigh the consequences of a history that will never leave anyone alone, no matter how distant or removed from our current circumstances.