More namespacing fixes.