Updated names for long opt.