Update TotalFinder for new naming conventions
Merge pull request #1549 from Cottser/totalfinder

Update TotalFinder for new naming conventions