Replace EJB_NAME with NAME given that it can now be a CDI service