Fix a whole lot of namespace failures.

That's what you call breaking an API.