fix more function name collisions