Client->Slave rename, fixes