New XXX Annotation Type should be more explicitly defined

New XYZ Annotation Type should:

1) Not say "Create XYZ Java File" when they are listed as "Create XYZ Annotation Type"
2) Annotation Type is redundant, should just be Annotation
3) Need to add keywords so they actually show up in wizard when typing "cdi", "stereotype" etc.