fix more NAMES brokenness