Remove underscores from option name