Comprehensive namespace cleanup.
Clean up namespacing in accounts system too.