fix more ambiguous column names