More namespacing cleanups.
All tests pass except 'passwords - long series'.