Update namespaces to include module name.  In case one module imports another, we don't have confusing namespace prefixes.
Also, include namespaces in a queryable way on the module.