Replace master with controller where ever possible.