Use general option type
Rename option names