Rename methods in Master interface to reflect reality.

After the refactoring in 2.2, the Master interface is much simpler, but the
method names still reflect the old mechanisms. This changes them to be more
clear as to what they do.