[BACKLOG-1498] Change Annotation Model Names to Action+Type

@pamval @kurtwalker - please review