Fixing namespaces.