Changed namespaces

Namespaces were not proper