Updated some namespaces