CDI-329 fix wording to be consistent.
CDI-341 EJB component defining annotations are bean defining annotations