I think that master/slave correctly describes the relationship between constructs, and should remain unchanged. It is adequately separated from any sort of human relationship, and doesn't in any way glorify human slavery; in fact it actively separates the machine relationships from human ones. We can look at the relationships between these constructs, and see how far removed it is from any relationship in modern society.