This class has a mix of methods in the forms `getXXX(Foo fromBar)` and `getXXX(Foo bar)`. They all seem to be doing similar things, so let's make the naming consistent.