Fixing modules and namespaces