[JohnStrangeII]

Well, if you start arguing this way, then you can also go all the way back and muse about what the word meant in Proto-Indoeuropean.

It's still obvious that the modern use of the master/slave combo comes from centuries of slavery, not from any prior meanings. As OP said, that can be shown by studying their meanings outside the technical context. The original meaning was retained in Academia but merely as jargon. Magister artium is a "master degree." There is no "slave degree", though. There is also "mastery", master/apprentice, and so on.

In other words, the offensive component of the combo is "slave", not "master." You can safely continue to use the master/apprentice combo.

[umanwizard]

There is no “slave branch” in git either.