Assorted renaming in search

Inspired by DON.

No functional change.