oops

back out change that involved changing the name of an unrelated classes
methods (for clarity in figuring out what it did, should have been
undone.  Now it is!)