change some option names for consistency