fix underscores in option names