fix more rename-enum bugs.