Fixed cdi names, allowing auto binding