Fix namespacing of modules issue.