extsvc: better type names

Created by: unknwon

Better to review by commit.

First two commits reverts https://github.com/sourcegraph/sourcegraph/pull/9545 and https://github.com/sourcegraph/sourcegraph/pull/9515.

Then we would have consistent naming for all types defined in the extsvc package.