Give search services their actual names; fix frontdoor bean names