Name the handlers consistently
Remove incorrect explicity setting of CDI managed bean