Fix configuration and namespaces