Update to properly handle namespaces with underscores.