Updated search names.

Fixes #16