Update namespaces to cdi 1.1