fix more search-and-replace typos