Fixing namespaces