change option names to traditional way