fix more names