Naming issues
Fix CDI injection in servlets.