The old names were getting silly and started stepping on valuable namespace.

The new names are consistent and clear.

We're getting back to the point where we have a bunch of foundation APIs
and it's getting confusing having them mixed with services/.