[backport to 3.5] - issue26896 - Disambiguate uses of "importer" with "finder".