Moved namespaces about.