Some i-search refactoring/renaming.