Rename search classes for now and remove some duplication