[BACKLOG-1498] Change Annotation Model Names to Action+Type
Merge pull request #72 from bytekast/BACKLOG-1498

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