Improved -nameopt for special chars refs #42