Please could we deprecate the name-based searching instead of just removing it?