Renaming some fields, changes to choices for AnnotationSet

https://catami.atlassian.net/browse/CAT-647