Search: Make base search class name more consistent with other base activities
Search: Remove unused strings
Search: Various class renaming
Search: Fix constant misspelling