Fixed master/slave naming.