Adding features to make treatment of underscores in namespace explicit