Rename Annotation to Tag
Fix linting issues