Fix annotation names