rename options based on Bob's suggections