LPS-32385 Make the finders consistent
LPS-32385 Regen