Duplicate EJB wizards

There are dupliate wizards for creating EJB3 Message-driven bean and EJB3 Session Bean.

For creating Message Driven bean there is:

• EJB/EJB3 Message Driven Bean
• EJB/Message-Driven Bean (EJB3.x)

For creating Session bean theere is:

• EJB/EJB3 Session Bean
• EJB/Session Bean (EJB 3.x)

Both variants create classes, the 2nd variant of both is quite better (generates additional annotations)

Those duplicates should be removed if possible.