Renaming AnnotKind.