Rename classes to be more correct
Ensure that only payment depots that ought to be checked are checked