From Craig Silverstein: rename some option functions in preparation