rename options to be consistant