Use opt_stat name consistently