Plans to replace master/slave/whitelist/blacklist terminology?