'annotation' is a defined term, so use 'name' here;
Merge pull request #46 from ashnazg/nameNotAnnotation

'annotation' is a defined term, so use 'name' here;