Change EJBs naming