Changed namespaces too