Return all matches if multiple things found.

Also fix up some silly names.