Fixes

Fixed custom finders to leverage new named params.

Note: This has a BC breaking nature, but was necessary to fix up quickly after the 3.0 release.