fix more annotation names