Namespaces changes

Some namespace changes completed