Deal with underscores in namespace name