Minor renaming of search variables