fix more random namespace issues