Bug 1009358 - Choose search engine

Why do you need those changes ? Let's remove them as this is just renaming and it will pollute the blame history.