More namespace fixing (in namespace-map)
Make sure namespaces actually get mapped.