changed naming to differentiate master/slave