Adapt to ThOr functor and algorithm naming changes.

3 jobs for apearce-particle-functor-cleanup in 24 seconds