BDSM will deliver the goods..
I suggest in future all software architecture terms should be borrowed from BDSM terminology. Given the sado-masochistic nature of almost all software it is only right and proper. Plus it will offend everyone who needs to be offended. And should be at every opportunity.
So master / slave will become dom / sub. Which has a suitable resonance with the original concept.
Other terms should be borrowed as needed from the wiki BDSM dictionary list. The urban dictionary BDSM list although much much longer quickly leads one down dark, very very dark, paths best left untrodden by people who wish to remain unsullied by mentally imagery that once visualized is very difficult to dislodge and forget.
So in many ways very much like the memories of most software development projects I've been involved with over the years.