Refined naming, minor fixes.

refs #6134

Refined naming of originals search-related entities and fixed
minor issues.