Changed deprecated namespaces