Changed namespaces, better spec compatibility