Changed namespaces of some States