rename options to match #3 changes