More naming in namer for annotations

moving to Annotation macros