fix more package names