Reorganized driver options to be more consistent